DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

能源管理初版

Browse Source
This commit is contained in:
砂糖
2025-09-28 14:38:41 +08:00
parent 16776ffdc8
commit ef8ba712df
25 changed files with 2472 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-ems/src/main/java/com/klp/ems/controller/EmsLocationController.java
View File

@@ -20,7 +20,6 @@ import com.klp.common.utils.poi.ExcelUtil;
import com.klp.ems.domain.vo.EmsLocationVo;
import com.klp.ems.domain.bo.EmsLocationBo;
import com.klp.ems.service.IEmsLocationService;
import com.klp.common.core.page.TableDataInfo;
/**
* 位置
@@ -31,7 +30,7 @@ import com.klp.common.core.page.TableDataInfo;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/mes/location")
@RequestMapping("/ems/location")
public class EmsLocationController extends BaseController {
private final IEmsLocationService iEmsLocationService;
@@ -40,8 +39,9 @@ public class EmsLocationController extends BaseController {
* 查询位置列表
*/
@GetMapping("/list")
public TableDataInfo<EmsLocationVo> list(EmsLocationBo bo, PageQuery pageQuery) {
return iEmsLocationService.queryPageList(bo, pageQuery);
public R<List<EmsLocationVo>> list(EmsLocationBo bo) {
List<EmsLocationVo> list = iEmsLocationService.queryList(bo);
return R.ok(list);
}
/**

6
klp-ems/src/main/java/com/klp/ems/service/IEmsLocationService.java
View File

@@ -3,8 +3,6 @@ package com.klp.ems.service;
import com.klp.ems.domain.EmsLocation;
import com.klp.ems.domain.vo.EmsLocationVo;
import com.klp.ems.domain.bo.EmsLocationBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
@@ -22,10 +20,6 @@ public interface IEmsLocationService {
*/
EmsLocationVo queryById(Long locationId);
/**
* 查询位置列表
*/
TableDataInfo<EmsLocationVo> queryPageList(EmsLocationBo bo, PageQuery pageQuery);
/**
* 查询位置列表

14
klp-ems/src/main/java/com/klp/ems/service/impl/EmsLocationServiceImpl.java
View File

@@ -1,12 +1,9 @@
package com.klp.ems.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.ems.domain.bo.EmsLocationBo;
@@ -39,15 +36,6 @@ public class EmsLocationServiceImpl implements IEmsLocationService {
return baseMapper.selectVoById(locationId);
}
/**
* 查询位置列表
*/
@Override
public TableDataInfo<EmsLocationVo> queryPageList(EmsLocationBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<EmsLocation> lqw = buildQueryWrapper(bo);
Page<EmsLocationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询位置列表

4
klp-ems/src/main/resources/mapper/EmsLocationMapper.xml
View File

@@ -1,7 +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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.ems.mapper.EmsLocationMapper">
<resultMap type="com.klp.ems.domain.EmsLocation" id="EmsLocationResult">