app任务

liujie

23 小时以前 39f8c0490eca08cd4fbde6c3518025c51edba204

app任务

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

@@ -30,11 +30,11 @@
@RequestMapping("")
public class TMajorController {

    private final TMajorService majorService;
    private final TMajorService tMajorService;
    private final TokenService tokenService;
    @Autowired
    public TMajorController(TMajorService majorService, TokenService tokenService) {
        this.majorService = majorService;
    public TMajorController(TMajorService tMajorService, TokenService tokenService) {
        this.tMajorService = tMajorService;
        this.tokenService = tokenService;
    }

@@ -46,7 +46,7 @@
    @PostMapping(value = "/api/t-major/pageList")
    public R<PageInfo<TMajor>> pageList(@RequestBody String param) {
        TMajorQuery query = JSON.parseObject(param, TMajorQuery.class);
        return R.ok(majorService.pageList(query));
        return R.ok(tMajorService.pageList(query));
    }

    /**
@@ -58,10 +58,10 @@
    @PostMapping(value = "/api/t-major/add")
    public R<Boolean> add(@RequestBody String param) {
        TMajor dto = JSON.parseObject(param,TMajor.class);
        if(majorService.isExit(dto)){
        if(tMajorService.isExit(dto)){
            return R.fail("该专业已存在");
        }
        majorService.save(dto);
        tMajorService.save(dto);
        return R.ok();
    }

@@ -74,10 +74,10 @@
    @PostMapping(value = "/api/t-major/update")
    public R<Boolean> update(@RequestBody String param) {
        TMajor dto = JSON.parseObject(param,TMajor.class);
        if(majorService.isExit(dto)){
        if(tMajorService.isExit(dto)){
            return R.fail("该专业已存在");
        }
        majorService.updateById(dto);
        tMajorService.updateById(dto);
        return R.ok();
    }

@@ -88,7 +88,7 @@
    @ApiOperation(value = "查看专业管理详情")
    @GetMapping(value = "/open/t-major/getDetailById")
    public R<TMajor> getDetailById(@RequestParam String id) {
        TMajor equipment = majorService.getById(id);
        TMajor equipment = tMajorService.getById(id);
        return R.ok(equipment);
    }

@@ -100,7 +100,7 @@
    @ApiOperation(value = "删除专业管理")
    @DeleteMapping(value = "/open/t-major/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(majorService.removeById(id));
        return R.ok(tMajorService.removeById(id));
    }

    /**
@@ -111,7 +111,7 @@
    @ApiOperation(value = "批量删除专业管理")
    @DeleteMapping(value = "/open/t-major/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(majorService.removeByIds(ids));
        return R.ok(tMajorService.removeByIds(ids));
    }

}

 ruoyi-admin/src/main/resources/application-test.yml

@@ -95,7 +95,7 @@
    druid:
      # 主库数据源
      master:
        url: jdbc:mysql://127.0.0.1:3306/intelligent_dispatching?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai
        url: jdbc:mysql://192.168.110.34:3306/intelligent_dispatching?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai
        username: root
        password: 123456
      # 从库数据源

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;

/**
 * <p>

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

@@ -4,9 +4,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TAppUserLocationMapper;
import com.ruoyi.system.mapper.TAppUserMapper;
import com.ruoyi.system.mapper.TMajorMapper;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TAppUserLocation;
import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.query.TMajorQuery;
import com.ruoyi.system.service.TAppUserLocationService;
import com.ruoyi.system.service.TMajorService;
import org.springframework.stereotype.Service;

@@ -21,24 +26,6 @@
 * @since 2025-09-28
 */
@Service
public class TAppUserLocationServiceImpl extends ServiceImpl<TMajorMapper, TMajor> implements TMajorService {
public class TAppUserLocationServiceImpl extends ServiceImpl<TAppUserLocationMapper, TAppUserLocation> implements TAppUserLocationService {

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

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