基础系统设置

无关风月

2025-06-02 2d72905540a9e4b1dfa7b7bc8e557a5f6ec501a2

基础系统设置

 generator/pom.xml

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/GenTableColumnController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/GenTableController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/SysDictDataController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/SysNoticeController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TAppealController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TCleanerController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TEarlyWarningController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TFeedbackController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TInspectorController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TKnowledgeController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TLeaveAuditController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TLeaveController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TLocationController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TLocationTypeController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TNoticeSetController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TProblemEscalationController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TProjectDeptController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TSqlRecordController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TSysConfigController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TSystemBulletinController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TTaskController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TTaskDetailController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TTemplateController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/controller/TTemplateDetailController.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/GenTableColumnMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/GenTableMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TAppealMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TCleanerMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TEarlyWarningMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TFeedbackMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TInspectorMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TKnowledgeMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TLeaveAuditMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TLeaveMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TLocationMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TLocationTypeMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TNoticeSetMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TProblemEscalationMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TSqlRecordMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TSysConfigMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TSystemBulletinMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TTaskDetailMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TTaskMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TTemplateDetailMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/mapper/TTemplateMapper.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/GenTable.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/GenTableColumn.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/SysDictData.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/SysDictType.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/SysNotice.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TAppeal.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TCleaner.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TEarlyWarning.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TFeedback.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TInspector.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TKnowledge.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TLeave.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TLeaveAudit.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TLocation.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TLocationType.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TNoticeSet.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TProblemEscalation.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TProjectDept.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TSqlRecord.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TSysConfig.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TSystemBulletin.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TTask.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TTaskDetail.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TTemplate.java

File was deleted

 generator/src/main/java/com/ruoyi/system/model/TTemplateDetail.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/GenTableColumnService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/GenTableService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/SysDictDataService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/SysDictTypeService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/SysNoticeService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TAppealService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TCleanerService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TEarlyWarningService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TFeedbackService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TInspectorService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TKnowledgeService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TLeaveAuditService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TLeaveService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TLocationTypeService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TNoticeSetService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TProblemEscalationService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TProjectDeptService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TSqlRecordService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TSysConfigService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TSystemBulletinService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TTaskDetailService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TTaskService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TTemplateDetailService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/TTemplateService.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/GenTableColumnServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/GenTableServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TAppealServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TCleanerServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TEarlyWarningServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TFeedbackServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TInspectorServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TKnowledgeServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TLeaveAuditServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TLocationServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TLocationTypeServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TNoticeSetServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TProjectDeptServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TSqlRecordServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TSysConfigServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TSystemBulletinServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TTaskDetailServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TTaskServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TTemplateDetailServiceImpl.java

File was deleted

 generator/src/main/java/com/ruoyi/system/service/impl/TTemplateServiceImpl.java

File was deleted

 generator/src/main/resources/mapping/GenTableColumnMapper.xml

File was deleted

 generator/src/main/resources/mapping/GenTableMapper.xml

File was deleted

 generator/src/main/resources/mapping/SysDictDataMapper.xml

File was deleted

 generator/src/main/resources/mapping/SysDictTypeMapper.xml

File was deleted

 generator/src/main/resources/mapping/SysNoticeMapper.xml

File was deleted

 generator/src/main/resources/mapping/TAppealMapper.xml

File was deleted

 generator/src/main/resources/mapping/TCleanerMapper.xml

File was deleted

 generator/src/main/resources/mapping/TEarlyWarningMapper.xml

File was deleted

 generator/src/main/resources/mapping/TFeedbackMapper.xml

File was deleted

 generator/src/main/resources/mapping/TInspectorMapper.xml

File was deleted

 generator/src/main/resources/mapping/TKnowledgeMapper.xml

File was deleted

 generator/src/main/resources/mapping/TLeaveAuditMapper.xml

File was deleted

 generator/src/main/resources/mapping/TLeaveMapper.xml

File was deleted

 generator/src/main/resources/mapping/TLocationMapper.xml

File was deleted

 generator/src/main/resources/mapping/TLocationTypeMapper.xml

File was deleted

 generator/src/main/resources/mapping/TNoticeSetMapper.xml

File was deleted

 generator/src/main/resources/mapping/TProblemEscalationMapper.xml

File was deleted

 generator/src/main/resources/mapping/TProjectDeptMapper.xml

File was deleted

 generator/src/main/resources/mapping/TSqlRecordMapper.xml

File was deleted

 generator/src/main/resources/mapping/TSysConfigMapper.xml

File was deleted

 generator/src/main/resources/mapping/TSystemBulletinMapper.xml

File was deleted

 generator/src/main/resources/mapping/TTaskDetailMapper.xml

File was deleted

 generator/src/main/resources/mapping/TTaskMapper.xml

File was deleted

 generator/src/main/resources/mapping/TTemplateDetailMapper.xml

File was deleted

 generator/src/main/resources/mapping/TTemplateMapper.xml

File was deleted

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

File was deleted

 ruoyi-admin/pom.xml

@@ -43,11 +43,11 @@
            <artifactId>springfox-boot-starter</artifactId>
        </dependency>

<!--        <dependency>-->
<!--            <groupId>com.github.xiaoymin</groupId>-->
<!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
<!--            <version>1.9.6</version>-->
<!--        </dependency>-->
        <!--        <dependency>-->
        <!--            <groupId>com.github.xiaoymin</groupId>-->
        <!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
        <!--            <version>1.9.6</version>-->
        <!--        </dependency>-->


        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
@@ -57,7 +57,7 @@
            <version>1.6.2</version>
        </dependency>

         <!-- Mysql驱动包 -->
        <!-- Mysql驱动包 -->
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
@@ -67,36 +67,36 @@
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-framework</artifactId>
<!--            <exclusions>-->
<!--                <exclusion>-->
<!--                    <groupId>com.github.pagehelper</groupId>-->
<!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
<!--                </exclusion>-->
<!--            </exclusions>-->
            <!--            <exclusions>-->
            <!--                <exclusion>-->
            <!--                    <groupId>com.github.pagehelper</groupId>-->
            <!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
            <!--                </exclusion>-->
            <!--            </exclusions>-->
        </dependency>

        <!-- 定时任务-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-quartz</artifactId>
<!--            <exclusions>-->
<!--                <exclusion>-->
<!--                    <groupId>com.github.pagehelper</groupId>-->
<!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
<!--                </exclusion>-->
<!--            </exclusions>-->
            <!--            <exclusions>-->
            <!--                <exclusion>-->
            <!--                    <groupId>com.github.pagehelper</groupId>-->
            <!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
            <!--                </exclusion>-->
            <!--            </exclusions>-->
        </dependency>

        <!-- 代码生成-->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-generator</artifactId>
<!--            <exclusions>-->
<!--                <exclusion>-->
<!--                    <groupId>com.github.pagehelper</groupId>-->
<!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
<!--                </exclusion>-->
<!--            </exclusions>-->
            <!--            <exclusions>-->
            <!--                <exclusion>-->
            <!--                    <groupId>com.github.pagehelper</groupId>-->
            <!--                    <artifactId>pagehelper-spring-boot-starter</artifactId>-->
            <!--                </exclusion>-->
            <!--            </exclusions>-->
        </dependency>

        <!-- zxing生成二维码 -->
@@ -116,11 +116,11 @@
            <groupId>org.springframework</groupId>
            <artifactId>spring-test</artifactId>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>org.apache.httpcomponents</groupId>-->
<!--            <artifactId>httpcore</artifactId>-->
<!--            <version>4.3.2</version>-->
<!--        </dependency>-->
        <!--        <dependency>-->
        <!--            <groupId>org.apache.httpcomponents</groupId>-->
        <!--            <artifactId>httpcore</artifactId>-->
        <!--            <version>4.3.2</version>-->
        <!--        </dependency>-->

        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
@@ -184,15 +184,16 @@
                    </execution>
                </executions>
            </plugin>
            <plugin>   
                <groupId>org.apache.maven.plugins</groupId>   
                <artifactId>maven-war-plugin</artifactId>   
                <version>3.1.0</version>   

            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>3.1.0</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
                </configuration>   
           </plugin>   
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>

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

New file
@@ -0,0 +1,67 @@
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.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.DictDataDTO;
import com.ruoyi.system.dto.HandleProblemEscalationDTO;
import com.ruoyi.system.model.TDictData;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.service.TDictDataService;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;

/**
 * <p>
 * 任务记录 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
@Api(tags = "数据字典设置")
@RestController
@RequestMapping("/t-dict-data")
public class TDictDataController {
    @Resource
    private TDictDataService dictDataService;
    @ApiOperation(value = "数据字典列表")
    @GetMapping(value = "/list")
    public R<List<TDictData>> pageList(@RequestParam Integer dataType) {
        return R.ok(dictDataService.lambdaQuery().eq(TDictData::getDataType,dataType).list());
    }
    @Log(title = "新增数据字典", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增数据字典")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody DictDataDTO dto) {
        dictDataService.save(dto);
        return R.ok();
    }
    @Log(title = "编辑数据字典", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "编辑数据字典")
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody DictDataDTO dto) {
        dictDataService.updateById(dto);
        return R.ok();
    }
    @Log(title = "批量删除数据字典", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "删除数据字典")
    @PostMapping(value = "/delete")
    public R<Boolean> delete(@RequestParam String ids) {
        String[] split = ids.split(",");
        dictDataService.removeBatchByIds(Arrays.asList(split));
        return R.ok();
    }
}


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

@@ -1,7 +1,19 @@
package com.ruoyi.web.controller.api;


import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.query.FeedbackQuery;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TFeedbackService;
import com.ruoyi.system.vo.system.FeedbackListVO;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -17,6 +29,13 @@
@RestController
@RequestMapping("/t-feedback")
public class TFeedbackController {
    @Autowired
    private TFeedbackService feedbackService;

    @ApiOperation(value = "意见反馈分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<FeedbackListVO>> pageList(@RequestBody FeedbackQuery query) {
        return R.ok(feedbackService.pageList(query));
    }
}


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

@@ -1,9 +1,26 @@
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.dto.KnowledgeDTO;
import com.ruoyi.system.dto.SystemBulletinDTO;
import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.model.TSystemBulletin;
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.service.TKnowledgeService;
import com.ruoyi.system.service.TSystemBulletinService;
import com.ruoyi.system.vo.system.KnowledgeListVO;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Arrays;

/**
 * <p>
@@ -17,6 +34,51 @@
@RestController
@RequestMapping("/t-knowledge")
public class TKnowledgeController {
    @Resource
    private TKnowledgeService knowledgeService;

    /**
     * 获取谱系图详情待入库菌种分页列表
     */
    @ApiOperation(value = "环卫知识分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<KnowledgeListVO>> pageList(@RequestBody KnowledgeListQuery query) {
        return R.ok(knowledgeService.pageList(query));
    }
    @Log(title = "新增环卫知识", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增环卫知识")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody KnowledgeDTO dto) {
        knowledgeService.save(dto);
        return R.ok();
    }
    @Log(title = "编辑环卫知识", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "编辑环卫知识")
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody KnowledgeDTO dto) {
        knowledgeService.updateById(dto);
        return R.ok();
    }
    @Log(title = "批量删除环卫知识", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量环卫知识")
    @DeleteMapping(value = "/delete")
    public R<Boolean> edit(@RequestParam String ids) {
        String[] split = ids.split(",");
        knowledgeService.removeBatchByIds(Arrays.asList(split));
        return R.ok();
    }
    @Log(title = "启用/禁用环卫知识", businessType = BusinessType.OTHER)
    @ApiOperation(value = "启用/禁用环卫知识")
    @DeleteMapping(value = "/editStatus")
    public R<Boolean> editStatus(@RequestParam String id) {
        TKnowledge byId = knowledgeService.getById(id);
        if (byId.getStatus()==1){
            byId.setStatus(2);
        }else{
            byId.setStatus(1);
        }
        knowledgeService.updateById(byId);
        return R.ok();
    }
}


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

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


import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.model.TDictData;
import com.ruoyi.system.model.TNoticeSet;
import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.service.TNoticeSetService;
import com.ruoyi.system.vo.system.ProblemEscalationDetailVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -17,6 +30,16 @@
@RestController
@RequestMapping("/t-notice-set")
public class TNoticeSetController {
    @Resource
    private TNoticeSetService tNoticeSetService;

    @ApiOperation(value = "详情")
    @PostMapping(value = "/detail")
    public R<List<TNoticeSet>> detail() {
        List<TNoticeSet> list = tNoticeSetService.list();

        return R.ok(list);
    }

}


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

@@ -1,9 +1,30 @@
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.core.domain.model.LoginUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.HandleProblemEscalationDTO;
import com.ruoyi.system.model.TDictData;
import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.model.TSystemBulletin;
import com.ruoyi.system.query.FeedbackQuery;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.service.TDictDataService;
import com.ruoyi.system.service.TProblemEscalationService;
import com.ruoyi.system.vo.system.FeedbackListVO;
import com.ruoyi.system.vo.system.ProblemEscalationDetailVO;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.time.LocalDateTime;

/**
 * <p>
@@ -17,6 +38,36 @@
@RestController
@RequestMapping("/t-problem-escalation")
public class TProblemEscalationController {

    @Resource
    private TProblemEscalationService problemEscalationService;
    @Resource
    private TokenService tokenService;
    @Resource
    private TDictDataService dictDataService;
    @ApiOperation(value = "问题上报分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<ProblemEscalationListVO>> pageList(@RequestBody ProblemEscalationQuery query) {
        return R.ok(problemEscalationService.pageList(query));
    }
    @Log(title = "问题上报-处理", businessType = BusinessType.OTHER)
    @ApiOperation(value = "问题上报-处理")
    @PostMapping(value = "/handle")
    public R<Boolean> handle(@RequestBody HandleProblemEscalationDTO dto) {
        LoginUser loginUser = tokenService.getLoginUser();
        dto.setHandleId(loginUser.getUserId()+"");
        dto.setHandleTime(LocalDateTime.now());
        problemEscalationService.updateById(dto);
        return R.ok();
    }
    @ApiOperation(value = "详情")
    @PostMapping(value = "/detail")
    public R<ProblemEscalationDetailVO> detail(@RequestParam String id) {
        ProblemEscalationDetailVO problemEscalationDetailVO = new ProblemEscalationDetailVO();
        TProblemEscalation byId = problemEscalationService.getById(id);
        BeanUtils.copyProperties(byId,problemEscalationDetailVO);
        TDictData byId1 = dictDataService.getById(byId.getEscalationType());
        problemEscalationDetailVO.setEscalationTypeName(byId1.getDataContent());
        return R.ok(problemEscalationDetailVO);
    }
}


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

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


import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.query.SqlRecordQuery;
import com.ruoyi.system.service.TSqlRecordService;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;
import com.ruoyi.system.vo.system.SqlRecordListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * <p>
@@ -17,6 +29,13 @@
@RestController
@RequestMapping("/t-sql-record")
public class TSqlRecordController {
    @Resource
    private TSqlRecordService tSqlRecordService;
    @ApiOperation(value = "数据库备份记录分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<SqlRecordListVO>> pageList(@RequestBody SqlRecordQuery query) {
        return R.ok(tSqlRecordService.pageList(query));
    }

}


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

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


import com.alibaba.fastjson.JSON;
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.dto.SystemBulletinDTO;
import com.ruoyi.system.model.TSystemBulletin;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.service.TSystemBulletinService;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Arrays;

/**
 * <p>
@@ -17,6 +31,51 @@
@RestController
@RequestMapping("/t-system-bulletin")
public class TSystemBulletinController {
    @Resource
    private TSystemBulletinService systemBulletinService;

    /**
     * 获取谱系图详情待入库菌种分页列表
     */
    @ApiOperation(value = "系统公告分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<SystemBulletinListVO>> pageList(@RequestBody SystemBulletinQuery query) {
        return R.ok(systemBulletinService.pageList(query));
    }
    @Log(title = "新增系统公告", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增系统公告")
    @PostMapping(value = "/add")
    public R<Boolean> add(@RequestBody SystemBulletinDTO dto) {
        systemBulletinService.save(dto);
        return R.ok();
    }
    @Log(title = "编辑系统公告", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "编辑系统公告")
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody SystemBulletinDTO dto) {
        systemBulletinService.updateById(dto);
        return R.ok();
    }
    @Log(title = "批量删除系统公告", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除系统公告")
    @DeleteMapping(value = "/delete")
    public R<Boolean> edit(@RequestParam String ids) {
        String[] split = ids.split(",");
        systemBulletinService.removeBatchByIds(Arrays.asList(split));
        return R.ok();
    }
    @Log(title = "启用/禁用系统公告", businessType = BusinessType.OTHER)
    @ApiOperation(value = "启用/禁用系统公告")
    @DeleteMapping(value = "/editStatus")
    public R<Boolean> editStatus(@RequestParam String id) {
        TSystemBulletin byId = systemBulletinService.getById(id);
        if (byId.getStatus()==1){
            byId.setStatus(2);
        }else{
            byId.setStatus(1);
        }
        systemBulletinService.updateById(byId);
        return R.ok();
    }
}


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

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

import com.ruoyi.system.model.TDictData;
import com.ruoyi.system.model.TProblemEscalation;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "数据字典新增编辑DTO")
public class DictDataDTO extends TDictData {

}

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

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

import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.model.TSystemBulletin;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "问题上报处理DTO")
public class HandleProblemEscalationDTO extends TProblemEscalation {

}

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

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

import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.model.TSystemBulletin;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "环卫只是新增编辑DTO")
public class KnowledgeDTO extends TKnowledge {




}

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

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

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

import java.io.Serializable;
import java.util.List;

@Data
@ApiModel(value = "系统公告新增编辑DTO")
public class SystemBulletinDTO extends TSystemBulletin {




}

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

File was renamed from generator/src/main/java/com/ruoyi/system/mapper/TProjectDeptMapper.java
@@ -1,7 +1,8 @@
package com.ruoyi.system.mapper;

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

/**
 * <p>
@@ -11,6 +12,6 @@
 * @author xiaochen
 * @since 2025-05-28
 */
public interface TProjectDeptMapper extends BaseMapper<TProjectDept> {
public interface TDictDataMapper extends BaseMapper<TDictData> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFeedbackMapper.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.TFeedback;
import com.ruoyi.system.query.FeedbackQuery;
import com.ruoyi.system.vo.system.FeedbackListVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,5 @@
 */
public interface TFeedbackMapper extends BaseMapper<TFeedback> {

    List<FeedbackListVO> pageList(@Param("query")FeedbackQuery query, @Param("pageInfo")PageInfo<FeedbackListVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TKnowledgeMapper.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.TKnowledge;
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.vo.system.KnowledgeListVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,5 @@
 */
public interface TKnowledgeMapper extends BaseMapper<TKnowledge> {

    List<KnowledgeListVO> pageList(@Param("query")KnowledgeListQuery query, @Param("pageInfo")PageInfo<KnowledgeListVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TProblemEscalationMapper.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.TProblemEscalation;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,7 @@
 */
public interface TProblemEscalationMapper extends BaseMapper<TProblemEscalation> {

    List<ProblemEscalationListVO> pageList(@Param("query")ProblemEscalationQuery query, @Param("pageInfo")PageInfo<ProblemEscalationListVO> pageInfo);


}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSqlRecordMapper.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.TSqlRecord;
import com.ruoyi.system.query.SqlRecordQuery;
import com.ruoyi.system.vo.system.SqlRecordListVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,6 @@
 */
public interface TSqlRecordMapper extends BaseMapper<TSqlRecord> {

    List<SqlRecordListVO> pageList(@Param("query")SqlRecordQuery query,  @Param("pageInfo")PageInfo<SqlRecordListVO> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSystemBulletinMapper.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.TSystemBulletin;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,7 @@
 */
public interface TSystemBulletinMapper extends BaseMapper<TSystemBulletin> {

    List<SystemBulletinListVO> pageList(@Param("query")SystemBulletinQuery query,@Param("pageInfo") PageInfo<SystemBulletinListVO> pageInfo);


}

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

New file
@@ -0,0 +1,48 @@
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.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 java.time.LocalDateTime;

/**
 * <p>
 * 任务申诉
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_appeal")
@ApiModel(value="TAppeal对象", description="任务申诉")
public class TDictData extends BaseModel {

    private static final long serialVersionUID = 1L;

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

    @ApiModelProperty(value = "内容")
    @TableField("data_content")
    private String dataContent;

    @ApiModelProperty(value = "类型1任务类型 2不合格原因 3问题上报类型")
    @TableField("data_type")
    private Integer dataType;




}

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

New file
@@ -0,0 +1,17 @@
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 DictDataQuery extends BasePage {

    @ApiModelProperty(value = "类型1任务类型 2不合格原因 3问题上报类型")
    private Integer dataType;



}

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

New file
@@ -0,0 +1,17 @@
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 FeedbackQuery extends BasePage {

    @ApiModelProperty(value = "反馈内容")
    private String feedbackContent;



}

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

New file
@@ -0,0 +1,19 @@
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 KnowledgeListQuery extends BasePage {

    @ApiModelProperty(value = "标题")
    private String title;
    @ApiModelProperty(value = "状态 1启用 2禁用")
    private Integer status;



}

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

New file
@@ -0,0 +1,17 @@
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 ProblemEscalationQuery extends BasePage {

    @ApiModelProperty(value = "问题上报内容")
    private String escalationContent;



}

 ruoyi-system/src/main/java/com/ruoyi/system/query/SqlRecordQuery.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 SqlRecordQuery extends BasePage {

    @ApiModelProperty(value = "开始时间 例:yyyy-MM-dd HH:mm:ss")
    private String startTime;
    @ApiModelProperty(value = "结束时间 例:yyyy-MM-dd HH:mm:ss")
    private String endTime;


}

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

@@ -2,6 +2,7 @@

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

@Data
@@ -9,5 +10,20 @@
public class SysOperLogQuery extends BasePage {


    @ApiModelProperty(value = "业务类型（0=其它,1=新增,2=修改,3=删除")
    private Integer businessType;

    @ApiModelProperty(value = "模块标题")
    private String title;

    @ApiModelProperty(value = "操作人")
    private String operName;

    @ApiModelProperty(value = "开始时间 例:yyyy-MM-dd HH:mm:ss")
    private String startTime;
    @ApiModelProperty(value = "结束时间 例:yyyy-MM-dd HH:mm:ss")
    private String endTime;



}

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

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

import java.util.List;

@Data
@ApiModel(value = "系统公告分页列表query")
public class SystemBulletinQuery extends BasePage {

    @ApiModelProperty(value = "公告内容")
    private String content;



}

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

File was renamed from generator/src/main/java/com/ruoyi/system/service/TLocationService.java
@@ -1,7 +1,8 @@
package com.ruoyi.system.service;

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

/**
 * <p>
@@ -11,6 +12,6 @@
 * @author xiaochen
 * @since 2025-05-28
 */
public interface TLocationService extends IService<TLocation> {
public interface TDictDataService extends IService<TDictData> {

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFeedbackService.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.TFeedback;
import com.ruoyi.system.query.FeedbackQuery;
import com.ruoyi.system.vo.system.FeedbackListVO;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TFeedbackService extends IService<TFeedback> {

    PageInfo<FeedbackListVO> pageList(FeedbackQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TKnowledgeService.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.TKnowledge;
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.vo.system.KnowledgeListVO;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TKnowledgeService extends IService<TKnowledge> {

    PageInfo<KnowledgeListVO> pageList(KnowledgeListQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TProblemEscalationService.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.TProblemEscalation;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;

/**
 * <p>
@@ -13,4 +16,7 @@
 */
public interface TProblemEscalationService extends IService<TProblemEscalation> {

    PageInfo<ProblemEscalationListVO> pageList(ProblemEscalationQuery query);


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TSqlRecordService.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.TSqlRecord;
import com.ruoyi.system.query.SqlRecordQuery;
import com.ruoyi.system.vo.system.SqlRecordListVO;

/**
 * <p>
@@ -13,4 +16,6 @@
 */
public interface TSqlRecordService extends IService<TSqlRecord> {

    PageInfo<SqlRecordListVO> pageList(SqlRecordQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TSystemBulletinService.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.TSystemBulletin;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.vo.system.SystemBulletinListVO;

/**
 * <p>
@@ -13,4 +16,7 @@
 */
public interface TSystemBulletinService extends IService<TSystemBulletin> {

    PageInfo<SystemBulletinListVO> pageList(SystemBulletinQuery query);


}

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

File was renamed from generator/src/main/java/com/ruoyi/system/service/impl/TProblemEscalationServiceImpl.java
@@ -1,9 +1,12 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.mapper.TProblemEscalationMapper;
import com.ruoyi.system.service.TProblemEscalationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TDictDataMapper;
import com.ruoyi.system.mapper.TProblemEscalationMapper;
import com.ruoyi.system.model.TDictData;
import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.service.TDictDataService;
import com.ruoyi.system.service.TProblemEscalationService;
import org.springframework.stereotype.Service;

/**
@@ -15,6 +18,6 @@
 * @since 2025-05-28
 */
@Service
public class TProblemEscalationServiceImpl extends ServiceImpl<TProblemEscalationMapper, TProblemEscalation> implements TProblemEscalationService {
public class TDictDataServiceImpl extends ServiceImpl<TDictDataMapper, TDictData> implements TDictDataService {

}

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TFeedbackMapper;
import com.ruoyi.system.model.TFeedback;
import com.ruoyi.system.query.FeedbackQuery;
import com.ruoyi.system.service.TFeedbackService;
import com.ruoyi.system.vo.system.FeedbackListVO;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TFeedbackServiceImpl extends ServiceImpl<TFeedbackMapper, TFeedback> implements TFeedbackService {

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

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TKnowledgeMapper;
import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.query.KnowledgeListQuery;
import com.ruoyi.system.service.TKnowledgeService;
import com.ruoyi.system.vo.system.FeedbackListVO;
import com.ruoyi.system.vo.system.KnowledgeListVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TKnowledgeServiceImpl extends ServiceImpl<TKnowledgeMapper, TKnowledge> implements TKnowledgeService {

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

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TProblemEscalationMapper;
import com.ruoyi.system.model.TProblemEscalation;
import com.ruoyi.system.query.ProblemEscalationQuery;
import com.ruoyi.system.service.TProblemEscalationService;
import com.ruoyi.system.vo.system.ProblemEscalationListVO;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TProblemEscalationServiceImpl extends ServiceImpl<TProblemEscalationMapper, TProblemEscalation> implements TProblemEscalationService {

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

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TSqlRecordMapper;
import com.ruoyi.system.model.TSqlRecord;
import com.ruoyi.system.query.SqlRecordQuery;
import com.ruoyi.system.service.TSqlRecordService;
import com.ruoyi.system.vo.system.SqlRecordListVO;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TSqlRecordServiceImpl extends ServiceImpl<TSqlRecordMapper, TSqlRecord> implements TSqlRecordService {

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

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

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TSystemBulletinMapper;
import com.ruoyi.system.model.TSystemBulletin;
import com.ruoyi.system.query.SystemBulletinQuery;
import com.ruoyi.system.service.TSystemBulletinService;
import com.ruoyi.system.vo.system.SystemBulletinListVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +22,11 @@
@Service
public class TSystemBulletinServiceImpl extends ServiceImpl<TSystemBulletinMapper, TSystemBulletin> implements TSystemBulletinService {

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

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

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

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

@Data
@ApiModel(value = "意见反馈列表VO")
public class FeedbackListVO extends TFeedback {

    @ApiModelProperty("反馈人名称")
    private String nickName;
    @ApiModelProperty("反馈人头像")
    private String avatar;

}

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

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

import com.ruoyi.system.model.TKnowledge;
import com.ruoyi.system.model.TSystemBulletin;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "环卫只是列表VO")
public class KnowledgeListVO extends TKnowledge {

}

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

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

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

@Data
@ApiModel(value = "问题上报详情VO")
public class ProblemEscalationDetailVO extends TProblemEscalation {
    @ApiModelProperty("上报类型名称")
    private String escalationTypeName;

}

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

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

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

@Data
@ApiModel(value = "问题上报列表VO")
public class ProblemEscalationListVO extends TProblemEscalation {

    @ApiModelProperty("上报人名称")
    private String nickName;
    @ApiModelProperty("上报人头像")
    private String avatar;
    @ApiModelProperty("上报类型名称")
    private String escalationTypeName;

}

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

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

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

@Data
@ApiModel(value = "数据库备份记录列表VO")
public class SqlRecordListVO extends TSqlRecord {



}

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

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

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

import java.util.List;

@Data
@ApiModel(value = "系统公告列表VO")
public class SystemBulletinListVO extends TSystemBulletin {

}

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

@@ -92,6 +92,19 @@
               sol.oper_time AS operTime, sol.cost_time AS costTime,sol.companyName AS companyName,sol.roleName AS roleName,sol.phonenumber AS phonenumber,
               sol.userId AS userId,sol.nickName AS nickName
        from sys_oper_log sol
        where 1=1
        <if test="query.title != null and query.title != ''">
            AND sol.title like concat('%', #{query.title}, '%')
        </if>
        <if test="query.businessType != null">
            AND sol.business_type = #{query.businessType}
        </if>
        <if test="query.operName != null and query.operName != ''">
            AND sol.oper_name like concat('%', #{query.operName}, '%')
        </if>
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and sol.oper_time between #{query.startTime} and #{query.endTime}
        </if>
        ORDER BY sol.oper_time DESC
    </select>


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

@@ -20,5 +20,15 @@
    <sql id="Base_Column_List">
        id, create_time, update_time, create_by, update_by, disabled, feedback_content, phone, feedback_person, pictures
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.FeedbackListVO">
        select t1.*,t2.nick_name as nickName,t2.avatar as avatar from t_feedback t1
            left join sys_user t2 on t1.feedback_person = t2.user_id
        where 1=1
        <if test="query.feedbackContent != null and query.feedbackContent != ''">
            and t1.feedback_content like concat('%',#{query.feedbackContent},'%')
        </if>
        and t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by t1.create_time desc
    </select>

</mapper>

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

@@ -20,5 +20,17 @@
    <sql id="Base_Column_List">
        id, create_time, update_time, create_by, update_by, disabled, cover, title, views, status
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.KnowledgeListVO">
        select  * from t_knowledge
        where 1=1
        <if test="query.title != null and query.title != ''">
            and title like concat('%',#{query.title},'%')
        </if>
        <if test="query.status != null">
            and status = #{query.status}
        </if>
        and disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by create_time desc
    </select>

</mapper>

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

@@ -26,5 +26,17 @@
    <sql id="Base_Column_List">
        id, create_time, update_time, create_by, update_by, disabled, escalation_id, escalation_type, escalation_content, problem_location, phone, status, remark, handle_time, handle_id, pictures
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.ProblemEscalationListVO">
        select t1.*,t2.nick_name as nickName,t2.avatar as avatar,t3.data_content as escalationTypeName from t_problem_escalation t1
        left join sys_user t2 on t1.escalation_id = t2.user_id
        left join t_dict_data t3 on t1.escalation_type = t3.id
        where 1=1
        <if test="query.feedbackContent != null and query.feedbackContent != ''">
            and t1.feedback_content like concat('%',#{query.feedbackContent},'%')
        </if>
          and t3.data_type = 3
        and t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        order by t1.status asc,t1.create_time desc
    </select>

</mapper>

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

@@ -17,5 +17,14 @@
    <sql id="Base_Column_List">
        id, create_time, update_time, create_by, update_by, disabled, sql_url
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.SqlRecordListVO">
        select * from t_sql_record
        where 1=1
        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
            and create_time between #{query.startTime} and #{query.endTime}
        </if>
        and disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}

    </select>

</mapper>

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

@@ -18,5 +18,13 @@
    <sql id="Base_Column_List">
        id, create_time, update_time, create_by, update_by, disabled, content, status
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.system.SystemBulletinListVO">
        select * from t_system_bulletin
        where  disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        <if test="query.content != null and query.content != ''">
            and content like concat('%',#{query.content},'%')
        </if>
        order by create_time desc
    </select>

</mapper>