root/stand_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: 添加区域管理

Browse Source
This commit is contained in:
liyongde
2023-05-15 14:45:56 +08:00
parent f34ad0e891
commit 3310fd64c0
10 changed files with 576 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java Normal file
View File

@@ -0,0 +1,66 @@
package org.nl.wms.sch.region.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.sch.region.service.ISchBaseRegionService;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
import java.util.Set;
/**
* @author lyd
* @date 2023-05-15
**/
@Slf4j
@RestController
@Api(tags = "区域管理管理")
@RequestMapping("/api/schBaseRegion")
public class SchBaseRegionController {
@Autowired
private ISchBaseRegionService schBaseRegionService;
@GetMapping
@Log("查询区域管理")
@ApiOperation("查询区域管理")
//@SaCheckPermission("@el.check('schBaseRegion:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page){
return new ResponseEntity<>(TableDataInfo.build(schBaseRegionService.queryAll(whereJson,page)),HttpStatus.OK);
}
@PostMapping
@Log("新增区域管理")
@ApiOperation("新增区域管理")
//@SaCheckPermission("@el.check('schBaseRegion:add')")
public ResponseEntity<Object> create(@Validated @RequestBody SchBaseRegion entity){
schBaseRegionService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改区域管理")
@ApiOperation("修改区域管理")
//@SaCheckPermission("@el.check('schBaseRegion:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody SchBaseRegion entity){
schBaseRegionService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除区域管理")
@ApiOperation("删除区域管理")
//@SaCheckPermission("@el.check('schBaseRegion:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
schBaseRegionService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

43
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java Normal file
View File

@@ -0,0 +1,43 @@
package org.nl.wms.sch.region.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.nl.common.domain.query.PageQuery;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
import java.util.Map;
import java.util.Set;
/**
* @description 服务接口
* @author lyd
* @date 2023-05-15
**/
public interface ISchBaseRegionService extends IService<SchBaseRegion> {
/**
* 查询数据分页
* @param whereJson 条件
* @param pageable 分页参数
* @return IPage<SchBaseRegion>
*/
IPage<SchBaseRegion> queryAll(Map whereJson, PageQuery pageable);
/**
* 创建
* @param entity /
*/
void create(SchBaseRegion entity);
/**
* 编辑
* @param entity /
*/
void update(SchBaseRegion entity);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Set<String> ids);
}

64
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java Normal file
View File

@@ -0,0 +1,64 @@
package org.nl.wms.sch.region.service.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* @description /
* @author lyd
* @date 2023-05-15
**/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_base_region")
public class SchBaseRegion implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "region_code", type = IdType.NONE)
@ApiModelProperty(value = "区域编码")
private String region_code;
@ApiModelProperty(value = "区域名称")
private String region_name;
@ApiModelProperty(value = "点位类型说明")
private String point_type_explain;
@ApiModelProperty(value = "点位状态说明")
private String point_status_explain;
@ApiModelProperty(value = "是否创建工单")
private Boolean is_has_workder;
@ApiModelProperty(value = "车间编码")
private String workshop_code;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "创建人")
private String create_id;
@ApiModelProperty(value = "创建人")
private String create_name;
@ApiModelProperty(value = "创建时间")
private String create_time;
@ApiModelProperty(value = "修改人")
private String update_id;
@ApiModelProperty(value = "修改人")
private String update_name;
@ApiModelProperty(value = "修改时间")
private String update_time;
}

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.java Normal file
View File

@@ -0,0 +1,12 @@
package org.nl.wms.sch.region.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
/**
* @author lyd
* @date 2023-05-15
**/
public interface SchBaseRegionMapper extends BaseMapper<SchBaseRegion> {
}

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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="org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper">
</mapper>

52
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java Normal file
View File

@@ -0,0 +1,52 @@
package org.nl.wms.sch.region.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @description /
* @author lyd
* @date 2023-05-15
**/
@Data
public class SchBaseRegionDto implements Serializable {
/** 区域编码 */
private String region_code;
/** 区域名称 */
private String region_name;
/** 点位类型说明 */
private String point_type_explain;
/** 点位状态说明 */
private String point_status_explain;
/** 是否创建工单 */
private String is_has_workder;
/** 车间编码 */
private String workshop_code;
/** 备注 */
private String remark;
/** 创建人 */
private Long create_id;
/** 创建人 */
private String create_name;
/** 创建时间 */
private String create_time;
/** 修改人 */
private Long update_id;
/** 修改人 */
private String update_name;
/** 修改时间 */
private String update_time;
}

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionQuery.java Normal file
View File

@@ -0,0 +1,12 @@
package org.nl.wms.sch.region.service.dto;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
/**
* @author lyd
* @date 2023-05-15
**/
public class SchBaseRegionQuery extends BaseQuery<SchBaseRegion> {
}

85
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java Normal file
View File

@@ -0,0 +1,85 @@
package org.nl.wms.sch.region.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.sch.region.service.ISchBaseRegionService;
import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper;
import org.nl.wms.sch.region.service.dao.SchBaseRegion;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
import java.util.Set;
import java.util.function.Consumer;
/**
* @author lyd
* @description 服务实现
* @date 2023-05-15
**/
@Slf4j
@Service
public class SchBaseRegionServiceImpl extends ServiceImpl<SchBaseRegionMapper, SchBaseRegion> implements ISchBaseRegionService {
@Autowired
private SchBaseRegionMapper schBaseRegionMapper;
@Override
public IPage<SchBaseRegion> queryAll(Map whereJson, PageQuery page) {
String workshop_code = ObjectUtil.isNotEmpty(whereJson.get("workshop_code")) ? whereJson.get("workshop_code").toString() : null;
String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
Boolean is_has_workder = ObjectUtil.isNotEmpty(whereJson.get("is_has_workder")) ? Boolean.valueOf(whereJson.get("is_has_workder").toString()) : null;
LambdaQueryWrapper<SchBaseRegion> lam = new LambdaQueryWrapper<>();
lam.eq(ObjectUtil.isNotEmpty(workshop_code), SchBaseRegion::getWorkshop_code, workshop_code)
.eq(ObjectUtil.isNotEmpty(is_has_workder), SchBaseRegion::getIs_has_workder, is_has_workder)
.like(ObjectUtil.isNotEmpty(blurry), SchBaseRegion::getRegion_code, blurry)
.or(ObjectUtil.isNotEmpty(blurry), la -> la.like(SchBaseRegion::getRegion_name, blurry));
IPage<SchBaseRegion> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseRegionMapper.selectPage(pages, lam);
return pages;
}
@Override
public void create(SchBaseRegion entity) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setCreate_id(currentUserId);
entity.setCreate_name(nickName);
entity.setCreate_time(now);
entity.setUpdate_id(currentUserId);
entity.setUpdate_name(nickName);
entity.setUpdate_time(now);
schBaseRegionMapper.insert(entity);
}
@Override
public void update(SchBaseRegion entity) {
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setUpdate_id(currentUserId);
entity.setUpdate_name(nickName);
entity.setUpdate_time(now);
schBaseRegionMapper.updateById(entity);
}
@Override
public void deleteAll(Set<String> ids) {
// 真删除
schBaseRegionMapper.deleteBatchIds(ids);
}
}