Merge remote-tracking branch 'origin/master'

xuhy

2025-06-03 0ea9c37b0beda9ca760cb81ef9bb040f6d51cbec

Merge remote-tracking branch 'origin/master'

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

@@ -37,9 +37,7 @@
    @Resource
    private TKnowledgeService knowledgeService;

    /**
     * 获取谱系图详情待入库菌种分页列表
     */

    @ApiOperation(value = "环卫知识分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<KnowledgeListVO>> pageList(@RequestBody KnowledgeListQuery query) {

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

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.TLeave;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * 用户与角色关联表 数据层
 * 
 * @author ruoyi
 */
@Mapper
public interface TDeptMapper extends BaseMapper<TDept>
{


}

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

New file
@@ -0,0 +1,41 @@
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;

/**
 * <p>
 * 项目部
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
@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;

    @ApiModelProperty(value = "项目部名称")
    @TableField("dept_name")
    private String deptName;

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


}

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

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

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

/**
 * <p>
 * 通知设置 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
public interface TDeptService extends IService<TDept> {

}

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TDeptMapper;
import com.ruoyi.system.mapper.TSysConfigMapper;
import com.ruoyi.system.model.TDept;
import com.ruoyi.system.model.TSysConfig;
import com.ruoyi.system.service.TDeptService;
import com.ruoyi.system.service.TSysConfigService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 系统公共参数设置 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
@Service
public class TDeptServiceImpl extends ServiceImpl<TDeptMapper, TDept> implements TDeptService {

}

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

New file
@@ -0,0 +1,7 @@
<?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">



</mapper>