skyouc
2025-03-27 2068b4d36fc6d4ec3d9cd235d43c89b06f2f684a
添加接驳站点管理
2个文件已修改
6个文件已添加
391 ■■■■■ 已修改文件
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -22,9 +22,9 @@
//        generator.username="sa";
//        generator.password="Zoneyung@zy56$";
        generator.table="man_loc_area_mat";
        generator.tableDesc="loc areas mats";
        generator.packagePath="com.vincent.rsf.server.test";
        generator.table="man_device_site";
        generator.tableDesc="device sites";
        generator.packagePath="com.vincent.rsf.server.manager";
        generator.build();
    }
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
New file
@@ -0,0 +1,110 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
import com.vincent.rsf.server.system.controller.BaseController;
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.*;
@RestController
public class DeviceSiteController extends BaseController {
    @Autowired
    private DeviceSiteService deviceSiteService;
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/deviceSite/page")
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
        return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/deviceSite/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(deviceSiteService.list());
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping({"/deviceSite/many/{ids}", "/deviceSites/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(deviceSiteService.listByIds(Arrays.asList(ids)));
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @GetMapping("/deviceSite/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(deviceSiteService.getById(id));
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:save')")
    @OperationLog("Create device sites")
    @PostMapping("/deviceSite/save")
    public R save(@RequestBody DeviceSite deviceSite) {
        deviceSite.setCreateBy(getLoginUserId());
        deviceSite.setCreateTime(new Date());
        deviceSite.setUpdateBy(getLoginUserId());
        deviceSite.setUpdateTime(new Date());
        if (!deviceSiteService.save(deviceSite)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(deviceSite);
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:update')")
    @OperationLog("Update device sites")
    @PostMapping("/deviceSite/update")
    public R update(@RequestBody DeviceSite deviceSite) {
        deviceSite.setUpdateBy(getLoginUserId());
        deviceSite.setUpdateTime(new Date());
        if (!deviceSiteService.updateById(deviceSite)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(deviceSite);
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:remove')")
    @OperationLog("Delete device sites")
    @PostMapping("/deviceSite/remove/{ids}")
    public R remove(@PathVariable Long[] ids) {
        if (!deviceSiteService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        return R.ok("Delete Success").add(ids);
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/deviceSite/query")
    public R query(@RequestParam(required = false) String condition) {
        List<KeyValVo> vos = new ArrayList<>();
        LambdaQueryWrapper<DeviceSite> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(condition)) {
            wrapper.like(DeviceSite::getName, condition);
        }
        deviceSiteService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getName()))
        );
        return R.ok().add(vos);
    }
    @PreAuthorize("hasAuthority('manager:deviceSite:list')")
    @PostMapping("/deviceSite/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(deviceSiteService.list(), DeviceSite.class), response);
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrController.java
@@ -206,14 +206,14 @@
        } else {
            matnrs = matnrService.list(new LambdaQueryWrapper<Matnr>().last("limit 1"));
        }
        ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
        ExcelUtil.build(ExcelUtil.create(matnrs, Matnr.class, true), response);
    }
    @PreAuthorize("hasAuthority('manager:matnr:list')")
    @ApiOperation("下载物料模板")
    @PostMapping("/matnr/template/download")
    public void download(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class, true), response);
        ExcelUtil.build(ExcelUtil.create(null, MatnrsTemplate.class), response);
    }
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
New file
@@ -0,0 +1,234 @@
package com.vincent.rsf.server.manager.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
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.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.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("man_device_site")
public class DeviceSite implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    /**
     * 入出库类型
     */
    @ApiModelProperty(value= "入出库类型")
    private Integer type;
    /**
     * 站点编号
     */
    @ApiModelProperty(value= "站点编号")
    private String site;
    /**
     * 名称
     */
    @ApiModelProperty(value= "名称")
    private String name;
    /**
     * wcs站点编号
     */
    @ApiModelProperty(value= "wcs站点编号")
    private String wcsCode;
    /**
     * 站点标签
     */
    @ApiModelProperty(value= "站点标签")
    private String label;
    /**
     * 设备类型
     */
    @ApiModelProperty(value= "设备类型")
    private String device;
    /**
     * 设备编号
     */
    @ApiModelProperty(value= "设备编号")
    private String deviceCode;
    /**
     * 设备站点
     */
    @ApiModelProperty(value= "设备站点")
    private String deviceSite;
    /**
     * 状态 1: 正常  0: 冻结
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 冻结  ")
    private Integer status;
    /**
     * 是否删除 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    @TableLogic
    private Integer deleted;
    /**
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;
    /**
     * 添加人员
     */
    @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;
    public DeviceSite() {}
    public DeviceSite(Integer type,String site,String name,String wcsCode,String label,String device,String deviceCode,String deviceSite,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.type = type;
        this.site = site;
        this.name = name;
        this.wcsCode = wcsCode;
        this.label = label;
        this.device = device;
        this.deviceCode = deviceCode;
        this.deviceSite = deviceSite;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }
//    DeviceSite deviceSite = new DeviceSite(
//            null,    // 入出库类型
//            null,    // 站点编号
//            null,    // 名称
//            null,    // wcs站点编号
//            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 Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return true;
            case 0:
                return false;
            default:
                return null;
        }
    }
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/mapper/DeviceSiteMapper.java
New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.mapper;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface DeviceSiteMapper extends BaseMapper<DeviceSite> {
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/DeviceSiteService.java
New file
@@ -0,0 +1,8 @@
package com.vincent.rsf.server.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.server.manager.entity.DeviceSite;
public interface DeviceSiteService extends IService<DeviceSite> {
}
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
New file
@@ -0,0 +1,12 @@
package com.vincent.rsf.server.manager.service.impl;
import com.vincent.rsf.server.manager.mapper.DeviceSiteMapper;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("deviceSiteService")
public class DeviceSiteServiceImpl extends ServiceImpl<DeviceSiteMapper, DeviceSite> implements DeviceSiteService {
}
rsf-server/src/main/resources/mapper/manager/DeviceSiteMapper.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.vincent.rsf.server.manager.mapper.DeviceSiteMapper">
</mapper>