diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysEquipment.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysEquipment.java deleted file mode 100644 index 0cf46709..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysEquipment.java +++ /dev/null @@ -1,320 +0,0 @@ -package com.ruoyi.system.domain; - -import com.ruoyi.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; - -/** - * 设备档案信息对象 sys_equipment - * - * @author ruoyi - * @date 2022-11-04 - */ -public class SysEquipment extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 设备id */ - private Long equipmentId; - - /** 设备编号 */ - @Excel(name = "设备编号") - private String equipmentCode; - - /** 设备名称 */ - @Excel(name = "设备名称") - private String equipmentName; - - /** 设备型号 */ - @Excel(name = "设备型号") - private String equipmentModel; - - /** 设备重量 */ - @Excel(name = "设备重量") - private String equipmentWeight; - - /** 设备状态 */ - @Excel(name = "设备状态") - private String equipmentState; - - /** 计量单位 */ - @Excel(name = "计量单位") - private String unitOfMeasurement; - - /** 设备类别 */ - @Excel(name = "设备类别") - private String equipmentCategory; - - /** 出厂编号 */ - @Excel(name = "出厂编号") - private String factoryNumber; - - /** 设备价格 */ - @Excel(name = "设备价格") - private String equipmentPrice; - - /** 厂家代码 */ - private String manufacturerNumber; - - /** 设备生产日期 */ - @Excel(name = "设备生产日期") - private String dateOfManufacture; - - /** 所在部门 */ - @Excel(name = "所在部门") - private String equipmentDept; - - /** 设备厂家名称 */ - @Excel(name = "设备厂家名称") - private String manufacturerName; - - /** 设备使用日期 */ - @Excel(name = "设备使用日期") - private String dateOfUse; - - /** 折旧年数 */ - @Excel(name = "折旧年数") - private String depreciationYear; - - /** 年折旧率 */ - @Excel(name = "年折旧率") - private String depreciationRate; - - /** 设备存放位置 */ - @Excel(name = "设备存放位置") - private String storageLocation; - - /** 完成工序 */ - @Excel(name = "完成工序") - private String completionOfProcess; - - /** 负责人 */ - @Excel(name = "负责人") - private String equipmentManager; - - /** 备注 */ - @Excel(name = "备注") - private String equipmentRemark; - - - /** 录入时间 */ - @Excel(name = "录入时间") - private String firstAddTime; - - /** 修改时间 */ - @Excel(name = "修改时间") - private String updateInfoTime; - - public Long getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(Long equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentCode() { - return equipmentCode; - } - - public void setEquipmentCode(String equipmentCode) { - this.equipmentCode = equipmentCode; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentModel() { - return equipmentModel; - } - - public void setEquipmentModel(String equipmentModel) { - this.equipmentModel = equipmentModel; - } - - public String getEquipmentWeight() { - return equipmentWeight; - } - - public void setEquipmentWeight(String equipmentWeight) { - this.equipmentWeight = equipmentWeight; - } - - public String getEquipmentState() { - return equipmentState; - } - - public void setEquipmentState(String equipmentState) { - this.equipmentState = equipmentState; - } - - public String getUnitOfMeasurement() { - return unitOfMeasurement; - } - - public void setUnitOfMeasurement(String unitOfMeasurement) { - this.unitOfMeasurement = unitOfMeasurement; - } - - public String getEquipmentCategory() { - return equipmentCategory; - } - - public void setEquipmentCategory(String equipmentCategory) { - this.equipmentCategory = equipmentCategory; - } - - public String getFactoryNumber() { - return factoryNumber; - } - - public void setFactoryNumber(String factoryNumber) { - this.factoryNumber = factoryNumber; - } - - public String getEquipmentPrice() { - return equipmentPrice; - } - - public void setEquipmentPrice(String equipmentPrice) { - this.equipmentPrice = equipmentPrice; - } - - public String getManufacturerNumber() { - return manufacturerNumber; - } - - public void setManufacturerNumber(String manufacturerNumber) { - this.manufacturerNumber = manufacturerNumber; - } - - public String getDateOfManufacture() { - return dateOfManufacture; - } - - public void setDateOfManufacture(String dateOfManufacture) { - this.dateOfManufacture = dateOfManufacture; - } - - public String getEquipmentDept() { - return equipmentDept; - } - - public void setEquipmentDept(String equipmentDept) { - this.equipmentDept = equipmentDept; - } - - public String getManufacturerName() { - return manufacturerName; - } - - public void setManufacturerName(String manufacturerName) { - this.manufacturerName = manufacturerName; - } - - public String getDateOfUse() { - return dateOfUse; - } - - public void setDateOfUse(String dateOfUse) { - this.dateOfUse = dateOfUse; - } - - public String getDepreciationYear() { - return depreciationYear; - } - - public void setDepreciationYear(String depreciationYear) { - this.depreciationYear = depreciationYear; - } - - public String getDepreciationRate() { - return depreciationRate; - } - - public void setDepreciationRate(String depreciationRate) { - this.depreciationRate = depreciationRate; - } - - public String getStorageLocation() { - return storageLocation; - } - - public void setStorageLocation(String storageLocation) { - this.storageLocation = storageLocation; - } - - public String getCompletionOfProcess() { - return completionOfProcess; - } - - public void setCompletionOfProcess(String completionOfProcess) { - this.completionOfProcess = completionOfProcess; - } - - public String getEquipmentManager() { - return equipmentManager; - } - - public void setEquipmentManager(String equipmentManager) { - this.equipmentManager = equipmentManager; - } - - public String getEquipmentRemark() { - return equipmentRemark; - } - - public void setEquipmentRemark(String equipmentRemark) { - this.equipmentRemark = equipmentRemark; - } - - public String getFirstAddTime() { - return firstAddTime; - } - - public void setFirstAddTime(String firstAddTime) { - this.firstAddTime = firstAddTime; - } - - public String getUpdateInfoTime() { - return updateInfoTime; - } - - public void setUpdateInfoTime(String updateInfoTime) { - this.updateInfoTime = updateInfoTime; - } - - @Override - public String toString() { - return new ToStringBuilder(this) - .append("equipmentId", equipmentId) - .append("equipmentCode", equipmentCode) - .append("equipmentName", equipmentName) - .append("equipmentModel", equipmentModel) - .append("equipmentWeight", equipmentWeight) - .append("equipmentState", equipmentState) - .append("unitOfMeasurement", unitOfMeasurement) - .append("equipmentCategory", equipmentCategory) - .append("factoryNumber", factoryNumber) - .append("equipmentPrice", equipmentPrice) - .append("manufacturerNumber", manufacturerNumber) - .append("dateOfManufacture", dateOfManufacture) - .append("equipmentDept", equipmentDept) - .append("manufacturerName", manufacturerName) - .append("dateOfUse", dateOfUse) - .append("depreciationYear", depreciationYear) - .append("depreciationRate", depreciationRate) - .append("storageLocation", storageLocation) - .append("completionOfProcess", completionOfProcess) - .append("equipmentManager", equipmentManager) - .append("equipmentRemark", equipmentRemark) - .append("firstAddTime", firstAddTime) - .append("updateInfoTime", updateInfoTime) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysEquipmentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysEquipmentMapper.java deleted file mode 100644 index c3713d05..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysEquipmentMapper.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.system.domain.SysEquipment; - -import java.util.List; - -/** - * 设备档案信息Mapper接口 - * - * @author ruoyi - * @date 2022-11-04 - */ -public interface SysEquipmentMapper -{ - /** - * 查询设备档案信息 - * - * @param equipmentId 设备档案信息ID - * @return 设备档案信息 - */ - public SysEquipment selectSysEquipmentById(Long equipmentId); - - /** - * 查询设备档案信息列表 - * - * @param sysEquipment 设备档案信息 - * @return 设备档案信息集合 - */ - public List selectSysEquipmentList(SysEquipment sysEquipment); - - /** - * 新增设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - public int insertSysEquipment(SysEquipment sysEquipment); - - /** - * 修改设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - public int updateSysEquipment(SysEquipment sysEquipment); - - /** - * 删除设备档案信息 - * - * @param equipmentId 设备档案信息ID - * @return 结果 - */ - public int deleteSysEquipmentById(Long equipmentId); - - /** - * 批量删除设备档案信息 - * - * @param equipmentIds 需要删除的数据ID - * @return 结果 - */ - public int deleteSysEquipmentByIds(String[] equipmentIds); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysEquipmentService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysEquipmentService.java deleted file mode 100644 index 24da3425..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysEquipmentService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.SysEquipment; - -import java.util.List; - -/** - * 设备档案信息Service接口 - * - * @author ruoyi - * @date 2022-11-04 - */ -public interface ISysEquipmentService -{ - /** - * 查询设备档案信息 - * - * @param equipmentId 设备档案信息ID - * @return 设备档案信息 - */ - public SysEquipment selectSysEquipmentById(Long equipmentId); - - /** - * 查询设备档案信息列表 - * - * @param sysEquipment 设备档案信息 - * @return 设备档案信息集合 - */ - public List selectSysEquipmentList(SysEquipment sysEquipment); - - /** - * 新增设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - public int insertSysEquipment(SysEquipment sysEquipment); - - /** - * 修改设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - public int updateSysEquipment(SysEquipment sysEquipment); - - /** - * 批量删除设备档案信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteSysEquipmentByIds(String ids); - - /** - * 删除设备档案信息信息 - * - * @param equipmentId 设备档案信息ID - * @return 结果 - */ - public int deleteSysEquipmentById(Long equipmentId); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysEquipmentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysEquipmentServiceImpl.java deleted file mode 100644 index 5c020f15..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysEquipmentServiceImpl.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.system.domain.SysEquipment; -import com.ruoyi.system.mapper.SysEquipmentMapper; -import com.ruoyi.system.service.ISysEquipmentService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 设备档案信息Service业务层处理 - * - * @author ruoyi - * @date 2022-11-04 - */ -@Service -public class SysEquipmentServiceImpl implements ISysEquipmentService -{ - @Autowired - private SysEquipmentMapper sysEquipmentMapper; - - /** - * 查询设备档案信息 - * - * @param equipmentId 设备档案信息ID - * @return 设备档案信息 - */ - @Override - public SysEquipment selectSysEquipmentById(Long equipmentId) - { - return sysEquipmentMapper.selectSysEquipmentById(equipmentId); - } - - /** - * 查询设备档案信息列表 - * - * @param sysEquipment 设备档案信息 - * @return 设备档案信息 - */ - @Override - public List selectSysEquipmentList(SysEquipment sysEquipment) - { - return sysEquipmentMapper.selectSysEquipmentList(sysEquipment); - } - - /** - * 新增设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - @Override - public int insertSysEquipment(SysEquipment sysEquipment) - { - return sysEquipmentMapper.insertSysEquipment(sysEquipment); - } - - /** - * 修改设备档案信息 - * - * @param sysEquipment 设备档案信息 - * @return 结果 - */ - @Override - public int updateSysEquipment(SysEquipment sysEquipment) - { - return sysEquipmentMapper.updateSysEquipment(sysEquipment); - } - - /** - * 删除设备档案信息对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteSysEquipmentByIds(String ids) - { - return sysEquipmentMapper.deleteSysEquipmentByIds(Convert.toStrArray(ids)); - } - - /** - * 删除设备档案信息信息 - * - * @param equipmentId 设备档案信息ID - * @return 结果 - */ - @Override - public int deleteSysEquipmentById(Long equipmentId) - { - return sysEquipmentMapper.deleteSysEquipmentById(equipmentId); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysEquipmentController.java deleted file mode 100644 index 9f9cff15..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysEquipmentController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.ruoyi.web.controller.system; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysEquipment; -import com.ruoyi.system.service.ISysEquipmentService; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 设备档案信息Controller - * - * @author ruoyi - * @date 2022-11-04 - */ -@Controller -@RequestMapping("/system/equipment") -public class SysEquipmentController extends BaseController -{ - private String prefix = "system/equipment"; - - @Autowired - private ISysEquipmentService sysEquipmentService; - - @RequiresPermissions("system:equipment:view") - @GetMapping() - public String equipment() - { - return prefix + "/equipment"; - } - - /** - * 查询设备档案信息列表 - */ - @RequiresPermissions("system:equipment:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(SysEquipment sysEquipment) - { - startPage(); - List list = sysEquipmentService.selectSysEquipmentList(sysEquipment); - return getDataTable(list); - } - - /** - * 导出设备档案信息列表 - */ - @RequiresPermissions("system:equipment:export") - @Log(title = "设备档案信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(SysEquipment sysEquipment) - { - List list = sysEquipmentService.selectSysEquipmentList(sysEquipment); - ExcelUtil util = new ExcelUtil(SysEquipment.class); - return util.exportExcel(list, "设备档案信息数据"); - } - - /** - * 新增设备档案信息 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存设备档案信息 - */ - @RequiresPermissions("system:equipment:add") - @Log(title = "设备档案信息", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(SysEquipment sysEquipment) - { - return toAjax(sysEquipmentService.insertSysEquipment(sysEquipment)); - } - - /** - * 修改设备档案信息 - */ - @GetMapping("/edit/{equipmentId}") - public String edit(@PathVariable("equipmentId") Long equipmentId, ModelMap mmap) - { - SysEquipment sysEquipment = sysEquipmentService.selectSysEquipmentById(equipmentId); - mmap.put("sysEquipment", sysEquipment); - return prefix + "/edit"; - } - - /** - * 修改保存设备档案信息 - */ - @RequiresPermissions("system:equipment:edit") - @Log(title = "设备档案信息", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(SysEquipment sysEquipment) - { - return toAjax(sysEquipmentService.updateSysEquipment(sysEquipment)); - } - - /** - * 删除设备档案信息 - */ - @RequiresPermissions("system:equipment:remove") - @Log(title = "设备档案信息", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(sysEquipmentService.deleteSysEquipmentByIds(ids)); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysEquipmentMapper.xml deleted file mode 100644 index c4c8af43..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/SysEquipmentMapper.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select equipment_id, equipment_code, equipment_name, equipment_model, equipment_weight, equipment_state, unit_of_measurement, equipment_category, factory_number, equipment_price, manufacturer_number, date_of_manufacture, equipment_dept, manufacturer_name, date_of_use, depreciation_year, depreciation_rate, storage_location, completion_of_process, equipment_manager, equipment_remark, first_add_time, update_info_time from sys_equipment - - - - - - - - insert into sys_equipment - - equipment_code, - equipment_name, - equipment_model, - equipment_weight, - equipment_state, - unit_of_measurement, - equipment_category, - factory_number, - equipment_price, - manufacturer_number, - date_of_manufacture, - equipment_dept, - manufacturer_name, - date_of_use, - depreciation_year, - depreciation_rate, - storage_location, - completion_of_process, - equipment_manager, - equipment_remark, - first_add_time, - - - #{equipmentCode}, - #{equipmentName}, - #{equipmentModel}, - #{equipmentWeight}, - #{equipmentState}, - #{unitOfMeasurement}, - #{equipmentCategory}, - #{factoryNumber}, - #{equipmentPrice}, - #{manufacturerNumber}, - #{dateOfManufacture}, - #{equipmentDept}, - #{manufacturerName}, - #{dateOfUse}, - #{depreciationYear}, - #{depreciationRate}, - #{storageLocation}, - #{completionOfProcess}, - #{equipmentManager}, - #{equipmentRemark}, - now(), - - - - - update sys_equipment - - equipment_code = #{equipmentCode}, - equipment_name = #{equipmentName}, - equipment_model = #{equipmentModel}, - equipment_weight = #{equipmentWeight}, - equipment_state = #{equipmentState}, - unit_of_measurement = #{unitOfMeasurement}, - equipment_category = #{equipmentCategory}, - factory_number = #{factoryNumber}, - equipment_price = #{equipmentPrice}, - manufacturer_number = #{manufacturerNumber}, - date_of_manufacture = #{dateOfManufacture}, - equipment_dept = #{equipmentDept}, - manufacturer_name = #{manufacturerName}, - date_of_use = #{dateOfUse}, - depreciation_year = #{depreciationYear}, - depreciation_rate = #{depreciationRate}, - storage_location = #{storageLocation}, - completion_of_process = #{completionOfProcess}, - equipment_manager = #{equipmentManager}, - equipment_remark = #{equipmentRemark}, - update_info_time = CONCAT_WS(',',NOW(),update_info_time), - - where equipment_id = #{equipmentId} - - - - delete from sys_equipment where equipment_id = #{equipmentId} - - - - delete from sys_equipment where equipment_id in - - #{equipmentId} - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/equipment/add.html b/ruoyi-admin/src/main/resources/templates/system/equipment/add.html deleted file mode 100644 index 26f37920..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/equipment/add.html +++ /dev/null @@ -1,184 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/equipment/edit.html b/ruoyi-admin/src/main/resources/templates/system/equipment/edit.html deleted file mode 100644 index 4eb13c5e..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/equipment/edit.html +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- - -
-
-
- -
- -
-
-
- -
-
- - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/equipment/equipment.html b/ruoyi-admin/src/main/resources/templates/system/equipment/equipment.html deleted file mode 100644 index 9bf9526d..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/equipment/equipment.html +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • -  搜索 -  重置 -
  • -
-
-
-
- - -
-
-
-
-
- - - - \ No newline at end of file