From 0f094e2d59dd82c7cd4c53785e2224528af4d323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Thu, 12 Jun 2025 15:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=8E=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceCarController.java | 104 +++++ .../device/DeviceCar/domain/DeviceCar.java | 233 ++++++++++ .../DeviceCar/mapper/DeviceCarMapper.java | 61 +++ .../DeviceCar/service/IDeviceCarService.java | 61 +++ .../service/impl/DeviceCarServiceImpl.java | 95 ++++ .../api/controller/RequestLogController.java | 15 + .../src/main/resources/application.yml | 2 +- .../mapper/device/DeviceCarMapper.xml | 120 ++++++ ruoyi-ui/src/api/device/DeviceCar.js | 44 ++ ruoyi-ui/src/views/device/DeviceCar/index.vue | 404 ++++++++++++++++++ ruoyi-ui/vue.config.js | 2 +- 11 files changed, 1139 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/controller/DeviceCarController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/domain/DeviceCar.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/mapper/DeviceCarMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/IDeviceCarService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/impl/DeviceCarServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/device/DeviceCarMapper.xml create mode 100644 ruoyi-ui/src/api/device/DeviceCar.js create mode 100644 ruoyi-ui/src/views/device/DeviceCar/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/controller/DeviceCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/controller/DeviceCarController.java new file mode 100644 index 0000000..0b449b7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/controller/DeviceCarController.java @@ -0,0 +1,104 @@ +package com.ruoyi.device.DeviceCar.controller; + +import java.util.List; +import javax.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.device.DeviceCar.domain.DeviceCar; +import com.ruoyi.device.DeviceCar.service.IDeviceCarService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 设备信息Controller + * + * @author ruoyi + * @date 2025-06-12 + */ +@RestController +@RequestMapping("/device/DeviceCar") +public class DeviceCarController extends BaseController +{ + @Autowired + private IDeviceCarService deviceCarService; + + /** + * 查询设备信息列表 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:list')") + @GetMapping("/list") + public TableDataInfo list(DeviceCar deviceCar) + { + startPage(); + List list = deviceCarService.selectDeviceCarList(deviceCar); + return getDataTable(list); + } + + /** + * 导出设备信息列表 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:export')") + @Log(title = "设备信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DeviceCar deviceCar) + { + List list = deviceCarService.selectDeviceCarList(deviceCar); + ExcelUtil util = new ExcelUtil(DeviceCar.class); + util.exportExcel(response, list, "设备信息数据"); + } + + /** + * 获取设备信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(deviceCarService.selectDeviceCarById(id)); + } + + /** + * 新增设备信息 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:add')") + @Log(title = "设备信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody DeviceCar deviceCar) + { + return toAjax(deviceCarService.insertDeviceCar(deviceCar)); + } + + /** + * 修改设备信息 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:edit')") + @Log(title = "设备信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody DeviceCar deviceCar) + { + return toAjax(deviceCarService.updateDeviceCar(deviceCar)); + } + + /** + * 删除设备信息 + */ + @PreAuthorize("@ss.hasPermi('device:DeviceCar:remove')") + @Log(title = "设备信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(deviceCarService.deleteDeviceCarByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/domain/DeviceCar.java b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/domain/DeviceCar.java new file mode 100644 index 0000000..e717e97 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/domain/DeviceCar.java @@ -0,0 +1,233 @@ +package com.ruoyi.device.DeviceCar.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; + +/** + * 设备信息对象 device_car + * + * @author ruoyi + * @date 2025-06-12 + */ +public class DeviceCar extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 设备唯一编码 */ + @Excel(name = "设备唯一编码") + private String deviceCode ; + + /** 设备名称 */ + @Excel(name = "设备名称") + private String name ; + + /** 1-AGV 2-CTU 3-SSJ */ + @Excel(name = "1-AGV 2-CTU 3-SSJ") + private String type; + + /** 设备IP */ + @Excel(name = "设备IP") + private String ipAddress; + + /** 关联缓冲区 */ + @Excel(name = "关联缓冲区") + private String bufferAreaId ; + + /** 0-F 1-T */ + @Excel(name = "0-F 1-T") + private String isActive; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 备用字段 */ + @Excel(name = "备用字段") + private String spare1; + + /** 备用字段 */ + @Excel(name = "备用字段") + private String spare2; + + /** 备用字段 */ + @Excel(name = "备用字段") + private String spare3; + + /** 备用字段 */ + @Excel(name = "备用字段") + private String spare4; + + /** 任务号 */ + @Excel(name = "任务号") + private String taskNo; + + /** 执行阶段 */ + @Excel(name = "执行阶段") + private String zxjd; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setDeviceCode (String deviceCode ) + { + this.deviceCode = deviceCode ; + } + + public String getDeviceCode () + { + return deviceCode ; + } + + public void setName (String name ) + { + this.name = name ; + } + + public String getName () + { + return name ; + } + + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + public void setIpAddress(String ipAddress) + { + this.ipAddress = ipAddress; + } + + public String getIpAddress() + { + return ipAddress; + } + + public void setBufferAreaId (String bufferAreaId ) + { + this.bufferAreaId = bufferAreaId ; + } + + public String getBufferAreaId () + { + return bufferAreaId ; + } + + public void setIsActive(String isActive) + { + this.isActive = isActive; + } + + public String getIsActive() + { + return isActive; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + + public void setTaskNo(String taskNo) + { + this.taskNo = taskNo; + } + + public String getTaskNo() + { + return taskNo; + } + + public void setZxjd(String zxjd) + { + this.zxjd = zxjd; + } + + public String getZxjd() + { + return zxjd; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("deviceCode ", getDeviceCode ()) + .append("name ", getName ()) + .append("type", getType()) + .append("ipAddress", getIpAddress()) + .append("bufferAreaId ", getBufferAreaId ()) + .append("isActive", getIsActive()) + .append("createTime", getCreateTime()) + .append("status", getStatus()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("taskNo", getTaskNo()) + .append("zxjd", getZxjd()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/mapper/DeviceCarMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/mapper/DeviceCarMapper.java new file mode 100644 index 0000000..bbf39ad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/mapper/DeviceCarMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.device.DeviceCar.mapper; + +import java.util.List; +import com.ruoyi.device.DeviceCar.domain.DeviceCar; + +/** + * 设备信息Mapper接口 + * + * @author ruoyi + * @date 2025-06-12 + */ +public interface DeviceCarMapper +{ + /** + * 查询设备信息 + * + * @param id 设备信息主键 + * @return 设备信息 + */ + public DeviceCar selectDeviceCarById(Long id); + + /** + * 查询设备信息列表 + * + * @param deviceCar 设备信息 + * @return 设备信息集合 + */ + public List selectDeviceCarList(DeviceCar deviceCar); + + /** + * 新增设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + public int insertDeviceCar(DeviceCar deviceCar); + + /** + * 修改设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + public int updateDeviceCar(DeviceCar deviceCar); + + /** + * 删除设备信息 + * + * @param id 设备信息主键 + * @return 结果 + */ + public int deleteDeviceCarById(Long id); + + /** + * 批量删除设备信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceCarByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/IDeviceCarService.java b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/IDeviceCarService.java new file mode 100644 index 0000000..f7e1032 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/IDeviceCarService.java @@ -0,0 +1,61 @@ +package com.ruoyi.device.DeviceCar.service; + +import java.util.List; +import com.ruoyi.device.DeviceCar.domain.DeviceCar; + +/** + * 设备信息Service接口 + * + * @author ruoyi + * @date 2025-06-12 + */ +public interface IDeviceCarService +{ + /** + * 查询设备信息 + * + * @param id 设备信息主键 + * @return 设备信息 + */ + public DeviceCar selectDeviceCarById(Long id); + + /** + * 查询设备信息列表 + * + * @param deviceCar 设备信息 + * @return 设备信息集合 + */ + public List selectDeviceCarList(DeviceCar deviceCar); + + /** + * 新增设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + public int insertDeviceCar(DeviceCar deviceCar); + + /** + * 修改设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + public int updateDeviceCar(DeviceCar deviceCar); + + /** + * 批量删除设备信息 + * + * @param ids 需要删除的设备信息主键集合 + * @return 结果 + */ + public int deleteDeviceCarByIds(Long[] ids); + + /** + * 删除设备信息信息 + * + * @param id 设备信息主键 + * @return 结果 + */ + public int deleteDeviceCarById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/impl/DeviceCarServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/impl/DeviceCarServiceImpl.java new file mode 100644 index 0000000..1d8300b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/DeviceCar/service/impl/DeviceCarServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.device.DeviceCar.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.device.DeviceCar.mapper.DeviceCarMapper; +import com.ruoyi.device.DeviceCar.domain.DeviceCar; +import com.ruoyi.device.DeviceCar.service.IDeviceCarService; + +/** + * 设备信息Service业务层处理 + * + * @author ruoyi + * @date 2025-06-12 + */ +@Service +public class DeviceCarServiceImpl implements IDeviceCarService +{ + @Autowired + private DeviceCarMapper deviceCarMapper; + + /** + * 查询设备信息 + * + * @param id 设备信息主键 + * @return 设备信息 + */ + @Override + public DeviceCar selectDeviceCarById(Long id) + { + return deviceCarMapper.selectDeviceCarById(id); + } + + /** + * 查询设备信息列表 + * + * @param deviceCar 设备信息 + * @return 设备信息 + */ + @Override + public List selectDeviceCarList(DeviceCar deviceCar) + { + return deviceCarMapper.selectDeviceCarList(deviceCar); + } + + /** + * 新增设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + @Override + public int insertDeviceCar(DeviceCar deviceCar) + { + deviceCar.setCreateTime(DateUtils.getNowDate()); + return deviceCarMapper.insertDeviceCar(deviceCar); + } + + /** + * 修改设备信息 + * + * @param deviceCar 设备信息 + * @return 结果 + */ + @Override + public int updateDeviceCar(DeviceCar deviceCar) + { + return deviceCarMapper.updateDeviceCar(deviceCar); + } + + /** + * 批量删除设备信息 + * + * @param ids 需要删除的设备信息主键 + * @return 结果 + */ + @Override + public int deleteDeviceCarByIds(Long[] ids) + { + return deviceCarMapper.deleteDeviceCarByIds(ids); + } + + /** + * 删除设备信息信息 + * + * @param id 设备信息主键 + * @return 结果 + */ + @Override + public int deleteDeviceCarById(Long id) + { + return deviceCarMapper.deleteDeviceCarById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/device/api/controller/RequestLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/device/api/controller/RequestLogController.java index 895436a..a37b86f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/device/api/controller/RequestLogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/device/api/controller/RequestLogController.java @@ -18,6 +18,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.device.api.domain.RequestLog; import com.ruoyi.device.api.service.IRequestLogService; +import com.ruoyi.device.DeviceCar.domain.DeviceCar; +import com.ruoyi.device.DeviceCar.service.IDeviceCarService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; @@ -34,6 +36,19 @@ public class RequestLogController extends BaseController @Autowired private IRequestLogService requestLogService; + @Autowired + private IDeviceCarService deviceCarService; + + /** + * 查询所有设备信息 + */ + @GetMapping("/devicecar/list") + public AjaxResult listAllDeviceCar() + { + List list = deviceCarService.selectDeviceCarList(new DeviceCar()); + return success(list); + } + /** * 查询接口记录列表 */ diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 51bfd75..554238f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 8081 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/mapper/device/DeviceCarMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/DeviceCarMapper.xml new file mode 100644 index 0000000..9a5c3f4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/device/DeviceCarMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, device_code , name , type, ip_address, buffer_area_id , is_active, create_time, status, spare1, spare2, spare3, spare4, task_no, zxjd from device_car + + + + + + + + insert into device_car + + device_code , + name , + type, + ip_address, + buffer_area_id , + is_active, + create_time, + status, + spare1, + spare2, + spare3, + spare4, + task_no, + zxjd, + + + #{deviceCode }, + #{name }, + #{type}, + #{ipAddress}, + #{bufferAreaId }, + #{isActive}, + #{createTime}, + #{status}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{taskNo}, + #{zxjd}, + + + + + update device_car + + device_code = #{deviceCode }, + name = #{name }, + type = #{type}, + ip_address = #{ipAddress}, + buffer_area_id = #{bufferAreaId }, + is_active = #{isActive}, + create_time = #{createTime}, + status = #{status}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + task_no = #{taskNo}, + zxjd = #{zxjd}, + + where id = #{id} + + + + delete from device_car where id = #{id} + + + + delete from device_car where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/device/DeviceCar.js b/ruoyi-ui/src/api/device/DeviceCar.js new file mode 100644 index 0000000..126fd55 --- /dev/null +++ b/ruoyi-ui/src/api/device/DeviceCar.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询设备信息列表 +export function listDeviceCar(query) { + return request({ + url: '/device/DeviceCar/list', + method: 'get', + params: query + }) +} + +// 查询设备信息详细 +export function getDeviceCar(id) { + return request({ + url: '/device/DeviceCar/' + id, + method: 'get' + }) +} + +// 新增设备信息 +export function addDeviceCar(data) { + return request({ + url: '/device/DeviceCar', + method: 'post', + data: data + }) +} + +// 修改设备信息 +export function updateDeviceCar(data) { + return request({ + url: '/device/DeviceCar', + method: 'put', + data: data + }) +} + +// 删除设备信息 +export function delDeviceCar(id) { + return request({ + url: '/device/DeviceCar/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/device/DeviceCar/index.vue b/ruoyi-ui/src/views/device/DeviceCar/index.vue new file mode 100644 index 0000000..9c4a694 --- /dev/null +++ b/ruoyi-ui/src/views/device/DeviceCar/index.vue @@ -0,0 +1,404 @@ + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 40e140d..f483b3c 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 -const baseUrl = 'http://localhost:8080' // 后端接口 +const baseUrl = 'http://localhost:8081' // 后端接口 const port = process.env.port || process.env.npm_config_port || 80 // 端口