Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-02-08 fec0d6c623d2e3eed44727106dedfe1f8ba94abe

Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

# Conflicts:
#	ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml

 generator/pom.xml

New file
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>ruoyi</artifactId>
        <groupId>com.ruoyi</groupId>
        <version>3.8.6</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>generator</artifactId>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
    </properties>
    <dependencies>

        <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity-engine-core -->
        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
            <version>2.3</version>
        </dependency>

        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>4.13.2</version>
            <scope>test</scope>
        </dependency>
        <!-- jdbc 连接包 -->
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generator</artifactId>
            <version>3.4.0</version>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
    </dependencies>

</project>

 generator/src/test/java/com/xizang/CodeGeneratorTests.java

New file
@@ -0,0 +1,158 @@
package com.xizang;

import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.po.LikeTable;
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import org.junit.Test;

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

/**
 * 通过指定 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) 可达到加速的效果。
 * 这时测试类启动时就只会初始化 Spring 上下文，不再启动 Tomcat 容器
 */
public class CodeGeneratorTests {

    private static final String DRIVER_NAME = "com.mysql.cj.jdbc.Driver";

    private static final String JDBC_URL = "jdbc:mysql://xzgt.test.591taxi.cn:13306/xizang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";
    private static final String USER_NAME = "root";
    private static final String PASSWORD = "8f5z9g52gx4bg";


    // 防止误生成
    private static final String BASE_PACKAGE = "com.ruoyi.system";

    @Test
    public void contextLoads() {
        // 代码生成器
        AutoGenerator mpg = new AutoGenerator();

        // 全局配置
        GlobalConfig gc = new GlobalConfig();
        String projectPath = "F:\\workSpace\\xizang\\generator";
        gc.setOutputDir(projectPath + "/src/main/java")
                .setAuthor("xiaochen")
                .setMapperName("%sMapper")
                .setXmlName("%sMapper")
                .setServiceName("%sService")
                .setServiceImplName("%sServiceImpl")
                .setControllerName("%sController")
                .setOpen(false)//当代码生成完成之后是否打开代码所在的文件夹
                .setSwagger2(true) //实体属性 Swagger2 注解
                .setFileOverride(true)//是否覆盖
                //.setActiveRecord(true)
                .setEnableCache(false)// XML 二级缓存
                .setBaseResultMap(true)// XML ResultMap
                .setBaseColumnList(true);// XML columList
        mpg.setGlobalConfig(gc);

        // 数据源配置
        DataSourceConfig dsc = new DataSourceConfig();
        dsc.setUrl(JDBC_URL);
        // dsc.setSchemaName("public");
        dsc.setDriverName(DRIVER_NAME);
        dsc.setUsername(USER_NAME);
        dsc.setPassword(PASSWORD);
        mpg.setDataSource(dsc);

        // 包配置
        PackageConfig pc = new PackageConfig();
        //  pc.setModuleName(scanner("模块名"));
        // pc.setModuleName("sys");
        pc.setParent(BASE_PACKAGE);//controller entity  service  service.impl
        pc.setController("controller");
        pc.setEntity("model");
        pc.setMapper("mapper");
        pc.setService("service");


        // 自定义mapping文件生成路径配置
        InjectionConfig cfg = new InjectionConfig() {
            @Override
            public void initMap() {
                // to do nothing
            }
        };
        // 如果模板引擎是 velocity
        String templatePath = "/templates/mapper.xml.vm";

        // 自定义输出配置
        List<FileOutConfig> focList = new ArrayList<>();
        // 自定义配置会被优先输出
        focList.add(new FileOutConfig(templatePath) {
            @Override
            public String outputFile(TableInfo tableInfo) {
                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
                return projectPath + "/src/main/resources/mapping/"
                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
            }
        });
        cfg.setFileOutConfigList(focList);
        mpg.setCfg(cfg);
        // 配置模板
        TemplateConfig templateConfig = new TemplateConfig();
        templateConfig.setXml(null);
        mpg.setTemplate(templateConfig);
        mpg.setPackageInfo(pc);

        // 配置模板
        // 不生成controller
        //TemplateConfig templateConfig = new TemplateConfig();
        //templateConfig.setController(null);
        //mpg.setTemplate(templateConfig);


        // 策略配置
        StrategyConfig strategy = new StrategyConfig();
        //设置字段和表名的是否把下划线完成驼峰命名规则
        strategy.setNaming(NamingStrategy.underline_to_camel);
        strategy.setEntitySerialVersionUID(true);
        strategy.setEntityColumnConstant(false);


        //设置生成的实体类继承的父类
//        strategy.setSuperEntityClass(BaseModel.class);
        // 生成字段常量
        // strategy.setEntityColumnConstant(true);
//        strategy.setSuperEntityColumns("create_by", "update_by", "disabled", "create_time", "last_time");
        strategy.setEntityLombokModel(true);//是否启动lombok

        strategy.setRestControllerStyle(true);//是否生成resetController
        strategy.setLogicDeleteFieldName("isDelete");

        // 字段自动操作策略
     /*   List<TableFill> tableFillList = new ArrayList<>();
        tableFillList.add(new TableFill("create_time", FieldFill.INSERT));
        tableFillList.add(new TableFill("update_time", FieldFill.INSERT_UPDATE));
        // 表字段与属性映射关系
        strategy.setTableFillList(tableFillList);*/

        // 公共父类
        // strategy.setSuperControllerClass("com.sxt.BaseController");
        // 写于父类中的公共字段
        // strategy.setSuperEntityColumns("person_id","person_name");
        //要设置生成哪些表 如果不设置就是生成所有的表
        // strategy.setInclude(scanner("表名，多个英文逗号分割").split(","));
        strategy.setControllerMappingHyphenStyle(true);
        strategy.setEntityTableFieldAnnotationEnable(true);
//         strategy.setTablePrefix(pc.getModuleName() + "");
//        strategy.setLikeTable(new LikeTable("room"));
        //strategy.setLikeTable(new LikeTable("member"));
        strategy.setLikeTable(new LikeTable("t_"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
//        strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名
//        strategy.setLikeTable();
        // strategy.setTablePrefix("sys_");
        mpg.setStrategy(strategy);
        mpg.execute();
    }


}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java

New file
@@ -0,0 +1,104 @@
package com.ruoyi.web.controller.api;


import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.query.TBannerQuery;
import com.ruoyi.system.service.TBannerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 * 轮播图管理 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
@Api(tags = "轮播图管理")
@RestController
@RequestMapping("/t-banner")
public class TBannerController {

    private final TBannerService bannerService;
    @Autowired
    public TBannerController(TBannerService bannerService) {
        this.bannerService = bannerService;
    }

    /**
     * 获取轮播图管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:banner:list')")
    @ApiOperation(value = "获取轮播图分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TBanner>> pageList(@RequestBody TBannerQuery query) {
        return R.ok(bannerService.pageList(query));
    }

    /**
     * 添加轮播图管理
     */
    @PreAuthorize("@ss.hasPermi('system:banner:add')")
    @Log(title = "轮播图信息-新增轮播图", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加轮播图")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TBanner dto) {
        return R.ok(bannerService.save(dto));
    }

    /**
     * 修改轮播图
     */
    @PreAuthorize("@ss.hasPermi('system:banner:update')")
    @Log(title = "轮播图信息-修改轮播图", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改轮播图")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TBanner dto) {
        return R.ok(bannerService.updateById(dto));
    }

    /**
     * 查看轮播图详情
     */
    @PreAuthorize("@ss.hasPermi('system:banner:detail')")
    @ApiOperation(value = "查看轮播图详情")
    @GetMapping(value = "/getDetailById")
    public R<TBanner> getDetailById(@RequestParam String id) {
        return R.ok(bannerService.getById(id));
    }

    /**
     * 删除轮播图
     */
    @PreAuthorize("@ss.hasPermi('system:banner:delete')")
    @Log(title = "轮播图信息-删除轮播图", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除轮播图")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(bannerService.removeById(id));
    }

    /**
     * 批量删除轮播图
     */
    @PreAuthorize("@ss.hasPermi('system:banner:delete')")
    @Log(title = "轮播图信息-删除轮播图", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除轮播图")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(bannerService.removeByIds(ids));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptController.java

New file
@@ -0,0 +1,149 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TDeptUpAndDownDTO;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.TDeptToUser;
import com.ruoyi.system.query.TDeptQuery;
import com.ruoyi.system.service.TDeptService;
import com.ruoyi.system.service.TDeptToUserService;
import com.ruoyi.system.vo.DeptVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
 * 部门管理 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@Api(tags = "部门管理")
@RestController
@RequestMapping("/t-dept")
public class TDeptController {

    private final TDeptService deptService;
    private final TDeptToUserService deptToUserService;
    private final TokenService tokenService;
    @Autowired
    public TDeptController(TDeptService deptService, TDeptToUserService deptToUserService, TokenService tokenService) {
        this.deptService = deptService;
        this.deptToUserService = deptToUserService;
        this.tokenService = tokenService;
    }

    /**
     * 获取部门管理管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:dept:list')")
    @ApiOperation(value = "获取部门管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<DeptVO>> pageList(@RequestBody TDeptQuery query) {
        return R.ok(deptService.pageList(query));
    }

    /**
     * 添加部门管理管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:add')")
    @Log(title = "部门管理信息-新增部门管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加部门管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TDept dto) {
        // 判断部门id是否存在
        boolean flag = deptService.isExit(dto);
        if (flag){
            return R.fail("部门ID已存在");
        }
        return R.ok(deptService.save(dto));
    }

    /**
     * 修改部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:update')")
    @Log(title = "部门管理信息-修改部门管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改部门管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TDept dto) {
        // 判断部门id是否存在
        boolean flag = deptService.isExit(dto);
        if (flag){
            return R.fail("部门ID已存在");
        }
        return R.ok(deptService.updateById(dto));
    }

    /**
     * 查看部门管理详情
     */
    @PreAuthorize("@ss.hasPermi('system:dept:detail')")
    @ApiOperation(value = "查看部门管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TDept> getDetailById(@RequestParam String id) {
        return R.ok(deptService.getById(id));
    }

    /**
     * 删除部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:delete')")
    @Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除部门管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        // 删除部门用户关联信息
        deptToUserService.remove(Wrappers.lambdaQuery(TDeptToUser.class)
                .eq(TDeptToUser::getDeptId, id));
        return R.ok(deptService.removeById(id));
    }

    /**
     * 批量删除部门管理
     */
    @PreAuthorize("@ss.hasPermi('system:dept:delete')")
    @Log(title = "部门管理信息-删除部门管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除部门管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        // 删除部门用户关联信息
        deptToUserService.remove(Wrappers.lambdaQuery(TDeptToUser.class)
                .in(TDeptToUser::getDeptId, ids));
        return R.ok(deptService.removeByIds(ids));
    }

    /**
     * 轮播图上下架
     */
    @PreAuthorize("@ss.hasPermi('system:dept:upAndDown')")
    @ApiOperation(value = "部门管理上下架",notes = "true:上架，false:下架")
    @PostMapping(value = "/upAndDown")
    public R upAndDown(@RequestBody TDeptUpAndDownDTO dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        TDept dept = deptService.getById(dto.getId());
        dept.setStatus(dto.getStatus());
        dept.setDisableRemark(dto.getDisableRemark());
        dept.setOperatingTime(LocalDateTime.now());
        dept.setOperatingPerson(user.getNickName()+"("+user.getUserName()+")");
        return R.ok(deptService.updateById(dept));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDeptToUserController.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 部门用户中间表 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@RestController
@RequestMapping("/t-dept-to-user")
public class TDeptToUserController {

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultAreaDicController.java

@@ -1,9 +1,26 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.service.TFaultAreaDicService;
import com.ruoyi.system.service.TFaultDescribeDicService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import java.util.List;

/**
 * <p>
@@ -13,9 +30,106 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "故障区域")
@RestController
@RequestMapping("/t-fault-area-dic")
public class TFaultAreaDicController {

    private final TFaultAreaDicService faultAreaDicService;
    private final TFaultDescribeDicService faultDescribeDicService;
    @Autowired
    public TFaultAreaDicController(TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService) {
        this.faultAreaDicService = faultAreaDicService;
        this.faultDescribeDicService = faultDescribeDicService;
    }

    /**
     * 获取故障区域管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:list')")
    @ApiOperation(value = "获取故障区域分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TFaultAreaDic>> pageList(@RequestBody TFaultAreaDicQuery query) {
        return R.ok(faultAreaDicService.pageList(query));
    }

    @PreAuthorize("@ss.hasPermi('system:faultArea:list')")
    @ApiOperation(value = "获取故障区域列表")
    @PostMapping(value = "/list")
    public R<List<TFaultAreaDic>> list() {
        return R.ok(faultAreaDicService.list(Wrappers.lambdaQuery(TFaultAreaDic.class).orderByDesc(TFaultAreaDic::getSortBy).orderByDesc(TFaultAreaDic::getCreateTime)));
    }

    /**
     * 添加故障区域管理
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:add')")
    @Log(title = "故障区域信息-新增故障区域", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加故障区域")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TFaultAreaDic dto) {
        if (faultAreaDicService.isExit(dto)) {
            return R.fail("故障区域名称已存在");
        }
        return R.ok(faultAreaDicService.save(dto));
    }

    /**
     * 修改故障区域
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:update')")
    @Log(title = "故障区域信息-修改故障区域", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改故障区域")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TFaultAreaDic dto) {
        if (faultAreaDicService.isExit(dto)) {
            return R.fail("故障区域名称已存在");
        }
        return R.ok(faultAreaDicService.updateById(dto));
    }

    /**
     * 查看故障区域详情
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:detail')")
    @ApiOperation(value = "查看故障区域详情")
    @GetMapping(value = "/getDetailById")
    public R<TFaultAreaDic> getDetailById(@RequestParam String id) {
        return R.ok(faultAreaDicService.getById(id));
    }

    /**
     * 删除故障区域
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:delete')")
    @Log(title = "故障区域信息-删除故障区域", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除故障区域")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        long count = faultDescribeDicService.count(Wrappers.lambdaQuery(TFaultDescribeDic.class).eq(TFaultDescribeDic::getFaultId, id));
        if (count>0) {
            return R.fail("该区域下有故障描述，无法删除");
        }
        return R.ok(faultAreaDicService.removeById(id));
    }

    /**
     * 批量删除故障区域
     */
    @PreAuthorize("@ss.hasPermi('system:faultArea:delete')")
    @Log(title = "故障区域信息-删除故障区域", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除故障区域")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        List<TFaultDescribeDic> items = faultDescribeDicService.list(Wrappers.lambdaQuery(TFaultDescribeDic.class).in(TFaultDescribeDic::getFaultId, ids));
        for (String id : ids) {
            if (items.stream().anyMatch(t -> t.getFaultId().equals(id))) {
                TFaultAreaDic faultAreaDic = faultAreaDicService.getById(id);
                return R.fail("该区域["+faultAreaDic.getFaultAreaName()+"]下有故障描述，无法删除");
            }
        }
        return R.ok(faultAreaDicService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFaultDescribeDicController.java

@@ -1,9 +1,22 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.query.TFaultDescribeDicQuery;
import com.ruoyi.system.service.TFaultDescribeDicService;
import com.ruoyi.system.vo.TFaultDescribeDicVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import java.util.List;

/**
 * <p>
@@ -13,9 +26,81 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "故障描述")
@RestController
@RequestMapping("/t-fault-describe-dic")
public class TFaultDescribeDicController {


    private final TFaultDescribeDicService faultDescribeDicService;
    @Autowired
    public TFaultDescribeDicController(TFaultDescribeDicService faultDescribeDicService) {
        this.faultDescribeDicService = faultDescribeDicService;
    }

    /**
     * 获取故障描述管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:list')")
    @ApiOperation(value = "获取故障描述分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TFaultDescribeDicVO>> pageList(@RequestBody TFaultDescribeDicQuery query) {
        return R.ok(faultDescribeDicService.pageList(query));
    }

    /**
     * 添加故障描述管理
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:add')")
    @Log(title = "故障描述信息-新增故障描述", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加故障描述")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TFaultDescribeDic dto) {
        return R.ok(faultDescribeDicService.save(dto));
    }

    /**
     * 修改故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:update')")
    @Log(title = "故障描述信息-修改故障描述", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改故障描述")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TFaultDescribeDic dto) {
        return R.ok(faultDescribeDicService.updateById(dto));
    }

    /**
     * 查看故障描述详情
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:detail')")
    @ApiOperation(value = "查看故障描述详情")
    @GetMapping(value = "/getDetailById")
    public R<TFaultDescribeDic> getDetailById(@RequestParam String id) {
        return R.ok(faultDescribeDicService.getById(id));
    }

    /**
     * 删除故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:delete')")
    @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除故障描述")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(faultDescribeDicService.removeById(id));
    }

    /**
     * 批量删除故障描述
     */
    @PreAuthorize("@ss.hasPermi('system:faultDescribe:delete')")
    @Log(title = "故障描述信息-删除故障描述", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除故障描述")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(faultDescribeDicService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java

@@ -1,9 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;
import com.ruoyi.system.service.TInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import java.util.List;

/**
 * <p>
@@ -13,9 +25,80 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "资讯管理")
@RestController
@RequestMapping("/t-information")
public class TInformationController {

    private final TInformationService informationService;
    @Autowired
    public TInformationController(TInformationService informationService) {
        this.informationService = informationService;
    }

    /**
     * 获取资讯管理管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:information:list')")
    @ApiOperation(value = "获取资讯管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TInformation>> pageList(@RequestBody TInformationQuery query) {
        return R.ok(informationService.pageList(query));
    }

    /**
     * 添加资讯管理管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:add')")
    @Log(title = "资讯管理信息-新增资讯管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加资讯管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TInformation dto) {
        return R.ok(informationService.save(dto));
    }

    /**
     * 修改资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:update')")
    @Log(title = "资讯管理信息-修改资讯管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改资讯管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TInformation dto) {
        return R.ok(informationService.updateById(dto));
    }

    /**
     * 查看资讯管理详情
     */
    @PreAuthorize("@ss.hasPermi('system:information:detail')")
    @ApiOperation(value = "查看资讯管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TInformation> getDetailById(@RequestParam String id) {
        return R.ok(informationService.getById(id));
    }

    /**
     * 删除资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:delete')")
    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除资讯管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(informationService.removeById(id));
    }

    /**
     * 批量删除资讯管理
     */
    @PreAuthorize("@ss.hasPermi('system:information:delete')")
    @Log(title = "资讯管理信息-删除资讯管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除资讯管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(informationService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemController.java

@@ -1,9 +1,22 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.query.TItemQuery;
import com.ruoyi.system.service.TItemService;
import com.ruoyi.system.vo.TItemVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import java.util.List;

/**
 * <p>
@@ -13,9 +26,80 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "维修物品管理")
@RestController
@RequestMapping("/t-item")
public class TItemController {

    private final TItemService itemService;
    @Autowired
    public TItemController(TItemService itemService) {
        this.itemService = itemService;
    }

    /**
     * 获取维修物品管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:item:list')")
    @ApiOperation(value = "获取维修物品分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TItemVO>> pageList(@RequestBody TItemQuery query) {
        return R.ok(itemService.pageList(query));
    }

    /**
     * 添加维修物品管理
     */
    @PreAuthorize("@ss.hasPermi('system:item:add')")
    @Log(title = "维修物品信息-新增维修物品", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加维修物品")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TItem dto) {
        return R.ok(itemService.save(dto));
    }

    /**
     * 修改维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:update')")
    @Log(title = "维修物品信息-修改维修物品", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改维修物品")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TItem dto) {
        return R.ok(itemService.updateById(dto));
    }

    /**
     * 查看维修物品详情
     */
    @PreAuthorize("@ss.hasPermi('system:item:detail')")
    @ApiOperation(value = "查看维修物品详情")
    @GetMapping(value = "/getDetailById")
    public R<TItem> getDetailById(@RequestParam String id) {
        return R.ok(itemService.getById(id));
    }

    /**
     * 删除维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:delete')")
    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除维修物品")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(itemService.removeById(id));
    }

    /**
     * 批量删除维修物品
     */
    @PreAuthorize("@ss.hasPermi('system:item:delete')")
    @Log(title = "维修物品信息-删除维修物品", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除维修物品")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(itemService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TItemTypeController.java

@@ -1,9 +1,24 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.service.TItemService;
import com.ruoyi.system.service.TItemTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import java.util.List;

/**
 * <p>
@@ -13,9 +28,109 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "维修物品分类管理")
@RestController
@RequestMapping("/t-item-type")
public class TItemTypeController {

    private final TItemTypeService itemTypeService;
    private final TItemService itemService;
    @Autowired
    public TItemTypeController(TItemTypeService itemTypeService, TItemService itemService) {
        this.itemTypeService = itemTypeService;
        this.itemService = itemService;
    }

    /**
     * 获取维修物品分类管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:list')")
    @ApiOperation(value = "获取维修物品分类分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TItemType>> pageList(@RequestBody TItemTypeQuery query) {
        return R.ok(itemTypeService.pageList(query));
    }

    /**
     * 获取维修物品分类管理列表
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:list')")
    @ApiOperation(value = "获取维修物品分类列表")
    @PostMapping(value = "/list")
    public R<List<TItemType>> list() {
        return R.ok(itemTypeService.list(Wrappers.lambdaQuery(TItemType.class).orderByDesc(TItemType::getSortBy).orderByDesc(TItemType::getCreateTime)));
    }

    /**
     * 添加维修物品分类管理
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:add')")
    @Log(title = "维修物品分类信息-新增维修物品分类", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加维修物品分类")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TItemType dto) {
        if (itemTypeService.isExit(dto)) {
            return R.fail("维修物品分类名称已存在");
        }
        return R.ok(itemTypeService.save(dto));
    }

    /**
     * 修改维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:update')")
    @Log(title = "维修物品分类信息-修改维修物品分类", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改维修物品分类")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TItemType dto) {
        if (itemTypeService.isExit(dto)) {
            return R.fail("维修物品分类名称已存在");
        }
        return R.ok(itemTypeService.updateById(dto));
    }

    /**
     * 查看维修物品分类详情
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:detail')")
    @ApiOperation(value = "查看维修物品分类详情")
    @GetMapping(value = "/getDetailById")
    public R<TItemType> getDetailById(@RequestParam String id) {
        return R.ok(itemTypeService.getById(id));
    }

    /**
     * 删除维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除维修物品分类")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        long count = itemService.count(Wrappers.lambdaQuery(TItem.class).eq(TItem::getTypeId, id));
        if (count>0) {
            return R.fail("该分类下有维修物品，无法删除");
        }
        return R.ok(itemTypeService.removeById(id));
    }

    /**
     * 批量删除维修物品分类
     */
    @PreAuthorize("@ss.hasPermi('system:itemType:delete')")
    @Log(title = "维修物品分类信息-删除维修物品分类", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除维修物品分类")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        List<TItem> items = itemService.list(Wrappers.lambdaQuery(TItem.class).in(TItem::getTypeId, ids));
        for (String id : ids) {
            if (items.stream().anyMatch(t -> t.getTypeId().equals(id))) {
                TItemType itemType = itemTypeService.getById(id);
                return R.fail("该分类["+itemType.getTypeName()+"]下有维修物品，无法删除");
            }
        }
        return R.ok(itemTypeService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysConfigController.java

@@ -1,9 +1,25 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TTenantDTO;
import com.ruoyi.system.model.TSysConfig;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.service.TSysConfigService;
import com.ruoyi.system.service.TTenantService;
import com.ruoyi.system.vo.TenantVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -13,9 +29,38 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "系统公共参数设置")
@RestController
@RequestMapping("/t-sys-config")
public class TSysConfigController {


    private final TSysConfigService sysConfigService;
    @Autowired
    public TSysConfigController(TSysConfigService sysConfigService) {
        this.sysConfigService = sysConfigService;
    }

    /**
     * 系统公共参数设置详情
     */
    @PreAuthorize("@ss.hasPermi('system:config:detail')")
    @ApiOperation(value = "查看系统公共参数设置详情")
    @GetMapping(value = "/getDetailById")
    public R<TSysConfig> getDetailById() {
        return R.ok(sysConfigService.getById(1));
    }

    /**
     * 修改系统公共参数设置
     */
    @PreAuthorize("@ss.hasPermi('system:config:update')")
    @Log(title = "租户信息-修改系统公共参数设置", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改系统公共参数设置")
    @PostMapping(value = "/update")
    public R<Boolean> update(@RequestBody TSysConfig sysConfig) {
        return R.ok(sysConfigService.updateById(sysConfig));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/interceptor/MybatisInterceptor.java

@@ -10,6 +10,7 @@
import org.springframework.stereotype.Component;

import java.lang.reflect.Field;
import java.time.LocalDateTime;
import java.util.*;

@Slf4j
@@ -23,16 +24,13 @@
    @Override
    public Object intercept(Invocation invocation) throws Throwable {
        MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
        log.debug("{}:"+mappedStatement);
        log.debug("------sqlId------" + mappedStatement.getId());
        if("com.ruoyi.system.mapper.SysLogininforMapper.insertLogininfor".equals(mappedStatement.getId())){
            return invocation.proceed();
        }
        // sql类型：insert、update、select、delete
        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
        Object parameter = invocation.getArgs()[1];
        log.debug("------sqlCommandType------" + sqlCommandType);
 

        if (parameter == null) {
            return invocation.proceed();
        }
@@ -56,7 +54,7 @@
                    //注入创建时间
                    if ("createTime".equals(field.getName())) {
                        field.setAccessible(true);
                        field.set(parameter, new Date());
                        field.set(parameter, LocalDateTime.now());
                        field.setAccessible(false);
                    } 
                } catch (Exception e) {
@@ -79,7 +77,7 @@
                    }
                    if ("updateTime".equals(field.getName())) {
                        field.setAccessible(true);
                        field.set(parameter, new Date());
                        field.set(parameter, LocalDateTime.now());
                        field.setAccessible(false);
                    }
                } catch (Exception e) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -1,17 +1,18 @@
package com.ruoyi.web.controller.monitor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.query.SysOperLogQuery;
import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.system.vo.SysOperLogVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;
@@ -30,67 +31,15 @@
    @Autowired
    private ISysOperLogService operLogService;

//    @ApiOperation(value = "操作日志分页列表")
//    @PostMapping("/list")
//    public AjaxResult list(@RequestBody SysOperLogQuery query)
//    {
//        startPage(query.getPageNum(), query.getPageSize());
//        List<SysOperLogVO> list = operLogService.selectOperLogPageList(query);
//        operLogService.getLogDetail(list);
//        return AjaxResult.success(getDataTable(list));
//    }
    @ApiOperation(value = "操作日志分页列表")
    @PostMapping("/list")
    public AjaxResult list(@RequestBody SysOperLogQuery query)
    {
        PageInfo<SysOperLogVO> list = operLogService.selectOperLogPageList(query);
        return AjaxResult.success(list);
    }

    /**
     * 查询操作日志列表导出
     */
//    @ApiOperation(value = "查询操作日志列表导出")
//    @Log(title = "操作日志-查询操作日志列表导出", businessType = BusinessType.EXPORT)
//    @PostMapping("/exportOperLog")
//    public void exportOperLog(@RequestBody SysOperLogQuery query)
//    {
//        List<SysOperLogVO> list = operLogService.selectOperLogPageList(query);
//        List<TOperLogExport> operLogExports = new ArrayList<>();
//        for (SysOperLogVO sysOperLogVO : list) {
//            TOperLogExport operLogExport = new TOperLogExport();
//            BeanUtils.copyProperties(sysOperLogVO,operLogExport);
//            operLogService.getLogDetail(list);
//            operLogExports.add(operLogExport);
//        }
//        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TOperLogExport.class, operLogExports);
//        HttpServletResponse response = WebUtils.response();
//        response.setContentType("application/vnd.ms-excel");
//        response.setCharacterEncoding("utf-8");
//        ServletOutputStream outputStream = null;
//        try {
//            String fileName = URLEncoder.encode("操作日志信息.xls", "utf-8");
//            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
//            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
//            response.setHeader("Pragma", "no-cache");
//            response.setHeader("Cache-Control", "no-cache");
//            outputStream = response.getOutputStream();
//            workbook.write(outputStream);
//        } catch (IOException e) {
//            e.printStackTrace();
//            log.error("操作日志导出信息导出失败！");
//        } finally {
//            try {
//                outputStream.close();
//            } catch (IOException e) {
//                e.printStackTrace();
//            }
//        }
//    }

//    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, SysOperLog operLog)
//    {
//        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
//        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
//        util.exportExcel(response, list, "操作日志");
//    }

    @Log(title = "操作日志", businessType = BusinessType.DELETE)
    @Log(title = "删除操作日志", businessType = BusinessType.DELETE)
    @DeleteMapping("/deleteById/{operIds}")
    public AjaxResult remove(@PathVariable String operIds)
    {
@@ -102,7 +51,7 @@
        return AjaxResult.success(operLogService.deleteOperLogByIds(id));
    }

    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
    @Log(title = "清除操作日志", businessType = BusinessType.CLEAN)
    @DeleteMapping("/clean")
    public AjaxResult clean()
    {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -15,6 +15,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
@@ -61,15 +62,16 @@
    @Autowired
    private ISysMenuService menuService;

    // @PreAuthorize("@ss.hasPermi('system:role:list')")
    @PreAuthorize("@ss.hasPermi('system:role:list')")
    @ApiOperation(value = "角色列表")
    @PostMapping("/list")
    public AjaxResult list(@RequestBody SysRoleQuery query)
    {
        PageInfo<SysRole> list = roleService.selectList(query);
        PageInfo<SysRole> list = roleService.selectPageList(query);
        return AjaxResult.success(list);
    }

    @PreAuthorize("@ss.hasPermi('system:role:list')")
    @ApiOperation(value = "角色列表不分页")
    @PostMapping("/listNotPage")
    public AjaxResult list()
@@ -77,7 +79,7 @@
        List<SysRole> list = roleService.selectRoleList(new SysRole());
        return AjaxResult.success(list);
    }

    @PreAuthorize("@ss.hasPermi('system:role:count')")
    @ApiOperation(value = "角色数量统计")
    @PostMapping("/roleCount")
    public AjaxResult roleCount()
@@ -106,7 +108,7 @@
    /**
     * 根据角色编号获取详细信息
     */
    // @PreAuthorize("@ss.hasPermi('system:role:query')")
     @PreAuthorize("@ss.hasPermi('system:role:query')")
    @GetMapping(value = "/{roleId}")
    public AjaxResult getInfo(@PathVariable Long roleId)
    {
@@ -114,7 +116,7 @@
        return AjaxResult.success(roleService.selectRoleById(roleId));
    }


    @PreAuthorize("@ss.hasPermi('system:role:detail')")
    @ApiOperation("角色详情")
    @GetMapping("/roleInfo")
    public AjaxResult roleInfo(@RequestParam Long roleId)
@@ -150,7 +152,7 @@
    /**
     * 新增角色
     */
    // @PreAuthorize("@ss.hasPermi('system:role:add')")
     @PreAuthorize("@ss.hasPermi('system:role:add')")
    @ApiOperation(value = "新增角色")
    @Log(title = "角色信息-新增角色", businessType = BusinessType.INSERT)
    @PostMapping("/add")
@@ -168,7 +170,7 @@
    /**
     * 修改保存角色
     */
    // @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
    @ApiOperation(value = "编辑角色")
    @Log(title = "角色信息-编辑角色", businessType = BusinessType.UPDATE)
    @PutMapping

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TDeptController.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 部门管理 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@RestController
@RequestMapping("/t-dept")
public class TDeptController {

}


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TDeptToUserController.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 * 部门用户中间表 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@RestController
@RequestMapping("/t-dept-to-user")
public class TDeptToUserController {

}


 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

@@ -1,5 +1,6 @@
package com.ruoyi.common.core.domain.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.domain.BaseModel;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -74,6 +75,11 @@
     * 岗位类型 1=经理 2=负责人 3=专员
     */
    private Integer postType;
    /**
     * 角色人数
     */
    @TableField(exist = false)
    private Integer userCount;

    public Integer getPostType() {
        return postType;

 ruoyi-system/src/main/java/com/ruoyi/system/dto/SysRoleDTO.java

@@ -19,6 +19,8 @@

    @ApiModelProperty(value = "类型")
    private Integer postType;
    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "权限id集合")
    private List<Long> menuIds;

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TDeptUpAndDownDTO.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel(value = "部门启用禁用dto")
public class TDeptUpAndDownDTO implements Serializable {

    @ApiModelProperty(value = "部门id")
    private String id;

    @ApiModelProperty(value = "部门状态 1=启用 0=禁用")
    private Integer status;

    @ApiModelProperty(value = "备注")
    private String disableRemark;

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java

@@ -1,7 +1,11 @@
package com.ruoyi.system.mapper;

import java.util.List;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.query.SysOperLogQuery;
import com.ruoyi.system.vo.SysOperLogVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -50,6 +54,15 @@
    public void cleanOperLog();

    /**
     * 分页查询操作日志
     * @param query
     * @param pageInfo
     * @return
     */
    List<SysOperLogVO> selectOperLogPageList(@Param("query") SysOperLogQuery query, @Param("pageInfo")PageInfo<SysOperLogVO> pageInfo);


    /**
     * 操作日志分页列表
     * @param query
     * @return

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -125,6 +125,6 @@

    String selectByUserId(@Param("userId") Long user_id);

    List<SysRole> selectList(@Param("query")SysRoleQuery query,@Param("pageInfo") PageInfo<SysRole> pageInfo);
    List<SysRole> selectPageList(@Param("query")SysRoleQuery query,@Param("pageInfo") PageInfo<SysRole> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java

New file
@@ -0,0 +1,29 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.query.TBannerQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * 轮播图管理 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
public interface TBannerMapper extends BaseMapper<TBanner> {

    /**
     * 获取轮播图管理列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TBanner> pageList(@Param("query") TBannerQuery query, @Param("pageInfo")PageInfo<TBanner> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TDeptMapper.java

New file
@@ -0,0 +1,30 @@
package com.ruoyi.system.mapper;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TDept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.TDeptQuery;
import com.ruoyi.system.vo.DeptVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 * 部门管理 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
public interface TDeptMapper extends BaseMapper<TDept> {

    /**
     * 分页查询部门管理
     * @param query
     * @param pageInfo
     * @return
     */
    List<DeptVO> pageList(@Param("query") TDeptQuery query, @Param("pageInfo")PageInfo<DeptVO> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TDeptToUserMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;

import com.ruoyi.system.model.TDeptToUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 部门用户中间表 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
public interface TDeptToUserMapper extends BaseMapper<TDeptToUser> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultAreaDicMapper.java

@@ -1,7 +1,13 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -11,6 +17,15 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Mapper
public interface TFaultAreaDicMapper extends BaseMapper<TFaultAreaDic> {

    /**
     * 分页查询
     * @param query
     * @param pageInfo
     * @return
     */
    List<TFaultAreaDic> pageList(@Param("query")TFaultAreaDicQuery query, @Param("pageInfo")PageInfo<TFaultAreaDic> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultDescribeDicMapper.java

@@ -1,7 +1,13 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.query.TFaultDescribeDicQuery;
import com.ruoyi.system.vo.TFaultDescribeDicVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,11 @@
 */
public interface TFaultDescribeDicMapper extends BaseMapper<TFaultDescribeDic> {

    /**
     * 获取故障描述分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TFaultDescribeDicVO> pageList(@Param("query") TFaultDescribeDicQuery query, @Param("pageInfo") PageInfo<TFaultDescribeDicVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,11 @@
 */
public interface TInformationMapper extends BaseMapper<TInformation> {

    /**
     * 获取资讯管理分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TInformation> pageList(@Param("query") TInformationQuery query, @Param("pageInfo")PageInfo<TInformation> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemMapper.java

@@ -1,7 +1,13 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.query.TItemQuery;
import com.ruoyi.system.vo.TItemVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,12 @@
 */
public interface TItemMapper extends BaseMapper<TItem> {

    /**
     * 获取维修物品分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TItemVO> pageList(@Param("query") TItemQuery query, @Param("pageInfo")PageInfo<TItemVO> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.system.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,11 @@
 */
public interface TItemTypeMapper extends BaseMapper<TItemType> {

    /**
     * 获取维修物品分类管理列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TItemType> pageList(@Param("query") TItemTypeQuery query, @Param("pageInfo")PageInfo<TItemType> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBanner.java

New file
@@ -0,0 +1,43 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 轮播图管理
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_banner")
@ApiModel(value="TBanner对象", description="轮播图管理")
public class TBanner extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "图片")
    @TableField("pictures")
    private String pictures;

    @ApiModelProperty(value = "权重")
    @TableField("sort_by")
    private Integer sortBy;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java

@@ -40,6 +40,10 @@
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "合同编号")
    @TableField("contract_number")
    private String contractNumber;

    @ApiModelProperty(value = "应缴费")
    @TableField("payable_fees_money")
    private BigDecimal payableFeesMoney;
@@ -92,9 +96,9 @@
    @TableField("bank_serial_number")
    private String bankSerialNumber;

    @ApiModelProperty(value = "实际收款")
    @TableField("actual_money")
    private BigDecimal actualMoney;
    @ApiModelProperty(value = "欠费金额")
    @TableField("outstanding_money")
    private BigDecimal outstandingMoney;

    @ApiModelProperty(value = "凭证上传")
    @TableField("voucher")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TDept.java

New file
@@ -0,0 +1,71 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;

/**
 * <p>
 * 部门管理
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_dept")
@ApiModel(value="TDept对象", description="部门管理")
public class TDept extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @NotBlank(message = "部门ID不能为空")
    @Length(max = 10, message = "部门ID不能超过10个字符")
    @ApiModelProperty(value = "部门id")
    @TableField("dept_id")
    private String deptId;

    @NotBlank(message = "部门名称不能为空")
    @ApiModelProperty(value = "部门名称")
    @TableField("dept_name")
    private String deptName;

    @ApiModelProperty(value = "部门状态 1=启用 0=禁用")
    @TableField("status")
    private Integer status;

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

    @ApiModelProperty(value = "禁用备注")
    @TableField("disable_remark")
    private String disableRemark;

    @ApiModelProperty(value = "操作时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("operating_time")
    private LocalDateTime operatingTime;

    @ApiModelProperty(value = "操作人  登录名（登录账号）")
    @TableField("operating_person")
    private String operatingPerson;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TDeptToUser.java

New file
@@ -0,0 +1,41 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * <p>
 * 部门用户中间表
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_dept_to_user")
@ApiModel(value="TDeptToUser对象", description="部门用户中间表")
public class TDeptToUser implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @ApiModelProperty(value = "部门主键id")
    @TableField("dept_id")
    private String deptId;

    @ApiModelProperty(value = "用户id")
    @TableField("user_id")
    private Long userId;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultAreaDic.java

@@ -5,10 +5,15 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

/**
 * <p>
@@ -22,16 +27,20 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_fault_area_dic")
@ApiModel(value="TFaultAreaDic对象", description="故障区域")
public class TFaultAreaDic implements Serializable {
public class TFaultAreaDic extends BaseModel {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @NotBlank(message = "故障区域名称不能为空")
    @ApiModelProperty(value = "故障区域名称")
    @TableField("fault_area_name")
    private String faultAreaName;


    @NotNull(message = "权重不能为空")
    @ApiModelProperty(value = "权重")
    @TableField("sort_by")
    private Integer sortBy;
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultDescribeDic.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;

import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_fault_describe_dic")
@ApiModel(value="TFaultDescribeDic对象", description="故障描述")
public class TFaultDescribeDic implements Serializable {
public class TFaultDescribeDic extends BaseModel {

    private static final long serialVersionUID = 1L;

@@ -37,5 +39,8 @@
    @TableField("describe_name")
    private String describeName;

    @ApiModelProperty(value = "权重")
    @TableField("sort_by")
    private Integer sortBy;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java

@@ -14,6 +14,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

/**
 * <p>
 * 资讯管理
@@ -33,6 +36,7 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @NotBlank(message = "资讯标题不能为空")
    @ApiModelProperty(value = "标题")
    @TableField("title_name")
    private String titleName;
@@ -45,6 +49,7 @@
    @TableField("info_source")
    private String infoSource;

    @NotNull(message = "请选择发布时间")
    @ApiModelProperty(value = "发布时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("release_time")
@@ -54,9 +59,12 @@
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "附件")
    @ApiModelProperty(value = "附件 逗号分割 ")
    @TableField("attachment")
    private String attachment;

    @ApiModelProperty(value = "附件名称  与附件顺序一致")
    @TableField("attachment_name")
    private String attachmentName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "操作日志查询query")
public class SysOperLogQuery extends BasePage {



}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TBannerQuery.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "轮播图query")
public class TBannerQuery extends BasePage {



}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TDeptQuery.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@Data
@ApiModel(value = "部门管理查询条件query")
public class TDeptQuery extends BasePage {

    @ApiModelProperty(value = "部门ID/名称")
    private String deptIdOrName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultAreaDicQuery.java

New file
@@ -0,0 +1,11 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "故障区域query")
public class TFaultAreaDicQuery extends BasePage {

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultDescribeDicQuery.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "故障描述query")
public class TFaultDescribeDicQuery extends BasePage {
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "咨询列表query")
public class TInformationQuery extends BasePage {

    @ApiModelProperty(value = "标题")
    private String titleName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TItemQuery.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "维修物品query")
public class TItemQuery extends BasePage {

    @ApiModelProperty(value = "分类id")
    private String typeId;

    @ApiModelProperty(value = "物品名称")
    private String itemName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TItemTypeQuery.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "维修物品分类query")
public class TItemTypeQuery extends BasePage {
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java

@@ -1,7 +1,11 @@
package com.ruoyi.system.service;

import java.util.List;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.query.SysOperLogQuery;
import com.ruoyi.system.vo.SysOperLogVO;

/**
 * 操作日志 服务层
@@ -51,6 +55,13 @@
     * @param query
     * @return
     */
    PageInfo<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query);

    /**
     * 操作日志分页列表
     * @param query
     * @return
     */
//    List<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query);

//    void getLogDetail(List<SysOperLogVO> sysOperLogVOS);

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -223,7 +223,7 @@

    void saveRole(SysRoleDTO dto);

    PageInfo<SysRole> selectList(SysRoleQuery query);
    PageInfo<SysRole> selectPageList(SysRoleQuery query);

    /**
     * 修改保存角色信息

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.query.TBannerQuery;

/**
 * <p>
 * 轮播图管理 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
public interface TBannerService extends IService<TBanner> {

    /**
     * 获取轮播图分页列表
     * @param query
     * @return
     */
    PageInfo<TBanner> pageList(TBannerQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptService.java

New file
@@ -0,0 +1,34 @@
package com.ruoyi.system.service;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.TDeptUpAndDownDTO;
import com.ruoyi.system.model.TDept;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.query.TDeptQuery;
import com.ruoyi.system.vo.DeptVO;

/**
 * <p>
 * 部门管理 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
public interface TDeptService extends IService<TDept> {

    /**
     * 部门ID是否存在
     * @param dto
     * @return
     */
    boolean isExit(TDept dto);

    /**
     * 获取部门管理分页列表
     * @param query
     * @return
     */
    PageInfo<DeptVO> pageList(TDeptQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TDeptToUserService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;

import com.ruoyi.system.model.TDeptToUser;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 部门用户中间表 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
public interface TDeptToUserService extends IService<TDeptToUser> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java

@@ -1,7 +1,9 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;

/**
 * <p>
@@ -13,4 +15,17 @@
 */
public interface TFaultAreaDicService extends IService<TFaultAreaDic> {

    /**
     * 获取故障区域管理列表
     * @param query
     * @return
     */
    PageInfo<TFaultAreaDic> pageList(TFaultAreaDicQuery query);

    /**
     * 判断区域是否存在
     * @param dto
     * @return
     */
    boolean isExit(TFaultAreaDic dto);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultDescribeDicService.java

@@ -1,7 +1,10 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.query.TFaultDescribeDicQuery;
import com.ruoyi.system.vo.TFaultDescribeDicVO;

/**
 * <p>
@@ -13,4 +16,10 @@
 */
public interface TFaultDescribeDicService extends IService<TFaultDescribeDic> {

    /**
     * 获取故障描述分页列表
     * @param query
     * @return
     */
    PageInfo<TFaultDescribeDicVO> pageList(TFaultDescribeDicQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java

@@ -1,7 +1,9 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;

/**
 * <p>
@@ -13,4 +15,10 @@
 */
public interface TInformationService extends IService<TInformation> {

    /**
     * 分页查询
     * @param query
     * @return
     */
    PageInfo<TInformation> pageList(TInformationQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemService.java

@@ -1,7 +1,10 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.query.TItemQuery;
import com.ruoyi.system.vo.TItemVO;

/**
 * <p>
@@ -13,4 +16,10 @@
 */
public interface TItemService extends IService<TItem> {

    /**
     * 获取维修物品分页列表
     * @param query
     * @return
     */
    PageInfo<TItemVO> pageList(TItemQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java

@@ -1,7 +1,9 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;

/**
 * <p>
@@ -13,4 +15,17 @@
 */
public interface TItemTypeService extends IService<TItemType> {

    /**
     * 判断分类是否存在
     * @param dto
     * @return
     */
    boolean isExit(TItemType dto);

    /**
     * 获取维修物品分类分页列表
     * @param query
     * @return
     */
    PageInfo<TItemType> pageList(TItemTypeQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

@@ -1,9 +1,13 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.SysOperLogQuery;
import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.system.vo.SysOperLogVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -78,10 +82,13 @@
        operLogMapper.cleanOperLog();
    }

//    @Override
//    public List<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query) {
//        return operLogMapper.selectOperLogPageList(query);
//    }
    @Override
    public PageInfo<SysOperLogVO> selectOperLogPageList(SysOperLogQuery query) {
        PageInfo<SysOperLogVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<SysOperLogVO> list = operLogMapper.selectOperLogPageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

//    @Override
//    public void getLogDetail(List<SysOperLogVO> sysOperLogVOS) {

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -22,6 +22,7 @@
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import org.springframework.util.CollectionUtils;

/**
 * 角色 业务层处理
@@ -558,6 +559,7 @@
        SysRole sysRole = new SysRole();
        sysRole.setRoleName(dto.getRoleName());
        sysRole.setPostType(dto.getPostType());
        sysRole.setRemark(dto.getRemark());
        roleMapper.insertRole(sysRole);

        // 添加角色权限中间表
@@ -573,9 +575,9 @@
    }

    @Override
    public PageInfo<SysRole> selectList(SysRoleQuery query) {
    public PageInfo<SysRole> selectPageList(SysRoleQuery query) {
        PageInfo<SysRole> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<SysRole> list = roleMapper.selectList(query,pageInfo);
        List<SysRole> list = roleMapper.selectPageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
@@ -587,6 +589,7 @@
        sysRole.setRoleId(dto.getRoleId());
        sysRole.setRoleName(dto.getRoleName());
        sysRole.setPostType(dto.getPostType());
        sysRole.setRemark(dto.getRemark());
        roleMapper.updateRole(sysRole);
        // 删除角色与菜单关联
        roleMenuMapper.deleteRoleMenuByRoleId(dto.getRoleId());

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.mapper.TBannerMapper;
import com.ruoyi.system.model.TBanner;
import com.ruoyi.system.query.TBannerQuery;
import com.ruoyi.system.service.TBannerService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
 * 轮播图管理 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-07
 */
@Service
public class TBannerServiceImpl extends ServiceImpl<TBannerMapper, TBanner> implements TBannerService {

    @Override
    public PageInfo<TBanner> pageList(TBannerQuery query) {
        PageInfo<TBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TBanner> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptServiceImpl.java

New file
@@ -0,0 +1,49 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TDeptUpAndDownDTO;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.query.TDeptQuery;
import com.ruoyi.system.service.TDeptService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.DeptVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
 * 部门管理 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@Service
public class TDeptServiceImpl extends ServiceImpl<TDeptMapper, TDept> implements TDeptService {

    @Override
    public boolean isExit(TDept dto) {
        if(StringUtils.isNotEmpty(dto.getDeptId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TDept.class).ne(TDept::getId, dto.getId()).eq(TDept::getDeptId, dto.getDeptId())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TDept.class).eq(TDept::getDeptId, dto.getDeptId())) > 0;
        }
    }

    @Override
    public PageInfo<DeptVO> pageList(TDeptQuery query) {
        PageInfo<DeptVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<DeptVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TDeptToUserServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TDeptToUser;
import com.ruoyi.system.mapper.TDeptToUserMapper;
import com.ruoyi.system.service.TDeptToUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 部门用户中间表 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-02-06
 */
@Service
public class TDeptToUserServiceImpl extends ServiceImpl<TDeptToUserMapper, TDeptToUser> implements TDeptToUserService {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java

@@ -1,10 +1,20 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TFaultAreaDicMapper;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.service.TFaultAreaDicService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TenantVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +27,22 @@
@Service
public class TFaultAreaDicServiceImpl extends ServiceImpl<TFaultAreaDicMapper, TFaultAreaDic> implements TFaultAreaDicService {

    @Override
    public PageInfo<TFaultAreaDic> pageList(TFaultAreaDicQuery query) {
        PageInfo<TFaultAreaDic> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TFaultAreaDic> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public boolean isExit(TFaultAreaDic dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TFaultAreaDic.class).ne(TFaultAreaDic::getId, dto.getId()).eq(TFaultAreaDic::getFaultAreaName, dto.getFaultAreaName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TFaultAreaDic.class).eq(TFaultAreaDic::getFaultAreaName, dto.getFaultAreaName())) > 0;
        }
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultDescribeDicServiceImpl.java

@@ -1,10 +1,22 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TFaultAreaDicMapper;
import com.ruoyi.system.mapper.TFaultDescribeDicMapper;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.model.TFaultDescribeDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.query.TFaultDescribeDicQuery;
import com.ruoyi.system.service.TFaultDescribeDicService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TFaultDescribeDicVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -17,4 +29,23 @@
@Service
public class TFaultDescribeDicServiceImpl extends ServiceImpl<TFaultDescribeDicMapper, TFaultDescribeDic> implements TFaultDescribeDicService {

    @Autowired
    private TFaultAreaDicMapper faultAreaDicMapper;

    @Override
    public PageInfo<TFaultDescribeDicVO> pageList(TFaultDescribeDicQuery query) {
        PageInfo<TFaultDescribeDicVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TFaultDescribeDicVO> list = this.baseMapper.pageList(query,pageInfo);
        if(!CollectionUtils.isEmpty(list)){
            List<String> areaIds = list.stream().map(TFaultDescribeDicVO::getFaultId).collect(Collectors.toList());
            List<TFaultAreaDic> tFaultAreaDicList = faultAreaDicMapper.selectList(Wrappers.lambdaQuery(TFaultAreaDic.class)
                    .in(TFaultAreaDic::getId, areaIds));
            for (TFaultDescribeDicVO tFaultDescribeDicVO : list) {
                tFaultDescribeDicVO.setFaultAreaName(tFaultAreaDicList.stream().filter(t -> t.getId().equals(tFaultDescribeDicVO.getFaultId()))
                        .findFirst().orElse(new TFaultAreaDic()).getFaultAreaName());
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TInformationMapper;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;
import com.ruoyi.system.service.TInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.HouseVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +22,11 @@
@Service
public class TInformationServiceImpl extends ServiceImpl<TInformationMapper, TInformation> implements TInformationService {

    @Override
    public PageInfo<TInformation> pageList(TInformationQuery query) {
        PageInfo<TInformation> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TInformation> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TItemMapper;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.model.TItem;
import com.ruoyi.system.query.TItemQuery;
import com.ruoyi.system.service.TItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TItemVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TItemServiceImpl extends ServiceImpl<TItemMapper, TItem> implements TItemService {

    @Override
    public PageInfo<TItemVO> pageList(TItemQuery query) {
        PageInfo<TItemVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TItemVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java

@@ -1,10 +1,18 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TItemTypeMapper;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.service.TItemTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,22 @@
@Service
public class TItemTypeServiceImpl extends ServiceImpl<TItemTypeMapper, TItemType> implements TItemTypeService {

    @Override
    public boolean isExit(TItemType dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TItemType.class).ne(TItemType::getId, dto.getId()).eq(TItemType::getTypeName, dto.getTypeName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TItemType.class).eq(TItemType::getTypeName, dto.getTypeName())) > 0;
        }
    }

    @Override
    public PageInfo<TItemType> pageList(TItemTypeQuery query) {
        PageInfo<TItemType> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TItemType> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/DeptVO.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TDept;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "部门返回VO")
public class DeptVO extends TDept {

    @ApiModelProperty(value = "部门人数")
    private Integer userCount;

}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TFaultDescribeDicVO.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TFaultDescribeDic;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "故障描述VO")
public class TFaultDescribeDicVO extends TFaultDescribeDic {

    @ApiModelProperty(value = "故障区域名称")
    private String faultAreaName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemVO.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "维修物品VO")
public class TItemVO extends TItem {

    @ApiModelProperty(value = "分类名称")
    private String typeName;

}

 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -95,19 +95,28 @@
            AND del_flag = 0
        </where>
    </select>
    <select id="selectList" resultType="com.ruoyi.common.core.domain.entity.SysRole">
        select role_id AS roleId, role_name AS roleName, role_key AS roleKey, role_sort AS roleSort, data_scope AS dataScope,
               menu_check_strictly AS menuCheckStrictly, dept_check_strictly AS deptCheckStrictly,status AS status, del_flag AS delFlag,
               create_time AS createTime,create_by AS createBy,postType AS postType,removeDays AS removeDays
        from sys_role
    <select id="selectPageList" resultType="com.ruoyi.common.core.domain.entity.SysRole">
        select a.role_id AS roleId, a.role_name AS roleName, a.role_key AS roleKey, a.role_sort AS roleSort, a.data_scope AS dataScope,
        a.menu_check_strictly AS menuCheckStrictly, a.dept_check_strictly AS deptCheckStrictly,a.status AS status, a.del_flag AS delFlag,
        a.create_time AS createTime,a.create_by AS createBy,a.postType AS postType,a.removeDays AS removeDays,
        IFNULL(b.userCount,0) as userCount
        from sys_role a
        LEFT JOIN
        (SELECT
        r.role_id AS roleId,
        COUNT(ur.user_id) AS userCount
        FROM sys_role r
        LEFT JOIN sys_user_role ur ON r.role_id = ur.role_id
        where r.del_flag = 0
        GROUP BY r.role_id) b on a.role_id = b.roleId
        <where>
            <if test="query.roleName != null and query.roleName != ''">
                AND role_name LIKE concat('%',#{query.roleName},'%')
                AND a.role_name LIKE concat('%',#{query.roleName},'%')
            </if>
            <if test="query.status != null">
                AND status = #{query.status}
                AND a.status = #{query.status}
            </if>
            AND del_flag = 0
            AND a.del_flag = 0
        </where>
    </select>
    <select id="selectCount" resultType="java.lang.Integer">

 ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TBannerMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBanner">
        <id column="id" property="id" />
        <result column="pictures" property="pictures" />
        <result column="sort_by" property="sortBy" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, pictures, sort_by, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TBanner">
        select
        <include refid="Base_Column_List"/>
        from t_banner
        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by sort_by, create_time desc
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TBill">
        <id column="id" property="id" />
        <result column="contract_id" property="contractId" />
        <result column="contract_number" property="contractNumber" />
        <result column="payable_fees_money" property="payableFeesMoney" />
        <result column="payable_fees_time" property="payableFeesTime" />
        <result column="pay_fees_status" property="payFeesStatus" />
@@ -18,7 +19,7 @@
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="bank_serial_number" property="bankSerialNumber" />
        <result column="actual_money" property="actualMoney" />
        <result column="outstanding_money" property="outstandingMoney" />
        <result column="voucher" property="voucher" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
@@ -29,7 +30,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contract_id, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, actual_money, voucher, create_time, update_time, create_by, update_by, disabled
        id, contract_id,contract_number, payable_fees_money, payable_fees_time, pay_fees_status, pay_fees_money, pay_fees_time, pay_fees_type, bill_type, over_days, payable_fees_penalty, start_time, end_time, bank_serial_number, outstanding_money, voucher, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml

@@ -41,6 +41,9 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, contract_number, contract_name, start_time, end_time, total_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit,
            proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone,
            contract_file, remark, status, create_time, update_time, create_by, update_by, disabled
        id, contract_number, contract_name, start_time, end_time, month_rent, deposit, pay_type, first_pay_time, isIncreasing, isIncreasing_deposit, proportion, house_id, party_one_name, party_one_person, party_one_phone, tenant_id, party_two_name, party_two_person, party_two_phone, contract_file, remark, status, create_time, update_time, create_by, update_by, disabled,
            memory, contract_file_name, signature, terminate_remark, total_year
    </sql>

 ruoyi-system/src/main/resources/mapper/system/TDeptMapper.xml

New file
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TDeptMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TDept">
        <id column="id" property="id" />
        <result column="dept_id" property="deptId" />
        <result column="dept_name" property="deptName" />
        <result column="status" property="status" />
        <result column="remark" property="remark" />
        <result column="disable_remark" property="disableRemark" />
        <result column="operating_time" property="operatingTime" />
        <result column="operating_person" property="operatingPerson" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, dept_id, dept_name, status, remark, disable_remark, operating_time, operating_person, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.DeptVO">
        select
            t.id,
            t.dept_id,
            t.dept_name,
            t.status,
            t.remark,
            t.disable_remark,
            t.operating_time,
            t.operating_person,
            t.create_time,
            t.update_time,
            t.create_by,
            t.update_by,
            t.disabled,
            b.userCount
        from t_dept t
                 LEFT JOIN
             (SELECT a.id,COUNT(tu.user_id) AS userCount
              FROM t_dept a
              LEFT JOIN t_dept_to_user tu ON a.id = tu.dept_id
              where a.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
              GROUP BY a.id) b on t.id = b.id
        <where>
            <if test="query.deptIdOrName != null and query.deptIdOrName != ''">
                AND (t.dept_id like concat('%', #{query.deptIdOrName},'%')
                         OR t.dept_name like concat('%', #{query.deptIdOrName},'%'))
            </if>
            AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY t.create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml

New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.TDeptToUserMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TDeptToUser">
        <id column="id" property="id" />
        <result column="dept_id" property="deptId" />
        <result column="user_id" property="userId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, dept_id, user_id
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml

@@ -6,11 +6,23 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultAreaDic">
        <id column="id" property="id" />
        <result column="fault_area_name" property="faultAreaName" />
        <result column="sort_by" property="sortBy" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, fault_area_name
        id, fault_area_name,sort_by, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TFaultAreaDic">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_fault_area_dic
        WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultDescribeDicMapper.xml

@@ -7,11 +7,24 @@
        <id column="id" property="id" />
        <result column="fault_id" property="faultId" />
        <result column="describe_name" property="describeName" />
        <result column="sort_by" property="sortBy" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
        <result column="update_by" property="updateBy" />
        <result column="disabled" property="disabled" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, fault_id, describe_name
        id, fault_id, describe_name,sort_by, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TFaultDescribeDicVO">
        select
        <include refid="Base_Column_List"/>
        from t_fault_describe_dic
        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml

@@ -11,6 +11,7 @@
        <result column="release_time" property="releaseTime" />
        <result column="content" property="content" />
        <result column="attachment" property="attachment" />
        <result column="attachment_name" property="attachmentName" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -20,7 +21,19 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, title_name, sort_by, info_source, release_time, content, attachment, create_time, update_time, create_by, update_by, disabled
        id, title_name, sort_by, info_source, release_time, content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TInformation">
        select
        <include refid="Base_Column_List"/>
        from t_information
        <where>
            <if test="query.titleName != null and query.titleName != ''">
                and title_name like concat('%',#{query.titleName},'%')
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TItemMapper.xml

@@ -20,5 +20,22 @@
    <sql id="Base_Column_List">
        id, type_id, item_name, sort_by, pictures, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TItemVO">
        select
        t.id, t.type_id, t.item_name, t.sort_by, t.pictures, t.create_time, t.update_time, t.create_by, t.update_by, t.disabled
        tt.type_name
        from t_item t
        left join t_item_type tt on t.type_id = tt.id
        <where>
            <if test="query.itemName != null and query.itemName != ''">
                and t.item_name like concat('%', #{query.itemName}, '%')
            </if>
            <if test="query.typeId != null and query.typeId != ''">
                and t.type_id = #{query.typeId}
            </if>
            and t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        order by t.sort_by, t.create_time desc
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml

@@ -18,5 +18,12 @@
    <sql id="Base_Column_List">
        id, type_name, sort_by, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TItemType">
        select
        <include refid="Base_Column_List"/>
        from t_item_type
        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>