diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/controller/BasRoadwayController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/controller/BasRoadwayController.java new file mode 100644 index 0000000..fff7b7c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/controller/BasRoadwayController.java @@ -0,0 +1,104 @@ +package com.ruoyi.bas.roadway.controller; + +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bas.roadway.domain.BasRoadway; +import com.ruoyi.bas.roadway.service.IBasRoadwayService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 巷道管理Controller + * + * @author ruoyi + * @date 2025-09-12 + */ +@RestController +@RequestMapping("/bas/roadway") +public class BasRoadwayController extends BaseController +{ + @Autowired + private IBasRoadwayService basRoadwayService; + + /** + * 查询巷道管理列表 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:list')") + @GetMapping("/list") + public TableDataInfo list(BasRoadway basRoadway) + { + startPage(); + List list = basRoadwayService.selectBasRoadwayList(basRoadway); + return getDataTable(list); + } + + /** + * 导出巷道管理列表 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:export')") + @Log(title = "巷道管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasRoadway basRoadway) + { + List list = basRoadwayService.selectBasRoadwayList(basRoadway); + ExcelUtil util = new ExcelUtil(BasRoadway.class); + util.exportExcel(response, list, "巷道管理数据"); + } + + /** + * 获取巷道管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return success(basRoadwayService.selectBasRoadwayById(id)); + } + + /** + * 新增巷道管理 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:add')") + @Log(title = "巷道管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasRoadway basRoadway) + { + return toAjax(basRoadwayService.insertBasRoadway(basRoadway)); + } + + /** + * 修改巷道管理 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:edit')") + @Log(title = "巷道管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasRoadway basRoadway) + { + return toAjax(basRoadwayService.updateBasRoadway(basRoadway)); + } + + /** + * 删除巷道管理 + */ + @PreAuthorize("@ss.hasPermi('bas:roadway:remove')") + @Log(title = "巷道管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(basRoadwayService.deleteBasRoadwayByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java new file mode 100644 index 0000000..9f87552 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java @@ -0,0 +1,157 @@ +package com.ruoyi.bas.roadway.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 巷道管理对象 bas_roadway + * + * @author ruoyi + * @date 2025-09-12 + */ +public class BasRoadway extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id(不允许为空)主键 */ + private String id; + + /** 巷道号(不允许为空) */ + @Excel(name = "巷道号", readConverterExp = "不=允许为空") + private String roadwayId; + + /** 仓库id(不允许为空) */ + @Excel(name = "仓库id", readConverterExp = "不=允许为空") + private String warehouseId; + + /** 巷道名称 */ + @Excel(name = "巷道名称") + private String roadwayName; + + /** 设备id/328区分1层2层 */ + @Excel(name = "设备id/328区分1层2层") + private String deviceId; + + /** 一层入库锁 */ + @Excel(name = "一层入库锁") + private String inLocked; + + /** 一层出库锁 */ + @Excel(name = "一层出库锁") + private String outLocked; + + /** 二层入库锁 */ + @Excel(name = "二层入库锁") + private String inLocked2; + + /** 二层出库锁 */ + @Excel(name = "二层出库锁") + private String outLocked2; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + + public void setRoadwayId(String roadwayId) + { + this.roadwayId = roadwayId; + } + + public String getRoadwayId() + { + return roadwayId; + } + + public void setWarehouseId(String warehouseId) + { + this.warehouseId = warehouseId; + } + + public String getWarehouseId() + { + return warehouseId; + } + + public void setRoadwayName(String roadwayName) + { + this.roadwayName = roadwayName; + } + + public String getRoadwayName() + { + return roadwayName; + } + + public void setDeviceId(String deviceId) + { + this.deviceId = deviceId; + } + + public String getDeviceId() + { + return deviceId; + } + + public void setInLocked(String inLocked) + { + this.inLocked = inLocked; + } + + public String getInLocked() + { + return inLocked; + } + + public void setOutLocked(String outLocked) + { + this.outLocked = outLocked; + } + + public String getOutLocked() + { + return outLocked; + } + + public void setInLocked2(String inLocked2) + { + this.inLocked2 = inLocked2; + } + + public String getInLocked2() + { + return inLocked2; + } + + public void setOutLocked2(String outLocked2) + { + this.outLocked2 = outLocked2; + } + + public String getOutLocked2() + { + return outLocked2; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("roadwayId", getRoadwayId()) + .append("warehouseId", getWarehouseId()) + .append("roadwayName", getRoadwayName()) + .append("deviceId", getDeviceId()) + .append("inLocked", getInLocked()) + .append("outLocked", getOutLocked()) + .append("inLocked2", getInLocked2()) + .append("outLocked2", getOutLocked2()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java new file mode 100644 index 0000000..a83399b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/mapper/BasRoadwayMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.bas.roadway.mapper; + +import java.util.List; +import com.ruoyi.bas.roadway.domain.BasRoadway; + +/** + * 巷道管理Mapper接口 + * + * @author ruoyi + * @date 2025-09-12 + */ +public interface BasRoadwayMapper +{ + /** + * 查询巷道管理 + * + * @param id 巷道管理主键 + * @return 巷道管理 + */ + public BasRoadway selectBasRoadwayById(String id); + + /** + * 查询巷道管理列表 + * + * @param basRoadway 巷道管理 + * @return 巷道管理集合 + */ + public List selectBasRoadwayList(BasRoadway basRoadway); + + /** + * 新增巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + public int insertBasRoadway(BasRoadway basRoadway); + + /** + * 修改巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + public int updateBasRoadway(BasRoadway basRoadway); + + /** + * 删除巷道管理 + * + * @param id 巷道管理主键 + * @return 结果 + */ + public int deleteBasRoadwayById(String id); + + /** + * 批量删除巷道管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasRoadwayByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/IBasRoadwayService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/IBasRoadwayService.java new file mode 100644 index 0000000..2d1604a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/IBasRoadwayService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bas.roadway.service; + +import java.util.List; +import com.ruoyi.bas.roadway.domain.BasRoadway; + +/** + * 巷道管理Service接口 + * + * @author ruoyi + * @date 2025-09-12 + */ +public interface IBasRoadwayService +{ + /** + * 查询巷道管理 + * + * @param id 巷道管理主键 + * @return 巷道管理 + */ + public BasRoadway selectBasRoadwayById(String id); + + /** + * 查询巷道管理列表 + * + * @param basRoadway 巷道管理 + * @return 巷道管理集合 + */ + public List selectBasRoadwayList(BasRoadway basRoadway); + + /** + * 新增巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + public int insertBasRoadway(BasRoadway basRoadway); + + /** + * 修改巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + public int updateBasRoadway(BasRoadway basRoadway); + + /** + * 批量删除巷道管理 + * + * @param ids 需要删除的巷道管理主键集合 + * @return 结果 + */ + public int deleteBasRoadwayByIds(String[] ids); + + /** + * 删除巷道管理信息 + * + * @param id 巷道管理主键 + * @return 结果 + */ + public int deleteBasRoadwayById(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java new file mode 100644 index 0000000..b4943fc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/service/impl/BasRoadwayServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.bas.roadway.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bas.roadway.mapper.BasRoadwayMapper; +import com.ruoyi.bas.roadway.domain.BasRoadway; +import com.ruoyi.bas.roadway.service.IBasRoadwayService; + +/** + * 巷道管理Service业务层处理 + * + * @author ruoyi + * @date 2025-09-12 + */ +@Service +public class BasRoadwayServiceImpl implements IBasRoadwayService +{ + @Autowired + private BasRoadwayMapper basRoadwayMapper; + + /** + * 查询巷道管理 + * + * @param id 巷道管理主键 + * @return 巷道管理 + */ + @Override + public BasRoadway selectBasRoadwayById(String id) + { + return basRoadwayMapper.selectBasRoadwayById(id); + } + + /** + * 查询巷道管理列表 + * + * @param basRoadway 巷道管理 + * @return 巷道管理 + */ + @Override + public List selectBasRoadwayList(BasRoadway basRoadway) + { + return basRoadwayMapper.selectBasRoadwayList(basRoadway); + } + + /** + * 新增巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + @Override + public int insertBasRoadway(BasRoadway basRoadway) + { + return basRoadwayMapper.insertBasRoadway(basRoadway); + } + + /** + * 修改巷道管理 + * + * @param basRoadway 巷道管理 + * @return 结果 + */ + @Override + public int updateBasRoadway(BasRoadway basRoadway) + { + return basRoadwayMapper.updateBasRoadway(basRoadway); + } + + /** + * 批量删除巷道管理 + * + * @param ids 需要删除的巷道管理主键 + * @return 结果 + */ + @Override + public int deleteBasRoadwayByIds(String[] ids) + { + return basRoadwayMapper.deleteBasRoadwayByIds(ids); + } + + /** + * 删除巷道管理信息 + * + * @param id 巷道管理主键 + * @return 结果 + */ + @Override + public int deleteBasRoadwayById(String id) + { + return basRoadwayMapper.deleteBasRoadwayById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml new file mode 100644 index 0000000..0ca261a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + select id, roadway_id, warehouse_id, roadway_name, device_id, in_locked, out_locked, in_locked2, out_locked2 from bas_roadway + + + + + + + + insert into bas_roadway + + id, + roadway_id, + warehouse_id, + roadway_name, + device_id, + in_locked, + out_locked, + in_locked2, + out_locked2, + + + #{id}, + #{roadwayId}, + #{warehouseId}, + #{roadwayName}, + #{deviceId}, + #{inLocked}, + #{outLocked}, + #{inLocked2}, + #{outLocked2}, + + + + + update bas_roadway + + roadway_id = #{roadwayId}, + warehouse_id = #{warehouseId}, + roadway_name = #{roadwayName}, + device_id = #{deviceId}, + in_locked = #{inLocked}, + out_locked = #{outLocked}, + in_locked2 = #{inLocked2}, + out_locked2 = #{outLocked2}, + + where id = #{id} + + + + delete from bas_roadway where id = #{id} + + + + delete from bas_roadway where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/bas/roadway.js b/ruoyi-ui/src/api/bas/roadway.js new file mode 100644 index 0000000..b4f136c --- /dev/null +++ b/ruoyi-ui/src/api/bas/roadway.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询巷道管理列表 +export function listRoadway(query) { + return request({ + url: '/bas/roadway/list', + method: 'get', + params: query + }) +} + +// 查询巷道管理详细 +export function getRoadway(id) { + return request({ + url: '/bas/roadway/' + id, + method: 'get' + }) +} + +// 新增巷道管理 +export function addRoadway(data) { + return request({ + url: '/bas/roadway', + method: 'post', + data: data + }) +} + +// 修改巷道管理 +export function updateRoadway(data) { + return request({ + url: '/bas/roadway', + method: 'put', + data: data + }) +} + +// 删除巷道管理 +export function delRoadway(id) { + return request({ + url: '/bas/roadway/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/bas/roadway/index.vue b/ruoyi-ui/src/views/bas/roadway/index.vue new file mode 100644 index 0000000..8c540c6 --- /dev/null +++ b/ruoyi-ui/src/views/bas/roadway/index.vue @@ -0,0 +1,416 @@ + + +