Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

liukangdong

2024-11-20 90bc1a2f92d89ca8a614edb1a7957ed94becd0b7

Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

 server/db/business.yw_account.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywaccount:create', '新建运维收支账号信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywaccount:delete', '删除运维收支账号信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywaccount:update', '修改运维收支账号信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywaccount:query', '查询运维收支账号信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:ywaccount:exportExcel', '导出运维收支账号信息表(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/system_service/src/main/java/com/doumee/dao/business/model/Company.java

@@ -76,7 +76,7 @@
    @ExcelColumn(name="图标")
    private String imgurl;

    @ApiModelProperty(value = "类型 0相关方公司 1内部组织")
    @ApiModelProperty(value = "类型 0相关方公司 1内部组织 2运维公司管理")
    @ExcelColumn(name="类型 0相关方公司 1内部组织")
    private Integer type;

@@ -85,7 +85,7 @@
    private Integer categoryId;


    @ApiModelProperty(value = "企业代码")
    @ApiModelProperty(value = "企业代码/纳税识别号")
    @ExcelColumn(name="企业代码")
    private String code;


 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwBuildingController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwContractBillController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwContractController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwContractDetailController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwContractRoomController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwCustomerController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwDeviceController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwDeviceRecordController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwLinePointController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwPatrolLineController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwPatrolPointController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwPatrolSchemeController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwPatrolTaskController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwProjectController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwRoomController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/YwWorkorderController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwAccountCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
package com.doumee.cloud.admin;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwAccount;
import com.doumee.service.business.YwAccountService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/19 18:09
 */
@Api(tags = "运维收支账号信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/ywAccount")
public class YwAccountCloudController extends BaseController {

    @Autowired
    private YwAccountService ywAccountService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywaccount:create")
    public ApiResponse create(@RequestBody YwAccount model,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        model.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywAccountService.create(model));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywaccount:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywAccountService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:ywaccount:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywAccountService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywaccount:update")
    public ApiResponse updateById(@RequestBody YwAccount ywAccount,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywAccount.setLoginUserInfo(this.getLoginUser(token));
        ywAccountService.updateById(ywAccount);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywaccount:query")
    public ApiResponse<PageData<YwAccount>> findPage (@RequestBody PageWrap<YwAccount> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywAccountService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywaccount:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwAccount> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwAccount.class).export(ywAccountService.findPage(pageWrap).getRecords(), "运维收支账号信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:ywaccount:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywAccountService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwBuildingCloudController.java

@@ -1,6 +1,7 @@
package com.doumee.cloud.admin;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -11,7 +12,6 @@
import com.doumee.service.business.YwBuildingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -34,57 +34,68 @@
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:ywbuilding:create")
    @CloudRequiredPermission("business:ywbuilding:create")
    public ApiResponse create(@RequestBody YwBuilding ywBuilding,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywBuilding.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywBuildingService.create(ywBuilding));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:ywbuilding:delete")
    @CloudRequiredPermission("business:ywbuilding:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywBuildingService.deleteById(id);
        ywBuildingService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:ywbuilding:delete")
    @CloudRequiredPermission("business:ywbuilding:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywBuildingService.deleteByIdInBatch(idList);
        ywBuildingService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:ywbuilding:update")
    @CloudRequiredPermission("business:ywbuilding:update")
    public ApiResponse updateById(@RequestBody YwBuilding ywBuilding,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywBuilding.setLoginUserInfo(this.getLoginUser(token));
        ywBuildingService.updateById(ywBuilding);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:ywbuilding:query")
    @CloudRequiredPermission("business:ywbuilding:query")
    public ApiResponse<PageData<YwBuilding>> findPage (@RequestBody PageWrap<YwBuilding> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywBuildingService.findPage(pageWrap));
    }
    @ApiOperation("查询列表")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywbuilding:query")
    public ApiResponse<List<YwBuilding>> findList (@RequestBody  YwBuilding pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywBuildingService.findList(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:ywbuilding:exportExcel")
    @CloudRequiredPermission("business:ywbuilding:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwBuilding> pageWrap, HttpServletResponse response ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwBuilding.class).export(ywBuildingService.findPage(pageWrap).getRecords(), "运维楼宇信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:ywbuilding:query")
    @CloudRequiredPermission("business:ywbuilding:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywBuildingService.findById(id));
    }

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractBillCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywcontractbill:create")
    public ApiResponse create(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractBill.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractBillService.create(ywContractBill));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywcontractbill:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractBillService.deleteById(id);
        ywContractBillService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywContractBillService.deleteByIdInBatch(idList);
        ywContractBillService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywcontractbill:update")
    public ApiResponse updateById(@RequestBody YwContractBill ywContractBill,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractBill.setLoginUserInfo(this.getLoginUser(token));
        ywContractBillService.updateById(ywContractBill);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywcontractbill:query")
    public ApiResponse<PageData<YwContractBill>> findPage (@RequestBody PageWrap<YwContractBill> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractBillService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywcontractbill:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwContractBill> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwContractBill.class).export(ywContractBillService.findPage(pageWrap).getRecords(), "运维合同账单信息表", response);
    }

@@ -86,6 +90,7 @@
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:ywcontractbill:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {

        return ApiResponse.success(ywContractBillService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractCloudController.java

@@ -37,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywcontract:create")
    public ApiResponse create(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContract.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractService.create(ywContract));
    }

@@ -44,7 +45,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywcontract:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractService.deleteById(id);
        ywContractService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -57,7 +58,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywContractService.deleteByIdInBatch(idList);
        ywContractService.deleteByIdInBatch(idList, this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -65,6 +66,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywcontract:update")
    public ApiResponse updateById(@RequestBody YwContract ywContract,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContract.setLoginUserInfo(this.getLoginUser(token));
        ywContractService.updateById(ywContract);
        return ApiResponse.success(null);
    }
@@ -73,6 +75,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywcontract:query")
    public ApiResponse<PageData<YwContract>> findPage (@RequestBody PageWrap<YwContract> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractService.findPage(pageWrap));
    }

@@ -80,6 +83,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywcontract:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwContract> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwContract.class).export(ywContractService.findPage(pageWrap).getRecords(), "运维合同信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractDetailCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywcontractdetail:create")
    public ApiResponse create(@RequestBody YwContractDetail ywContractDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractDetail.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractDetailService.create(ywContractDetail));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywcontractdetail:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractDetailService.deleteById(id);
        ywContractDetailService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywContractDetailService.deleteByIdInBatch(idList);
        ywContractDetailService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywcontractdetail:update")
    public ApiResponse updateById(@RequestBody YwContractDetail ywContractDetail,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractDetail.setLoginUserInfo(this.getLoginUser(token));
        ywContractDetailService.updateById(ywContractDetail);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywcontractdetail:query")
    public ApiResponse<PageData<YwContractDetail>> findPage (@RequestBody PageWrap<YwContractDetail> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractDetailService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywcontractdetail:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwContractDetail> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwContractDetail.class).export(ywContractDetailService.findPage(pageWrap).getRecords(), "运维合同条款信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwContractRoomCloudController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwContractRoom;
import com.doumee.service.business.YwContractRoomService;
import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywcontractroom:create")
    public ApiResponse create(@RequestBody YwContractRoom ywContractRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractRoom.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractRoomService.create(ywContractRoom));
    }

@@ -43,7 +45,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywcontractroom:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractRoomService.deleteById(id);
        ywContractRoomService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +58,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywContractRoomService.deleteByIdInBatch(idList);
        ywContractRoomService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +66,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywcontractroom:update")
    public ApiResponse updateById(@RequestBody YwContractRoom ywContractRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywContractRoom.setLoginUserInfo(this.getLoginUser(token));
        ywContractRoomService.updateById(ywContractRoom);
        return ApiResponse.success(null);
    }
@@ -72,6 +75,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywcontractroom:query")
    public ApiResponse<PageData<YwContractRoom>> findPage (@RequestBody PageWrap<YwContractRoom> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractRoomService.findPage(pageWrap));
    }

@@ -79,9 +83,16 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywcontractroom:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwContractRoom> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwContractRoom.class).export(ywContractRoomService.findPage(pageWrap).getRecords(), "运维合同房源关联信息表", response);
    }

    @ApiOperation("查询列表")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywcontractroom:query")
    public ApiResponse<List<YwContractRoom>> findList (@RequestBody  YwContractRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywContractRoomService.findList(pageWrap));
    }
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:ywcontractroom:query")

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwCustomerCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywcustomer:create")
    public ApiResponse create(@RequestBody YwCustomer ywCustomer,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywCustomer.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywCustomerService.create(ywCustomer));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywcustomer:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywCustomerService.deleteById(id);
        ywCustomerService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywCustomerService.deleteByIdInBatch(idList);
        ywCustomerService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywcustomer:update")
    public ApiResponse updateById(@RequestBody YwCustomer ywCustomer,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywCustomer.setLoginUserInfo(this.getLoginUser(token));
        ywCustomerService.updateById(ywCustomer);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywcustomer:query")
    public ApiResponse<PageData<YwCustomer>> findPage (@RequestBody PageWrap<YwCustomer> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywCustomerService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywcustomer:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwCustomer> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwCustomer.class).export(ywCustomerService.findPage(pageWrap).getRecords(), "运维客户信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywdevice:create")
    public ApiResponse create(@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDevice.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywDeviceService.create(ywDevice));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywdevice:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDeviceService.deleteById(id);
        ywDeviceService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywDeviceService.deleteByIdInBatch(idList);
        ywDeviceService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywdevice:update")
    public ApiResponse updateById(@RequestBody YwDevice ywDevice,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDevice.setLoginUserInfo(this.getLoginUser(token));
        ywDeviceService.updateById(ywDevice);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywdevice:query")
    public ApiResponse<PageData<YwDevice>> findPage (@RequestBody PageWrap<YwDevice> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywDeviceService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywdevice:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwDevice> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwDevice.class).export(ywDeviceService.findPage(pageWrap).getRecords(), "运维设备信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwDeviceRecordCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywdevicerecord:create")
    public ApiResponse create(@RequestBody YwDeviceRecord ywDeviceRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDeviceRecord.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywDeviceRecordService.create(ywDeviceRecord));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywdevicerecord:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDeviceRecordService.deleteById(id);
        ywDeviceRecordService.deleteById(id, this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywDeviceRecordService.deleteByIdInBatch(idList);
        ywDeviceRecordService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywdevicerecord:update")
    public ApiResponse updateById(@RequestBody YwDeviceRecord ywDeviceRecord,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywDeviceRecord.setLoginUserInfo(this.getLoginUser(token));
        ywDeviceRecordService.updateById(ywDeviceRecord);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywdevicerecord:query")
    public ApiResponse<PageData<YwDeviceRecord>> findPage (@RequestBody PageWrap<YwDeviceRecord> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywDeviceRecordService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywdevicerecord:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwDeviceRecord> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwDeviceRecord.class).export(ywDeviceRecordService.findPage(pageWrap).getRecords(), "运维设备运维记录表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwFloorCloudController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,96 @@
package com.doumee.cloud.admin;

import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwFloor;
import com.doumee.service.business.YwFloorService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/20 15:03
 */
@Api(tags = "运维楼层信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/ywFloor")
public class YwFloorCloudController extends BaseController {

    @Autowired
    private YwFloorService ywFloorService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywfloor:create")
    public ApiResponse create(@RequestBody YwFloor ywFloor,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywFloor.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywFloorService.create(ywFloor));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:ywfloor:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywFloorService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:ywfloor:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywFloorService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:ywfloor:update")
    public ApiResponse updateById(@RequestBody YwFloor ywFloor,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywFloor.setLoginUserInfo(this.getLoginUser(token));
        ywFloorService.updateById(ywFloor);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:ywfloor:query")
    public ApiResponse<PageData<YwFloor>> findPage (@RequestBody PageWrap<YwFloor> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywFloorService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:ywfloor:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwFloor> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwFloor.class).export(ywFloorService.findPage(pageWrap).getRecords(), "运维楼层信息表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:ywfloor:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(ywFloorService.findById(id));
    }
}

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwLinePointCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywlinepoint:create")
    public ApiResponse create(@RequestBody YwLinePoint ywLinePoint,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywLinePoint.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywLinePointService.create(ywLinePoint));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywlinepoint:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywLinePointService.deleteById(id);
        ywLinePointService.deleteById(id, this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywLinePointService.deleteByIdInBatch(idList);
        ywLinePointService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywlinepoint:update")
    public ApiResponse updateById(@RequestBody YwLinePoint ywLinePoint,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywLinePoint.setLoginUserInfo(this.getLoginUser(token));
        ywLinePointService.updateById(ywLinePoint);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywlinepoint:query")
    public ApiResponse<PageData<YwLinePoint>> findPage (@RequestBody PageWrap<YwLinePoint> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywLinePointService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywlinepoint:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwLinePoint> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwLinePoint.class).export(ywLinePointService.findPage(pageWrap).getRecords(), "运维巡检路线关联巡检点关联表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywpatrolline:create")
    public ApiResponse create(@RequestBody YwPatrolLine ywPatrolLine,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolLine.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolLineService.create(ywPatrolLine));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywpatrolline:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolLineService.deleteById(id);
        ywPatrolLineService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywPatrolLineService.deleteByIdInBatch(idList);
        ywPatrolLineService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywpatrolline:update")
    public ApiResponse updateById(@RequestBody YwPatrolLine ywPatrolLine,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolLine.setLoginUserInfo(this.getLoginUser(token));
        ywPatrolLineService.updateById(ywPatrolLine);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywpatrolline:query")
    public ApiResponse<PageData<YwPatrolLine>> findPage (@RequestBody PageWrap<YwPatrolLine> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolLineService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywpatrolline:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwPatrolLine> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwPatrolLine.class).export(ywPatrolLineService.findPage(pageWrap).getRecords(), "运维巡检路线信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolPointCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywpatrolpoint:create")
    public ApiResponse create(@RequestBody YwPatrolPoint ywPatrolPoint,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolPoint.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolPointService.create(ywPatrolPoint));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywpatrolpoint:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolPointService.deleteById(id);
        ywPatrolPointService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywPatrolPointService.deleteByIdInBatch(idList);
        ywPatrolPointService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywpatrolpoint:update")
    public ApiResponse updateById(@RequestBody YwPatrolPoint ywPatrolPoint,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolPoint.setLoginUserInfo(this.getLoginUser(token));
        ywPatrolPointService.updateById(ywPatrolPoint);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywpatrolpoint:query")
    public ApiResponse<PageData<YwPatrolPoint>> findPage (@RequestBody PageWrap<YwPatrolPoint> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolPointService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywpatrolpoint:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwPatrolPoint> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwPatrolPoint.class).export(ywPatrolPointService.findPage(pageWrap).getRecords(), "运维巡检点信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolSchemeCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywpatrolscheme:create")
    public ApiResponse create(@RequestBody YwPatrolScheme ywPatrolScheme,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolScheme.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolSchemeService.create(ywPatrolScheme));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywpatrolscheme:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolSchemeService.deleteById(id);
        ywPatrolSchemeService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywPatrolSchemeService.deleteByIdInBatch(idList);
        ywPatrolSchemeService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywpatrolscheme:update")
    public ApiResponse updateById(@RequestBody YwPatrolScheme ywPatrolScheme,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolScheme.setLoginUserInfo(this.getLoginUser(token));
        ywPatrolSchemeService.updateById(ywPatrolScheme);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywpatrolscheme:query")
    public ApiResponse<PageData<YwPatrolScheme>> findPage (@RequestBody PageWrap<YwPatrolScheme> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolSchemeService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywpatrolscheme:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwPatrolScheme> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwPatrolScheme.class).export(ywPatrolSchemeService.findPage(pageWrap).getRecords(), "运维巡检计划信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolTaskCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywpatroltask:create")
    public ApiResponse create(@RequestBody YwPatrolTask ywPatrolTask,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolTask.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolTaskService.create(ywPatrolTask));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywpatroltask:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolTaskService.deleteById(id);
        ywPatrolTaskService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywPatrolTaskService.deleteByIdInBatch(idList);
        ywPatrolTaskService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywpatroltask:update")
    public ApiResponse updateById(@RequestBody YwPatrolTask ywPatrolTask,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywPatrolTask.setLoginUserInfo(this.getLoginUser(token));
        ywPatrolTaskService.updateById(ywPatrolTask);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywpatroltask:query")
    public ApiResponse<PageData<YwPatrolTask>> findPage (@RequestBody PageWrap<YwPatrolTask> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywPatrolTaskService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywpatroltask:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwPatrolTask> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwPatrolTask.class).export(ywPatrolTaskService.findPage(pageWrap).getRecords(), "运维巡检任务信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwProjectCloudController.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwProject;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwProjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywproject:create")
    public ApiResponse create(@RequestBody YwProject ywProject,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProject.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywProjectService.create(ywProject));
    }

@@ -43,7 +45,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywproject:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProjectService.deleteById(id);
        ywProjectService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +58,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywProjectService.deleteByIdInBatch(idList);
        ywProjectService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,14 +66,22 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywproject:update")
    public ApiResponse updateById(@RequestBody YwProject ywProject,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywProject.setLoginUserInfo(this.getLoginUser(token));
        ywProjectService.updateById(ywProject);
        return ApiResponse.success(null);
    }

    @ApiOperation("查询列表")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywproject:query")
    public ApiResponse<List<YwProject>> findList (@RequestBody  YwProject pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywProjectService.findList(pageWrap));
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywproject:query")
    public ApiResponse<PageData<YwProject>> findPage (@RequestBody PageWrap<YwProject> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywProjectService.findPage(pageWrap));
    }

@@ -79,6 +89,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywproject:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwProject> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
       pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwProject.class).export(ywProjectService.findPage(pageWrap).getRecords(), "运维项目信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwRoomCloudController.java

@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.YwContractRoom;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwRoomService;
import io.swagger.annotations.Api;
@@ -36,6 +37,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywroom:create")
    public ApiResponse create(@RequestBody YwRoom ywRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoom.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.create(ywRoom));
    }

@@ -43,7 +45,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywroom:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoomService.deleteById(id);
        ywRoomService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +58,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywRoomService.deleteByIdInBatch(idList);
        ywRoomService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,14 +66,22 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywroom:update")
    public ApiResponse updateById(@RequestBody YwRoom ywRoom,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywRoom.setLoginUserInfo(this.getLoginUser(token));
        ywRoomService.updateById(ywRoom);
        return ApiResponse.success(null);
    }

    @ApiOperation("查询列表")
    @PostMapping("/list")
    @CloudRequiredPermission("business:ywroom:query")
    public ApiResponse<List<YwRoom>> findList (@RequestBody  YwRoom pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.findList(pageWrap));
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywroom:query")
    public ApiResponse<PageData<YwRoom>> findPage (@RequestBody PageWrap<YwRoom> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywRoomService.findPage(pageWrap));
    }

@@ -79,6 +89,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywroom:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwRoom> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwRoom.class).export(ywRoomService.findPage(pageWrap).getRecords(), "运维房源信息表", response);
    }


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwWorkorderCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:ywworkorder:create")
    public ApiResponse create(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywWorkorderService.create(ywWorkorder));
    }

@@ -43,7 +44,7 @@
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:ywworkorder:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywWorkorderService.deleteById(id);
        ywWorkorderService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -56,7 +57,7 @@
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        ywWorkorderService.deleteByIdInBatch(idList);
        ywWorkorderService.deleteByIdInBatch(idList, this.getLoginUser(token));
        return ApiResponse.success(null);
    }

@@ -64,6 +65,7 @@
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:ywworkorder:update")
    public ApiResponse updateById(@RequestBody YwWorkorder ywWorkorder,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ywWorkorder.setLoginUserInfo(this.getLoginUser(token));
        ywWorkorderService.updateById(ywWorkorder);
        return ApiResponse.success(null);
    }
@@ -72,6 +74,7 @@
    @PostMapping("/page")
    @CloudRequiredPermission("business:ywworkorder:query")
    public ApiResponse<PageData<YwWorkorder>> findPage (@RequestBody PageWrap<YwWorkorder> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(ywWorkorderService.findPage(pageWrap));
    }

@@ -79,6 +82,7 @@
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:ywworkorder:exportExcel")
    public void exportExcel (@RequestBody PageWrap<YwWorkorder> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
        ExcelExporter.build(YwWorkorder.class).export(ywWorkorderService.findPage(pageWrap).getRecords(), "运维工单信息表", response);
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwAccountMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.YwAccount;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/19 18:09
 */
public interface YwAccountMapper extends BaseMapper<YwAccount> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/YwFloorMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.YwFloor;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/20 15:03
 */
public interface YwFloorMapper extends BaseMapper<YwFloor> {

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Category.java

@@ -68,7 +68,7 @@
     //@ExcelColumn(name="图标")
    private String imgurl;

    @ApiModelProperty(value = "类型 0公司类型 1车辆类型")
    @ApiModelProperty(value = "类型 0公司类型 1车辆类型 2运维-客户行业分类 3运维-工单分类 4运维-巡检区域 5运维-设备分类" )
     //@ExcelColumn(name="类型 0公司类型 1车辆类型")
    private Integer type;


 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -61,7 +61,7 @@
    @ApiModelProperty(value = "健康码")
    private String imgurl;

    @ApiModelProperty(value = "类型 0司机人员 1普通访客  2内部人员", example = "1")
    @ApiModelProperty(value = "类型 0司机人员 1普通访客  2内部人员 3客户联系人", example = "1")
    private Integer type;

    @ApiModelProperty(value = "访客名称/内部人员")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwAccount.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;

/**
 * è¿ç»´æ”¶æ”¯è´¦å·ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/19 18:09
 */
@Data
@ApiModel("运维收支账号信息表")
@TableName("`yw_account`")
public class YwAccount  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "状态 0正常 1禁用", example = "1")
    @ExcelColumn(name="状态 0正常 1禁用")
    private Integer status;

    @ApiModelProperty(value = "收支条目")
    @ExcelColumn(name="收支条目")
    private String title;

    @ApiModelProperty(value = "收款公司编码(关联company)", example = "1")
    @ExcelColumn(name="收款公司编码(关联company)")
    private Integer companyId;

    @ApiModelProperty(value = "收款类型 0=对公；1=个人；", example = "1")
    @ExcelColumn(name="收款类型 0=对公；1=个人；")
    private Integer type;

    @ApiModelProperty(value = "账号名称")
    @ExcelColumn(name="账号名称")
    private String name;

    @ApiModelProperty(value = "开户银行")
    @ExcelColumn(name="开户银行")
    private String bankName;

    @ApiModelProperty(value = "银行账号")
    @ExcelColumn(name="银行账号")
    private String bankNo;

    @ApiModelProperty(value = "开户行地址")
    @ExcelColumn(name="开户行地址")
    private String bankAddr;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwBuilding.java

@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +21,7 @@
@Data
@ApiModel("运维楼宇信息表")
@TableName("`yw_building`")
public class YwBuilding {
public class YwBuilding  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -100,4 +102,10 @@
    @ExcelColumn(name="所属项目编码（关联yw_project)")
    private Integer projectId;

    @ApiModelProperty(value = "房源数")
    @TableField(exist = false)
    private Integer roomNum;
    @ApiModelProperty(value = "可招商房源数")
    @TableField(exist = false)
    private Integer roomeRentNum;
}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("运维合同信息表")
@TableName("`yw_contract`")
public class YwContract {
public class YwContract  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("运维合同账单信息表")
@TableName("`yw_contract_bill`")
public class YwContractBill {
public class YwContractBill  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractDetail.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("运维合同条款信息表")
@TableName("`yw_contract_detail`")
public class YwContractDetail {
public class YwContractDetail extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维合同房源关联信息表")
@TableName("`yw_contract_room`")
public class YwContractRoom {
public class YwContractRoom extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwCustomer.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维客户信息表")
@TableName("`yw_customer`")
public class YwCustomer {
public class YwCustomer  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDevice.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维设备信息表")
@TableName("`yw_device`")
public class YwDevice {
public class YwDevice  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwDeviceRecord.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维设备运维记录表")
@TableName("`yw_device_record`")
public class YwDeviceRecord {
public class YwDeviceRecord  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwFloor.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * è¿ç»´æ¥¼å±‚信息表
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/20 15:03
 */
@Data
@ApiModel("运维楼层信息表")
@TableName("`yw_floor`")
public class YwFloor extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "名称")
    @ExcelColumn(name="名称")
    private String name;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "状态 0启用 1禁用", example = "1")
    @ExcelColumn(name="状态 0启用 1禁用")
    private Integer status;

    @ApiModelProperty(value = "排序码", example = "1")
    @ExcelColumn(name="排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "图标")
    @ExcelColumn(name="图标")
    private String imgurl;

    @ApiModelProperty(value = "建筑面积（平方米）", example = "1")
    @ExcelColumn(name="建筑面积（平方米）")
    private BigDecimal area;

    @ApiModelProperty(value = "楼层数", example = "1")
    @ExcelColumn(name="楼层数")
    private Integer floor;

    @ApiModelProperty(value = "所属项目编码（关联yw_project)", example = "1")
    @ExcelColumn(name="所属项目编码（关联yw_project)")
    private Integer projectId;

    @ApiModelProperty(value = "所属项目编码（关联yw_building)", example = "1")
    @ExcelColumn(name="所属项目编码（关联yw_building)")
    private Integer buildingId;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwLinePoint.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维巡检路线关联巡检点关联表")
@TableName("`yw_line_point`")
public class YwLinePoint {
public class YwLinePoint  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolLine.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维巡检路线信息表")
@TableName("`yw_patrol_line`")
public class YwPatrolLine {
public class YwPatrolLine  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolPoint.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维巡检点信息表")
@TableName("`yw_patrol_point`")
public class YwPatrolPoint {
public class YwPatrolPoint  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolScheme.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维巡检计划信息表")
@TableName("`yw_patrol_scheme`")
public class YwPatrolScheme {
public class YwPatrolScheme  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwPatrolTask.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维巡检任务信息表")
@TableName("`yw_patrol_task`")
public class YwPatrolTask {
public class YwPatrolTask  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwProject.java

@@ -1,6 +1,8 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +20,7 @@
@Data
@ApiModel("运维项目信息表")
@TableName("`yw_project`")
public class YwProject {
public class YwProject extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -74,5 +76,11 @@
    @ApiModelProperty(value = "地址")
    @ExcelColumn(name="地址")
    private String addr;
    @ApiModelProperty(value = "房源数")
    @TableField(exist = false)
    private Integer roomNum;
    @ApiModelProperty(value = "可招商房源数")
    @TableField(exist = false)
    private Integer roomeRentNum;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("运维房源信息表")
@TableName("`yw_room`")
public class YwRoom {
public class YwRoom  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
@@ -100,8 +101,8 @@
    @ExcelColumn(name="所属项目编码（关联yw_project)")
    private Integer projectId;

    @ApiModelProperty(value = "所属项目编码（关联yw_building)", example = "1")
    @ExcelColumn(name="所属项目编码（关联yw_building)")
    @ApiModelProperty(value = "所属楼宇编码（关联yw_building)", example = "1")
    @ExcelColumn(name="所属楼宇编码（关联yw_building)")
    private Integer buildingId;

}

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwWorkorder.java

@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
@Data
@ApiModel("运维工单信息表")
@TableName("`yw_workorder`")
public class YwWorkorder {
public class YwWorkorder  extends LoginUserModel {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwAccountService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwAccount;
import java.util.List;

/**
 * è¿ç»´æ”¶æ”¯è´¦å·ä¿¡æ¯è¡¨Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/19 18:09
 */
public interface YwAccountService {

    /**
     * åˆ›å»º
     * 
     * @param ywAccount å®žä½“对象
     * @return Integer
     */
    Integer create(YwAccount ywAccount);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
     *
     * @param ywAccount å®žä½“对象
     */
    void delete(YwAccount ywAccount);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param ywAccount å®žä½“对象
     */
    void updateById(YwAccount ywAccount);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param ywAccounts å®žä½“集
     */
    void updateByIdInBatch(List<YwAccount> ywAccounts);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return YwAccount
     */
    YwAccount findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param ywAccount å®žä½“对象
     * @return YwAccount
     */
    YwAccount findOne(YwAccount ywAccount);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param ywAccount å®žä½“对象
     * @return List<YwAccount>
     */
    List<YwAccount> findList(YwAccount ywAccount);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<YwAccount>
     */
    PageData<YwAccount> findPage(PageWrap<YwAccount> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param ywAccount å®žä½“对象
     * @return long
     */
    long count(YwAccount ywAccount);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwBuildingService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwBuilding;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractBillService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContractBill;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractDetailService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContractDetail;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractRoomService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContractRoom;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwContractService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwContract;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwCustomerService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwCustomer;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceRecordService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwDeviceRecord;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwDeviceService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwDevice;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwFloorService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwFloor;
import java.util.List;

/**
 * è¿ç»´æ¥¼å±‚信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/20 15:03
 */
public interface YwFloorService {

    /**
     * åˆ›å»º
     * 
     * @param ywFloor å®žä½“对象
     * @return Integer
     */
    Integer create(YwFloor ywFloor);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
     *
     * @param ywFloor å®žä½“对象
     */
    void delete(YwFloor ywFloor);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param ywFloor å®žä½“对象
     */
    void updateById(YwFloor ywFloor);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param ywFloors å®žä½“集
     */
    void updateByIdInBatch(List<YwFloor> ywFloors);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return YwFloor
     */
    YwFloor findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param ywFloor å®žä½“对象
     * @return YwFloor
     */
    YwFloor findOne(YwFloor ywFloor);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param ywFloor å®žä½“对象
     * @return List<YwFloor>
     */
    List<YwFloor> findList(YwFloor ywFloor);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<YwFloor>
     */
    PageData<YwFloor> findPage(PageWrap<YwFloor> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param ywFloor å®žä½“对象
     * @return long
     */
    long count(YwFloor ywFloor);
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwLinePointService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwLinePoint;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolLineService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwPatrolLine;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolPointService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwPatrolPoint;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolSchemeService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwPatrolScheme;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwPatrolTaskService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwPatrolTask;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwProjectService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwProject;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwRoomService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwRoom;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/YwWorkorderService.java

@@ -1,5 +1,6 @@
package com.doumee.service.business;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.YwWorkorder;
@@ -25,7 +26,7 @@
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);
    void deleteById(Integer id, LoginUserInfo user);

    /**
     * åˆ é™¤
@@ -39,7 +40,7 @@
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);

    /**
     * ä¸»é”®æ›´æ–°

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -67,6 +67,7 @@
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Integer create(Company company) {
        company.setType(Constants.ONE);
        if(StringUtils.isBlank(company.getName())){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -120,9 +121,9 @@
        company.setHkId(UUID.randomUUID().toString().replace("-",""));
        companyMapper.insert(company);
        //下发海康安防平台
        if(!addHkOrg(company)){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织同步下发失败，请稍后重试");
        }
//        if(!addHkOrg(company)){
//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织同步下发失败，请稍后重试");
//        }
        Company com = new Company();
        com.setId(company.getId());
        com.setCompanyPath(idPath+company.getId()+"/");
@@ -243,9 +244,9 @@
        company.setHkDate(company.getHkDate());
        companyMapper.updateById(company);
        //下发海康安防平台
        if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织删除下发失败，请确认该组织无下级组织或组织人员信息~");
        }
//        if(StringUtils.isNotBlank(model.getHkId()) && Constants.equalsInteger(Constants.ONE,model.getHkStatus()) && !delHkOrg(model)){
//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，组织删除下发失败，请确认该组织无下级组织或组织人员信息~");
//        }
    }

    @Override

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -141,7 +141,7 @@
        Member insert = initAddMemberModel(member,loginUserInfo);
        //海康人员新增业务
        try {
             if(dealHkUserBiz(insert)){
//             if(dealHkUserBiz(insert)){
                memberMapper.insert(insert);
                //创建系统登陆账号（默认无任何角色）
//                if(Constants.equalsInteger(member.getCompanyType(),Constants.ONE)){
@@ -150,13 +150,13 @@
                    //处理培训有效期业务
                    dealTrainTIme(member,0,loginUserInfo);
//                }
            }else{
                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
            }
//            }else{
//                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
//            }
        }catch (Exception e){
            //如果发生异常，删除已经创建的人员信息
            e.printStackTrace();
            deleteHkUserBiz(new String[]{insert.getHkId()});
//            deleteHkUserBiz(new String[]{insert.getHkId()});
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息新建失败，请稍后重试！");
        }
        return insert;
@@ -568,8 +568,8 @@
        member.setIsdeleted(Constants.ONE);
        member.setEditor(loginUserInfo.getId());
        member.setEditDate(new Date());
        member.setHkStatus(Constants.ZERO);
        member.setRemark("人员已删除，等待删除门禁权限");
//        member.setHkStatus(Constants.ZERO);
//        member.setRemark("人员已删除，等待删除门禁权限");
        memberMapper.updateById(member);

        //刪除系统登陆账户
@@ -891,7 +891,7 @@
        updateMember.setEditor(loginUserInfo.getId());
        updateMember.setEditDate(new Date());
        //海康人员新增业务
        if(dealHkUserForUpdateBiz(updateMember)){
//        if(dealHkUserForUpdateBiz(updateMember)){
            updateMember.setHkId(null);
            updateMember.setAuthStatus(Constants.ZERO);
            memberMapper.update(null,new UpdateWrapper<Member>().lambda()
@@ -923,9 +923,9 @@
            cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);
            //记录操作日志
            saveUserActionBiz(updateMember,loginUserInfo,Constants.UserActionType.EDIT,userActionJoinMapper,null);
        }else{
            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
        }
//        }else{
//            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"对不起，员工信息同步安防平台失败，请稍后重试！");
//        }
    }

    private void dealTrainTIme(Member updateMember, int i,LoginUserInfo loginUserInfo) {

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwAccountServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,155 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwAccountMapper;
import com.doumee.dao.business.model.YwAccount;
import com.doumee.service.business.YwAccountService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * è¿ç»´æ”¶æ”¯è´¦å·ä¿¡æ¯è¡¨Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/19 18:09
 */
@Service
public class YwAccountServiceImpl implements YwAccountService {

    @Autowired
    private YwAccountMapper ywAccountMapper;

    @Override
    public Integer create(YwAccount ywAccount) {
        ywAccountMapper.insert(ywAccount);
        return ywAccount.getId();
    }

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        ywAccountMapper.deleteById(id);
    }

    @Override
    public void delete(YwAccount ywAccount) {
        UpdateWrapper<YwAccount> deleteWrapper = new UpdateWrapper<>(ywAccount);
        ywAccountMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        ywAccountMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(YwAccount ywAccount) {
        ywAccountMapper.updateById(ywAccount);
    }

    @Override
    public void updateByIdInBatch(List<YwAccount> ywAccounts) {
        if (CollectionUtils.isEmpty(ywAccounts)) {
            return;
        }
        for (YwAccount ywAccount: ywAccounts) {
            this.updateById(ywAccount);
        }
    }

    @Override
    public YwAccount findById(Integer id) {
        return ywAccountMapper.selectById(id);
    }

    @Override
    public YwAccount findOne(YwAccount ywAccount) {
        QueryWrapper<YwAccount> wrapper = new QueryWrapper<>(ywAccount);
        return ywAccountMapper.selectOne(wrapper);
    }

    @Override
    public List<YwAccount> findList(YwAccount ywAccount) {
        QueryWrapper<YwAccount> wrapper = new QueryWrapper<>(ywAccount);
        return ywAccountMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<YwAccount> findPage(PageWrap<YwAccount> pageWrap) {
        IPage<YwAccount> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwAccount> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwAccount::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(YwAccount::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(YwAccount::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(YwAccount::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(YwAccount::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(YwAccount::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(YwAccount::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(YwAccount::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(YwAccount::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(YwAccount::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getTitle() != null) {
            queryWrapper.lambda().eq(YwAccount::getTitle, pageWrap.getModel().getTitle());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(YwAccount::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(YwAccount::getType, pageWrap.getModel().getType());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(YwAccount::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getBankName() != null) {
            queryWrapper.lambda().eq(YwAccount::getBankName, pageWrap.getModel().getBankName());
        }
        if (pageWrap.getModel().getBankNo() != null) {
            queryWrapper.lambda().eq(YwAccount::getBankNo, pageWrap.getModel().getBankNo());
        }
        if (pageWrap.getModel().getBankAddr() != null) {
            queryWrapper.lambda().eq(YwAccount::getBankAddr, pageWrap.getModel().getBankAddr());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(ywAccountMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(YwAccount ywAccount) {
        QueryWrapper<YwAccount> wrapper = new QueryWrapper<>(ywAccount);
        return ywAccountMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwBuildingServiceImpl.java

@@ -1,10 +1,13 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwBuildingMapper;
import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwProject;
import com.doumee.service.business.YwBuildingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -14,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
@@ -28,14 +32,25 @@
    private YwBuildingMapper ywBuildingMapper;

    @Override
    public Integer create(YwBuilding ywBuilding) {
        ywBuildingMapper.insert(ywBuilding);
        return ywBuilding.getId();
    public Integer create(YwBuilding model) {
        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        ywBuildingMapper.insert(model);
        return model.getId();
    }

    @Override
    public void deleteById(Integer id) {
        ywBuildingMapper.deleteById(id);
    public void deleteById(Integer id, LoginUserInfo user) {
        YwBuilding model = new YwBuilding();
        model.setId(id);
        model.setEditDate(new Date());
        model.setEditor(user.getId());
        model.setIsdeleted(Constants.ONE);
        ywBuildingMapper.updateById(model);
    }

    @Override
@@ -45,16 +60,20 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        ywBuildingMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            this.deleteById(id,user);
        }
    }

    @Override
    public void updateById(YwBuilding ywBuilding) {
        ywBuildingMapper.updateById(ywBuilding);
    public void updateById(YwBuilding  model) {
        model.setEditDate(new Date());
        model.setEditor(model.getLoginUserInfo().getId());
        ywBuildingMapper.updateById(model);
    }

    @Override
@@ -80,6 +99,7 @@

    @Override
    public List<YwBuilding> findList(YwBuilding ywBuilding) {
        ywBuilding.setIsdeleted(Constants.ZERO);
        QueryWrapper<YwBuilding> wrapper = new QueryWrapper<>(ywBuilding);
        return ywBuildingMapper.selectList(wrapper);
    }
@@ -89,6 +109,9 @@
        IPage<YwBuilding> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwBuilding> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.select("*,(select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=yw_building.id) as roomNum"+
                ",(select count(1) from yw_room a where a.isdeleted=0 and a.BUILDING_ID=yw_building.id and a.IS_INVESTMENT=1) as roomRentNum");
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwBuilding::getId, pageWrap.getModel().getId());
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywContractBillMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractDetailServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywContractDetailMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractRoomServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywContractRoomMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywContractMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwCustomerServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywCustomerMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceRecordServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywDeviceRecordMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwDeviceServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywDeviceMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwFloorServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,196 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwBuildingMapper;
import com.doumee.dao.business.YwFloorMapper;
import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwFloor;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwFloorService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
 * è¿ç»´æ¥¼å±‚信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/11/20 15:03
 */
@Service
public class YwFloorServiceImpl implements YwFloorService {

    @Autowired
    private YwFloorMapper ywFloorMapper;
    @Autowired
    private YwBuildingMapper ywBuildingMapper;

    @Override
    public Integer create(YwFloor model) {
        if(model.getBuildingId()==null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        YwBuilding ywBuilding = ywBuildingMapper.selectById(model.getBuildingId());
        if(ywBuilding ==null ||Constants.equalsInteger(ywBuilding.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        model.setProjectId(ywBuilding.getProjectId());
        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        ywFloorMapper.insert(model);
        return model.getId();
    }

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        YwFloor model = new YwFloor();
        model.setId(id);
        model.setEditDate(new Date());
        model.setEditor(user.getId());
        model.setIsdeleted(Constants.ONE);
        ywFloorMapper.updateById(model);
    }

    @Override
    public void delete(YwFloor ywFloor) {
        UpdateWrapper<YwFloor> deleteWrapper = new UpdateWrapper<>(ywFloor);
        ywFloorMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for (Integer ywProject: ids) {
            this.deleteById(ywProject,user);
        }
    }

    @Override
    public void updateById(YwFloor model) {
        if(model.getBuildingId()==null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        YwBuilding ywBuilding = ywBuildingMapper.selectById(model.getBuildingId());
        if(ywBuilding ==null ||Constants.equalsInteger(ywBuilding.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        model.setProjectId(ywBuilding.getProjectId());
        model.setEditDate(new Date());
        model.setEditor(model.getLoginUserInfo().getId());
        ywFloorMapper.updateById(model);
    }

    @Override
    public void updateByIdInBatch(List<YwFloor> ywFloors) {
        if (CollectionUtils.isEmpty(ywFloors)) {
            return;
        }
        for (YwFloor ywFloor: ywFloors) {
            this.updateById(ywFloor);
        }
    }

    @Override
    public YwFloor findById(Integer id) {
        return ywFloorMapper.selectById(id);
    }

    @Override
    public YwFloor findOne(YwFloor ywFloor) {
        QueryWrapper<YwFloor> wrapper = new QueryWrapper<>(ywFloor);
        return ywFloorMapper.selectOne(wrapper);
    }

    @Override
    public List<YwFloor> findList(YwFloor ywFloor) {
        QueryWrapper<YwFloor> wrapper = new QueryWrapper<>(ywFloor);
        return ywFloorMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<YwFloor> findPage(PageWrap<YwFloor> pageWrap) {
        IPage<YwFloor> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwFloor> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwFloor::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(YwFloor::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(YwFloor::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(YwFloor::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(YwFloor::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(YwFloor::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(YwFloor::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(YwFloor::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(YwFloor::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(YwFloor::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(YwFloor::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(YwFloor::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getImgurl() != null) {
            queryWrapper.lambda().eq(YwFloor::getImgurl, pageWrap.getModel().getImgurl());
        }
        if (pageWrap.getModel().getArea() != null) {
            queryWrapper.lambda().eq(YwFloor::getArea, pageWrap.getModel().getArea());
        }
        if (pageWrap.getModel().getFloor() != null) {
            queryWrapper.lambda().eq(YwFloor::getFloor, pageWrap.getModel().getFloor());
        }
        if (pageWrap.getModel().getProjectId() != null) {
            queryWrapper.lambda().eq(YwFloor::getProjectId, pageWrap.getModel().getProjectId());
        }
        if (pageWrap.getModel().getBuildingId() != null) {
            queryWrapper.lambda().eq(YwFloor::getBuildingId, pageWrap.getModel().getBuildingId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(ywFloorMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(YwFloor ywFloor) {
        QueryWrapper<YwFloor> wrapper = new QueryWrapper<>(ywFloor);
        return ywFloorMapper.selectCount(wrapper);
    }
}

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwLinePointServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywLinePointMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywPatrolLineMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolPointServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywPatrolPointMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolSchemeServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywPatrolSchemeMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +35,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywPatrolTaskMapper.deleteById(id);
    }

@@ -45,7 +46,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java

@@ -1,9 +1,12 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwProjectMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.YwProject;
import com.doumee.service.business.YwProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
@@ -28,14 +32,25 @@
    private YwProjectMapper ywProjectMapper;

    @Override
    public Integer create(YwProject ywProject) {
        ywProjectMapper.insert(ywProject);
        return ywProject.getId();
    public Integer create(YwProject  model) {
        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        ywProjectMapper.insert(model);
        return model.getId();
    }

    @Override
    public void deleteById(Integer id) {
        ywProjectMapper.deleteById(id);
    public void deleteById(Integer id, LoginUserInfo user) {
        YwProject model = new YwProject();
        model.setId(id);
        model.setEditDate(new Date());
        model.setEditor(user.getId());
        model.setIsdeleted(Constants.ONE);
        ywProjectMapper.updateById(model);
    }

    @Override
@@ -45,16 +60,20 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        ywProjectMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            this.deleteById(id,user);
        }
    }

    @Override
    public void updateById(YwProject ywProject) {
        ywProjectMapper.updateById(ywProject);
    public void updateById(YwProject model) {
        model.setEditDate(new Date());
        model.setEditor(model.getLoginUserInfo().getId());
        ywProjectMapper.updateById(model);
    }

    @Override
@@ -80,6 +99,7 @@

    @Override
    public List<YwProject> findList(YwProject ywProject) {
        ywProject.setIsdeleted(Constants.ZERO);
        QueryWrapper<YwProject> wrapper = new QueryWrapper<>(ywProject);
        return ywProjectMapper.selectList(wrapper);
    }
@@ -89,6 +109,9 @@
        IPage<YwProject> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwProject> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.select("*,(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id) as roomNum"+
                ",(select count(1) from yw_room a where a.isdeleted=0 and a.PROJECT_ID=yw_project.id and a.IS_INVESTMENT=1) as roomRentNum");
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwProject::getId, pageWrap.getModel().getId());
        }
@@ -130,13 +153,7 @@
        if (pageWrap.getModel().getAddr() != null) {
            queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByDesc(YwProject::getCreateDate);
        return PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwRoomServiceImpl.java

@@ -1,9 +1,16 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwBuildingMapper;
import com.doumee.dao.business.YwRoomMapper;
import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwProject;
import com.doumee.dao.business.model.YwRoom;
import com.doumee.service.business.YwRoomService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;

/**
@@ -26,16 +34,37 @@

    @Autowired
    private YwRoomMapper ywRoomMapper;
    @Autowired
    private YwBuildingMapper ywBuildingMapper;

    @Override
    public Integer create(YwRoom ywRoom) {
        ywRoomMapper.insert(ywRoom);
        return ywRoom.getId();
    public Integer create(YwRoom model) {
        if(model.getBuildingId()==null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        YwBuilding ywBuilding = ywBuildingMapper.selectById(model.getBuildingId());
        if(ywBuilding ==null ||Constants.equalsInteger(ywBuilding.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        model.setProjectId(ywBuilding.getProjectId());
        model.setCreator(model.getLoginUserInfo().getId());
        model.setIsdeleted(Constants.ZERO);
        model.setCreateDate(new Date());
        model.setStatus(Constants.ZERO);
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        ywRoomMapper.insert(model);
        return model.getId();
    }

    @Override
    public void deleteById(Integer id) {
        ywRoomMapper.deleteById(id);
    public void deleteById(Integer id, LoginUserInfo user) {
        YwRoom model = new YwRoom();
        model.setId(id);
        model.setEditDate(new Date());
        model.setEditor(user.getId());
        model.setIsdeleted(Constants.ONE);
        ywRoomMapper.updateById(model);
    }

    @Override
@@ -45,16 +74,28 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        ywRoomMapper.deleteBatchIds(ids);
        for (Integer ywProject: ids) {
            this.deleteById(ywProject,user);
        }
    }

    @Override
    public void updateById(YwRoom ywRoom) {
        ywRoomMapper.updateById(ywRoom);
    public void updateById(YwRoom model) {
        if(model.getBuildingId()==null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        YwBuilding ywBuilding = ywBuildingMapper.selectById(model.getBuildingId());
        if(ywBuilding ==null ||Constants.equalsInteger(ywBuilding.getIsdeleted(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，请选择正确的楼宇信息！");
        }
        model.setProjectId(ywBuilding.getProjectId());
        model.setEditDate(new Date());
        model.setEditor(model.getLoginUserInfo().getId());
        ywRoomMapper.updateById(model);
    }

    @Override
@@ -80,7 +121,8 @@

    @Override
    public List<YwRoom> findList(YwRoom ywRoom) {
        QueryWrapper<YwRoom> wrapper = new QueryWrapper<>(ywRoom);
        ywRoom.setIsdeleted(Constants.ZERO);
        QueryWrapper<YwRoom> wrapper = new QueryWrapper< >(ywRoom);
        return ywRoomMapper.selectList(wrapper);
    }
  
@@ -88,6 +130,7 @@
    public PageData<YwRoom> findPage(PageWrap<YwRoom> pageWrap) {
        IPage<YwRoom> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<YwRoom> queryWrapper = new QueryWrapper<>();
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(YwRoom::getId, pageWrap.getModel().getId());
@@ -151,13 +194,7 @@
        if (pageWrap.getModel().getBuildingId() != null) {
            queryWrapper.lambda().eq(YwRoom::getBuildingId, pageWrap.getModel().getBuildingId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        queryWrapper.lambda().orderByAsc(YwRoom::getRoomNum);
        return PageData.from(ywRoomMapper.selectPage(page, queryWrapper));
    }


 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -34,7 +36,7 @@
    }

    @Override
    public void deleteById(Integer id) {
    public void deleteById(Integer id, LoginUserInfo user) {
        ywWorkorderMapper.deleteById(id);
    }

@@ -45,7 +47,7 @@
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }