#
Junjie
2024-03-26 2e2c7869986d99cf4cfc8f8288e8dd3405f002ea
#
7个文件已添加
375 ■■■■■ 已修改文件
zy-asrs-wcs/src/main/java/basShuttle.sql 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java 227 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/BasShuttleMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasShuttleService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasShuttleServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/resources/mapper/core/BasShuttleMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/basShuttle.sql
New file
@@ -0,0 +1,9 @@
-- save basShuttle record
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '四向车设备列表管理', '0', '/core/basShuttle', '/core/basShuttle', '0' , '0', '1' , '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '查询四向车设备列表', '', '1', 'core:basShuttle:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '添加四向车设备列表', '', '1', 'core:basShuttle:save', '1', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '修改四向车设备列表', '', '1', 'core:basShuttle:update', '2', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '删除四向车设备列表', '', '1', 'core:basShuttle:remove', '3', '1', '1');
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasShuttleController.java
New file
@@ -0,0 +1,102 @@
package com.zy.asrs.wcs.core.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/api")
public class BasShuttleController extends BaseController {
    @Autowired
    private BasShuttleService basShuttleService;
    @PreAuthorize("hasAuthority('core:basShuttle:list')")
    @PostMapping("/basShuttle/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<BasShuttle, BaseParam> pageParam = new PageParam<>(baseParam, BasShuttle.class);
        return R.ok().add(basShuttleService.page(pageParam, pageParam.buildWrapper(true)));
    }
    @PreAuthorize("hasAuthority('core:basShuttle:list')")
    @PostMapping("/basShuttle/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(basShuttleService.list());
    }
    @PreAuthorize("hasAuthority('core:basShuttle:list')")
    @GetMapping("/basShuttle/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(basShuttleService.getById(id));
    }
    @PreAuthorize("hasAuthority('core:basShuttle:save')")
    @OperationLog("添加四向车设备列表")
    @PostMapping("/basShuttle/save")
    public R save(@RequestBody BasShuttle basShuttle) {
        if (!basShuttleService.save(basShuttle)) {
            return R.error("添加失败");
        }
        return R.ok("添加成功");
    }
    @PreAuthorize("hasAuthority('core:basShuttle:update')")
    @OperationLog("修改四向车设备列表")
    @PostMapping("/basShuttle/update")
    public R update(@RequestBody BasShuttle basShuttle) {
        if (!basShuttleService.updateById(basShuttle)) {
            return R.error("修改失败");
        }
        return R.ok("修改成功");
    }
    @PreAuthorize("hasAuthority('core:basShuttle:remove')")
    @OperationLog("删除四向车设备列表")
    @PostMapping("/basShuttle/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!basShuttleService.removeByIds(Arrays.asList(ids))) {
            return R.error("删除失败");
        }
        return R.ok("删除成功");
    }
    @PreAuthorize("hasAuthority('core:basShuttle:list')")
    @PostMapping("/basShuttle/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<BasShuttle> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(BasShuttle::getShuttleNo, condition);
        }
        basShuttleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getShuttleNo(), item.getShuttleNo()))
        );
        return R.ok().add(vos);
    }
    @PreAuthorize("hasAuthority('core:basShuttle:list')")
    @PostMapping("/basShuttle/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(basShuttleService.list(), BasShuttle.class), response);
    }
}
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/BasShuttle.java
New file
@@ -0,0 +1,227 @@
package com.zy.asrs.wcs.core.entity;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.system.service.UserService;
import com.zy.asrs.wcs.system.service.HostService;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("wcs_bas_shuttle")
public class BasShuttle implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 四向穿梭车号
     */
    @ApiModelProperty(value= "四向穿梭车号")
    @TableId(value = "shuttle_no", type = IdType.AUTO)
    private Integer shuttleNo;
    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;
    /**
     * 当前小车状态
     */
    @ApiModelProperty(value= "当前小车状态")
    private Integer shuttleStatus;
    /**
     * 任务号
     */
    @ApiModelProperty(value= "任务号")
    private Integer wrkNo;
    /**
     * 暂存库位
     */
    @ApiModelProperty(value= "暂存库位")
    private String idleLoc;
    /**
     * 自动充电
     */
    @ApiModelProperty(value= "自动充电")
    private Integer autoCharge;
    /**
     * 电量线
     */
    @ApiModelProperty(value= "电量线")
    private Integer chargeLine;
    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;
    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;
    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;
    /**
     * 小车运行速度
     */
    @ApiModelProperty(value= "小车运行速度")
    private Integer runSpeed;
    /**
     * 是否删除 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;
    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;
    public BasShuttle() {}
    public BasShuttle(Integer status,Integer shuttleStatus,Integer wrkNo,String idleLoc,Integer autoCharge,Integer chargeLine,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer runSpeed,Integer deleted,Long hostId) {
        this.status = status;
        this.shuttleStatus = shuttleStatus;
        this.wrkNo = wrkNo;
        this.idleLoc = idleLoc;
        this.autoCharge = autoCharge;
        this.chargeLine = chargeLine;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.runSpeed = runSpeed;
        this.deleted = deleted;
        this.hostId = hostId;
    }
//    BasShuttle basShuttle = new BasShuttle(
//            null,    // 状态
//            null,    // 当前小车状态
//            null,    // 任务号
//            null,    // 暂存库位
//            null,    // 自动充电
//            null,    // 电量线
//            null,    // 添加人员
//            null,    // 添加时间
//            null,    // 修改人员
//            null,    // 修改时间
//            null,    // 备注
//            null,    // 小车运行速度
//            null,    // 是否删除
//            null    // 所属机构
//    );
    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }
    }
    public String getCreateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }
    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }
    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }
    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }
    public String getHostId$(){
        HostService service = SpringUtils.getBean(HostService.class);
        Host host = service.getById(this.hostId);
        if (!Cools.isEmpty(host)){
            return String.valueOf(host.getName());
        }
        return null;
    }
}
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/BasShuttleMapper.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.core.mapper;
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface BasShuttleMapper extends BaseMapper<BasShuttle> {
}
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasShuttleService.java
New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wcs.core.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.core.entity.BasShuttle;
public interface BasShuttleService extends IService<BasShuttle> {
}
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasShuttleServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wcs.core.service.impl;
import com.zy.asrs.wcs.core.mapper.BasShuttleMapper;
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("basShuttleService")
public class BasShuttleServiceImpl extends ServiceImpl<BasShuttleMapper, BasShuttle> implements BasShuttleService {
}
zy-asrs-wcs/src/main/resources/mapper/core/BasShuttleMapper.xml
New 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="com.zy.asrs.wcs.core.mapper.BasShuttleMapper">
</mapper>