From 454128ae643349081c3601fa1e549a70f0b3881b Mon Sep 17 00:00:00 2001 From: wenshijun Date: Wed, 11 Mar 2026 09:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worn/config/MqttClientConfig.java | 4 +- .../worn/config/MqttProperties.java | 2 +- .../worn/config/MqttPublishClient.java | 2 +- .../controller/WornMaterialController.java | 104 +++++++ .../WornMaterialTypeController.java | 104 +++++++ .../WornMaterialUnitController.java | 104 +++++++ .../project/worn/domain/WornMaterial.java | 268 ++++++++++++++++++ .../project/worn/domain/WornMaterialType.java | 191 +++++++++++++ .../project/worn/domain/WornMaterialUnit.java | 116 ++++++++ .../worn/mapper/WornMaterialMapper.java | 61 ++++ .../worn/mapper/WornMaterialTypeMapper.java | 61 ++++ .../worn/mapper/WornMaterialUnitMapper.java | 61 ++++ .../dispatcher/MqttMessageDispatcher.java | 8 +- .../worn/mqtt/handler/HumiSensorHandler.java | 2 +- .../worn/mqtt/handler/SmokeSensorHandler.java | 2 +- .../worn/mqtt/handler/TempSensorHandler.java | 2 +- .../worn/service/IWornMaterialService.java | 61 ++++ .../service/IWornMaterialTypeService.java | 61 ++++ .../service/IWornMaterialUnitService.java | 61 ++++ .../service/impl/WornMaterialServiceImpl.java | 96 +++++++ .../impl/WornMaterialTypeServiceImpl.java | 96 +++++++ .../impl/WornMaterialUnitServiceImpl.java | 96 +++++++ .../mybatis/worn/WornMaterialMapper.xml | 142 ++++++++++ .../mybatis/worn/WornMaterialTypeMapper.xml | 117 ++++++++ .../mybatis/worn/WornMaterialUnitMapper.xml | 92 ++++++ 25 files changed, 1903 insertions(+), 11 deletions(-) rename src/main/java/com/shzg/{ => project}/worn/config/MqttClientConfig.java (97%) rename src/main/java/com/shzg/{ => project}/worn/config/MqttProperties.java (96%) rename src/main/java/com/shzg/{ => project}/worn/config/MqttPublishClient.java (98%) create mode 100644 src/main/java/com/shzg/project/worn/controller/WornMaterialController.java create mode 100644 src/main/java/com/shzg/project/worn/controller/WornMaterialTypeController.java create mode 100644 src/main/java/com/shzg/project/worn/controller/WornMaterialUnitController.java create mode 100644 src/main/java/com/shzg/project/worn/domain/WornMaterial.java create mode 100644 src/main/java/com/shzg/project/worn/domain/WornMaterialType.java create mode 100644 src/main/java/com/shzg/project/worn/domain/WornMaterialUnit.java create mode 100644 src/main/java/com/shzg/project/worn/mapper/WornMaterialMapper.java create mode 100644 src/main/java/com/shzg/project/worn/mapper/WornMaterialTypeMapper.java create mode 100644 src/main/java/com/shzg/project/worn/mapper/WornMaterialUnitMapper.java rename src/main/java/com/shzg/{ => project}/worn/mqtt/dispatcher/MqttMessageDispatcher.java (86%) rename src/main/java/com/shzg/{ => project}/worn/mqtt/handler/HumiSensorHandler.java (96%) rename src/main/java/com/shzg/{ => project}/worn/mqtt/handler/SmokeSensorHandler.java (96%) rename src/main/java/com/shzg/{ => project}/worn/mqtt/handler/TempSensorHandler.java (96%) create mode 100644 src/main/java/com/shzg/project/worn/service/IWornMaterialService.java create mode 100644 src/main/java/com/shzg/project/worn/service/IWornMaterialTypeService.java create mode 100644 src/main/java/com/shzg/project/worn/service/IWornMaterialUnitService.java create mode 100644 src/main/java/com/shzg/project/worn/service/impl/WornMaterialServiceImpl.java create mode 100644 src/main/java/com/shzg/project/worn/service/impl/WornMaterialTypeServiceImpl.java create mode 100644 src/main/java/com/shzg/project/worn/service/impl/WornMaterialUnitServiceImpl.java create mode 100644 src/main/resources/mybatis/worn/WornMaterialMapper.xml create mode 100644 src/main/resources/mybatis/worn/WornMaterialTypeMapper.xml create mode 100644 src/main/resources/mybatis/worn/WornMaterialUnitMapper.xml diff --git a/src/main/java/com/shzg/worn/config/MqttClientConfig.java b/src/main/java/com/shzg/project/worn/config/MqttClientConfig.java similarity index 97% rename from src/main/java/com/shzg/worn/config/MqttClientConfig.java rename to src/main/java/com/shzg/project/worn/config/MqttClientConfig.java index 92cbb25..f4dc785 100644 --- a/src/main/java/com/shzg/worn/config/MqttClientConfig.java +++ b/src/main/java/com/shzg/project/worn/config/MqttClientConfig.java @@ -1,6 +1,6 @@ -package com.shzg.worn.config;//package com.zg.project.wisdom.config; +package com.shzg.project.worn.config;//package com.zg.project.wisdom.config; -import com.shzg.worn.mqtt.dispatcher.MqttMessageDispatcher; +import com.shzg.project.worn.mqtt.dispatcher.MqttMessageDispatcher; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; diff --git a/src/main/java/com/shzg/worn/config/MqttProperties.java b/src/main/java/com/shzg/project/worn/config/MqttProperties.java similarity index 96% rename from src/main/java/com/shzg/worn/config/MqttProperties.java rename to src/main/java/com/shzg/project/worn/config/MqttProperties.java index 17d4b13..e309410 100644 --- a/src/main/java/com/shzg/worn/config/MqttProperties.java +++ b/src/main/java/com/shzg/project/worn/config/MqttProperties.java @@ -1,4 +1,4 @@ -package com.shzg.worn.config; +package com.shzg.project.worn.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/shzg/worn/config/MqttPublishClient.java b/src/main/java/com/shzg/project/worn/config/MqttPublishClient.java similarity index 98% rename from src/main/java/com/shzg/worn/config/MqttPublishClient.java rename to src/main/java/com/shzg/project/worn/config/MqttPublishClient.java index e002c86..f3ae3af 100644 --- a/src/main/java/com/shzg/worn/config/MqttPublishClient.java +++ b/src/main/java/com/shzg/project/worn/config/MqttPublishClient.java @@ -1,4 +1,4 @@ -package com.shzg.worn.config; +package com.shzg.project.worn.config; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttClient; diff --git a/src/main/java/com/shzg/project/worn/controller/WornMaterialController.java b/src/main/java/com/shzg/project/worn/controller/WornMaterialController.java new file mode 100644 index 0000000..9384bca --- /dev/null +++ b/src/main/java/com/shzg/project/worn/controller/WornMaterialController.java @@ -0,0 +1,104 @@ +package com.shzg.project.worn.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.shzg.framework.aspectj.lang.annotation.Log; +import com.shzg.framework.aspectj.lang.enums.BusinessType; +import com.shzg.project.worn.domain.WornMaterial; +import com.shzg.project.worn.service.IWornMaterialService; +import com.shzg.framework.web.controller.BaseController; +import com.shzg.framework.web.domain.AjaxResult; +import com.shzg.common.utils.poi.ExcelUtil; +import com.shzg.framework.web.page.TableDataInfo; + +/** + * 物料Controller + * + * @author shzg + * @date 2026-03-11 + */ +@RestController +@RequestMapping("/worn/material") +public class WornMaterialController extends BaseController +{ + @Autowired + private IWornMaterialService wornMaterialService; + + /** + * 查询物料列表 + */ + @PreAuthorize("@ss.hasPermi('worn:material:list')") + @GetMapping("/list") + public TableDataInfo list(WornMaterial wornMaterial) + { + startPage(); + List list = wornMaterialService.selectWornMaterialList(wornMaterial); + return getDataTable(list); + } + + /** + * 导出物料列表 + */ + @PreAuthorize("@ss.hasPermi('worn:material:export')") + @Log(title = "物料", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WornMaterial wornMaterial) + { + List list = wornMaterialService.selectWornMaterialList(wornMaterial); + ExcelUtil util = new ExcelUtil(WornMaterial.class); + util.exportExcel(response, list, "物料数据"); + } + + /** + * 获取物料详细信息 + */ + @PreAuthorize("@ss.hasPermi('worn:material:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(wornMaterialService.selectWornMaterialById(id)); + } + + /** + * 新增物料 + */ + @PreAuthorize("@ss.hasPermi('worn:material:add')") + @Log(title = "物料", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WornMaterial wornMaterial) + { + return toAjax(wornMaterialService.insertWornMaterial(wornMaterial)); + } + + /** + * 修改物料 + */ + @PreAuthorize("@ss.hasPermi('worn:material:edit')") + @Log(title = "物料", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WornMaterial wornMaterial) + { + return toAjax(wornMaterialService.updateWornMaterial(wornMaterial)); + } + + /** + * 删除物料 + */ + @PreAuthorize("@ss.hasPermi('worn:material:remove')") + @Log(title = "物料", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(wornMaterialService.deleteWornMaterialByIds(ids)); + } +} diff --git a/src/main/java/com/shzg/project/worn/controller/WornMaterialTypeController.java b/src/main/java/com/shzg/project/worn/controller/WornMaterialTypeController.java new file mode 100644 index 0000000..c363bd7 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/controller/WornMaterialTypeController.java @@ -0,0 +1,104 @@ +package com.shzg.project.worn.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.shzg.framework.aspectj.lang.annotation.Log; +import com.shzg.framework.aspectj.lang.enums.BusinessType; +import com.shzg.project.worn.domain.WornMaterialType; +import com.shzg.project.worn.service.IWornMaterialTypeService; +import com.shzg.framework.web.controller.BaseController; +import com.shzg.framework.web.domain.AjaxResult; +import com.shzg.common.utils.poi.ExcelUtil; +import com.shzg.framework.web.page.TableDataInfo; + +/** + * 废旧系统物料类型（支持父子级树结构）Controller + * + * @author shzg + * @date 2026-03-11 + */ +@RestController +@RequestMapping("/worn/type") +public class WornMaterialTypeController extends BaseController +{ + @Autowired + private IWornMaterialTypeService wornMaterialTypeService; + + /** + * 查询废旧系统物料类型（支持父子级树结构）列表 + */ + @PreAuthorize("@ss.hasPermi('worn:type:list')") + @GetMapping("/list") + public TableDataInfo list(WornMaterialType wornMaterialType) + { + startPage(); + List list = wornMaterialTypeService.selectWornMaterialTypeList(wornMaterialType); + return getDataTable(list); + } + + /** + * 导出废旧系统物料类型（支持父子级树结构）列表 + */ + @PreAuthorize("@ss.hasPermi('worn:type:export')") + @Log(title = "废旧系统物料类型（支持父子级树结构）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WornMaterialType wornMaterialType) + { + List list = wornMaterialTypeService.selectWornMaterialTypeList(wornMaterialType); + ExcelUtil util = new ExcelUtil(WornMaterialType.class); + util.exportExcel(response, list, "废旧系统物料类型（支持父子级树结构）数据"); + } + + /** + * 获取废旧系统物料类型（支持父子级树结构）详细信息 + */ + @PreAuthorize("@ss.hasPermi('worn:type:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(wornMaterialTypeService.selectWornMaterialTypeById(id)); + } + + /** + * 新增废旧系统物料类型（支持父子级树结构） + */ + @PreAuthorize("@ss.hasPermi('worn:type:add')") + @Log(title = "废旧系统物料类型（支持父子级树结构）", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WornMaterialType wornMaterialType) + { + return toAjax(wornMaterialTypeService.insertWornMaterialType(wornMaterialType)); + } + + /** + * 修改废旧系统物料类型（支持父子级树结构） + */ + @PreAuthorize("@ss.hasPermi('worn:type:edit')") + @Log(title = "废旧系统物料类型（支持父子级树结构）", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WornMaterialType wornMaterialType) + { + return toAjax(wornMaterialTypeService.updateWornMaterialType(wornMaterialType)); + } + + /** + * 删除废旧系统物料类型（支持父子级树结构） + */ + @PreAuthorize("@ss.hasPermi('worn:type:remove')") + @Log(title = "废旧系统物料类型（支持父子级树结构）", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(wornMaterialTypeService.deleteWornMaterialTypeByIds(ids)); + } +} diff --git a/src/main/java/com/shzg/project/worn/controller/WornMaterialUnitController.java b/src/main/java/com/shzg/project/worn/controller/WornMaterialUnitController.java new file mode 100644 index 0000000..8530134 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/controller/WornMaterialUnitController.java @@ -0,0 +1,104 @@ +package com.shzg.project.worn.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.shzg.framework.aspectj.lang.annotation.Log; +import com.shzg.framework.aspectj.lang.enums.BusinessType; +import com.shzg.project.worn.domain.WornMaterialUnit; +import com.shzg.project.worn.service.IWornMaterialUnitService; +import com.shzg.framework.web.controller.BaseController; +import com.shzg.framework.web.domain.AjaxResult; +import com.shzg.common.utils.poi.ExcelUtil; +import com.shzg.framework.web.page.TableDataInfo; + +/** + * 物料单位Controller + * + * @author shzg + * @date 2026-03-11 + */ +@RestController +@RequestMapping("/worn/unit") +public class WornMaterialUnitController extends BaseController +{ + @Autowired + private IWornMaterialUnitService wornMaterialUnitService; + + /** + * 查询物料单位列表 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:list')") + @GetMapping("/list") + public TableDataInfo list(WornMaterialUnit wornMaterialUnit) + { + startPage(); + List list = wornMaterialUnitService.selectWornMaterialUnitList(wornMaterialUnit); + return getDataTable(list); + } + + /** + * 导出物料单位列表 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:export')") + @Log(title = "物料单位", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WornMaterialUnit wornMaterialUnit) + { + List list = wornMaterialUnitService.selectWornMaterialUnitList(wornMaterialUnit); + ExcelUtil util = new ExcelUtil(WornMaterialUnit.class); + util.exportExcel(response, list, "物料单位数据"); + } + + /** + * 获取物料单位详细信息 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(wornMaterialUnitService.selectWornMaterialUnitById(id)); + } + + /** + * 新增物料单位 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:add')") + @Log(title = "物料单位", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WornMaterialUnit wornMaterialUnit) + { + return toAjax(wornMaterialUnitService.insertWornMaterialUnit(wornMaterialUnit)); + } + + /** + * 修改物料单位 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:edit')") + @Log(title = "物料单位", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WornMaterialUnit wornMaterialUnit) + { + return toAjax(wornMaterialUnitService.updateWornMaterialUnit(wornMaterialUnit)); + } + + /** + * 删除物料单位 + */ + @PreAuthorize("@ss.hasPermi('worn:unit:remove')") + @Log(title = "物料单位", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(wornMaterialUnitService.deleteWornMaterialUnitByIds(ids)); + } +} diff --git a/src/main/java/com/shzg/project/worn/domain/WornMaterial.java b/src/main/java/com/shzg/project/worn/domain/WornMaterial.java new file mode 100644 index 0000000..13036a6 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/domain/WornMaterial.java @@ -0,0 +1,268 @@ +package com.shzg.project.worn.domain; + +import java.math.BigDecimal; + +import com.shzg.framework.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.shzg.framework.aspectj.lang.annotation.Excel; + +/** + * 物料对象 worn_material + * + * @author shzg + * @date 2026-03-11 + */ +public class WornMaterial extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料简称 */ + @Excel(name = "物料简称") + private String materialShortName; + + /** 物料编码 */ + @Excel(name = "物料编码") + private String materialCode; + + /** 物料类型ID */ + @Excel(name = "物料类型ID") + private Long typeId; + + /** 物料单位ID */ + @Excel(name = "物料单位ID") + private Long unitId; + + /** 物料类别 */ + @Excel(name = "物料类别") + private String materialCategory; + + /** 公斤转换系数 */ + @Excel(name = "公斤转换系数") + private BigDecimal kgFactor; + + /** 规格 */ + @Excel(name = "规格") + private String specification; + + /** 型号 */ + @Excel(name = "型号") + private String model; + + /** 条形码 */ + @Excel(name = "条形码") + private String barcode; + + /** 单件重量(kg) */ + @Excel(name = "单件重量(kg)") + private BigDecimal weight; + + /** 描述 */ + @Excel(name = "描述") + private String description; + + /** 排序 */ + @Excel(name = "排序") + private Long orderNum; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 逻辑删除（0正常 1删除） */ + @Excel(name = "逻辑删除", readConverterExp = "0=正常,1=删除") + private String isDelete; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + + public void setMaterialShortName(String materialShortName) + { + this.materialShortName = materialShortName; + } + + public String getMaterialShortName() + { + return materialShortName; + } + + public void setMaterialCode(String materialCode) + { + this.materialCode = materialCode; + } + + public String getMaterialCode() + { + return materialCode; + } + + public void setTypeId(Long typeId) + { + this.typeId = typeId; + } + + public Long getTypeId() + { + return typeId; + } + + public void setUnitId(Long unitId) + { + this.unitId = unitId; + } + + public Long getUnitId() + { + return unitId; + } + + public void setMaterialCategory(String materialCategory) + { + this.materialCategory = materialCategory; + } + + public String getMaterialCategory() + { + return materialCategory; + } + + public void setKgFactor(BigDecimal kgFactor) + { + this.kgFactor = kgFactor; + } + + public BigDecimal getKgFactor() + { + return kgFactor; + } + + public void setSpecification(String specification) + { + this.specification = specification; + } + + public String getSpecification() + { + return specification; + } + + public void setModel(String model) + { + this.model = model; + } + + public String getModel() + { + return model; + } + + public void setBarcode(String barcode) + { + this.barcode = barcode; + } + + public String getBarcode() + { + return barcode; + } + + public void setWeight(BigDecimal weight) + { + this.weight = weight; + } + + public BigDecimal getWeight() + { + return weight; + } + + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + + public void setOrderNum(Long orderNum) + { + this.orderNum = orderNum; + } + + public Long getOrderNum() + { + return orderNum; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setIsDelete(String isDelete) + { + this.isDelete = isDelete; + } + + public String getIsDelete() + { + return isDelete; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("materialName", getMaterialName()) + .append("materialShortName", getMaterialShortName()) + .append("materialCode", getMaterialCode()) + .append("typeId", getTypeId()) + .append("unitId", getUnitId()) + .append("materialCategory", getMaterialCategory()) + .append("kgFactor", getKgFactor()) + .append("specification", getSpecification()) + .append("model", getModel()) + .append("barcode", getBarcode()) + .append("weight", getWeight()) + .append("description", getDescription()) + .append("orderNum", getOrderNum()) + .append("status", getStatus()) + .append("isDelete", getIsDelete()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/src/main/java/com/shzg/project/worn/domain/WornMaterialType.java b/src/main/java/com/shzg/project/worn/domain/WornMaterialType.java new file mode 100644 index 0000000..07fb0f7 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/domain/WornMaterialType.java @@ -0,0 +1,191 @@ +package com.shzg.project.worn.domain; + +import com.shzg.framework.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.shzg.framework.aspectj.lang.annotation.Excel; + +/** + * 废旧系统物料类型（支持父子级树结构）对象 worn_material_type + * + * @author shzg + * @date 2026-03-11 + */ +public class WornMaterialType extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 父级ID */ + @Excel(name = "父级ID") + private Long parentId; + + /** 祖级列表 */ + @Excel(name = "祖级列表") + private String ancestors; + + /** 类型编码 */ + @Excel(name = "类型编码") + private String typeCode; + + /** 类型名称 */ + @Excel(name = "类型名称") + private String typeName; + + /** 首字母代码 */ + @Excel(name = "首字母代码") + private String firstLetter; + + /** 描述 */ + @Excel(name = "描述") + private String description; + + /** 层级 */ + @Excel(name = "层级") + private Long level; + + /** 显示排序 */ + @Excel(name = "显示排序") + private Long orderNum; + + /** 状态(0正常1停用) */ + @Excel(name = "状态(0正常1停用)") + private String status; + + /** 逻辑删除 */ + @Excel(name = "逻辑删除") + private String isDelete; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setParentId(Long parentId) + { + this.parentId = parentId; + } + + public Long getParentId() + { + return parentId; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } + + public String getAncestors() + { + return ancestors; + } + + public void setTypeCode(String typeCode) + { + this.typeCode = typeCode; + } + + public String getTypeCode() + { + return typeCode; + } + + public void setTypeName(String typeName) + { + this.typeName = typeName; + } + + public String getTypeName() + { + return typeName; + } + + public void setFirstLetter(String firstLetter) + { + this.firstLetter = firstLetter; + } + + public String getFirstLetter() + { + return firstLetter; + } + + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + + public void setLevel(Long level) + { + this.level = level; + } + + public Long getLevel() + { + return level; + } + + public void setOrderNum(Long orderNum) + { + this.orderNum = orderNum; + } + + public Long getOrderNum() + { + return orderNum; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setIsDelete(String isDelete) + { + this.isDelete = isDelete; + } + + public String getIsDelete() + { + return isDelete; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("parentId", getParentId()) + .append("ancestors", getAncestors()) + .append("typeCode", getTypeCode()) + .append("typeName", getTypeName()) + .append("firstLetter", getFirstLetter()) + .append("description", getDescription()) + .append("level", getLevel()) + .append("orderNum", getOrderNum()) + .append("status", getStatus()) + .append("isDelete", getIsDelete()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/src/main/java/com/shzg/project/worn/domain/WornMaterialUnit.java b/src/main/java/com/shzg/project/worn/domain/WornMaterialUnit.java new file mode 100644 index 0000000..0496a49 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/domain/WornMaterialUnit.java @@ -0,0 +1,116 @@ +package com.shzg.project.worn.domain; + +import com.shzg.framework.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.shzg.framework.aspectj.lang.annotation.Excel; + +/** + * 物料单位对象 worn_material_unit + * + * @author shzg + * @date 2026-03-11 + */ +public class WornMaterialUnit extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 单位名称 */ + @Excel(name = "单位名称") + private String unitName; + + /** 描述信息 */ + @Excel(name = "描述信息") + private String description; + + /** 显示排序 */ + @Excel(name = "显示排序") + private Long orderNum; + + /** 状态（0正常 1停用） */ + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 逻辑删除（0正常 1删除） */ + @Excel(name = "逻辑删除", readConverterExp = "0=正常,1=删除") + private String isDelete; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setUnitName(String unitName) + { + this.unitName = unitName; + } + + public String getUnitName() + { + return unitName; + } + + public void setDescription(String description) + { + this.description = description; + } + + public String getDescription() + { + return description; + } + + public void setOrderNum(Long orderNum) + { + this.orderNum = orderNum; + } + + public Long getOrderNum() + { + return orderNum; + } + + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + + public void setIsDelete(String isDelete) + { + this.isDelete = isDelete; + } + + public String getIsDelete() + { + return isDelete; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("unitName", getUnitName()) + .append("description", getDescription()) + .append("orderNum", getOrderNum()) + .append("status", getStatus()) + .append("isDelete", getIsDelete()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/src/main/java/com/shzg/project/worn/mapper/WornMaterialMapper.java b/src/main/java/com/shzg/project/worn/mapper/WornMaterialMapper.java new file mode 100644 index 0000000..1b335db --- /dev/null +++ b/src/main/java/com/shzg/project/worn/mapper/WornMaterialMapper.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.mapper; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterial; + +/** + * 物料Mapper接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface WornMaterialMapper +{ + /** + * 查询物料 + * + * @param id 物料主键 + * @return 物料 + */ + public WornMaterial selectWornMaterialById(Long id); + + /** + * 查询物料列表 + * + * @param wornMaterial 物料 + * @return 物料集合 + */ + public List selectWornMaterialList(WornMaterial wornMaterial); + + /** + * 新增物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + public int insertWornMaterial(WornMaterial wornMaterial); + + /** + * 修改物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + public int updateWornMaterial(WornMaterial wornMaterial); + + /** + * 删除物料 + * + * @param id 物料主键 + * @return 结果 + */ + public int deleteWornMaterialById(Long id); + + /** + * 批量删除物料 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWornMaterialByIds(Long[] ids); +} diff --git a/src/main/java/com/shzg/project/worn/mapper/WornMaterialTypeMapper.java b/src/main/java/com/shzg/project/worn/mapper/WornMaterialTypeMapper.java new file mode 100644 index 0000000..6b7e99a --- /dev/null +++ b/src/main/java/com/shzg/project/worn/mapper/WornMaterialTypeMapper.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.mapper; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterialType; + +/** + * 废旧系统物料类型（支持父子级树结构）Mapper接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface WornMaterialTypeMapper +{ + /** + * 查询废旧系统物料类型（支持父子级树结构） + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 废旧系统物料类型（支持父子级树结构） + */ + public WornMaterialType selectWornMaterialTypeById(Long id); + + /** + * 查询废旧系统物料类型（支持父子级树结构）列表 + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 废旧系统物料类型（支持父子级树结构）集合 + */ + public List selectWornMaterialTypeList(WornMaterialType wornMaterialType); + + /** + * 新增废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + public int insertWornMaterialType(WornMaterialType wornMaterialType); + + /** + * 修改废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + public int updateWornMaterialType(WornMaterialType wornMaterialType); + + /** + * 删除废旧系统物料类型（支持父子级树结构） + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 结果 + */ + public int deleteWornMaterialTypeById(Long id); + + /** + * 批量删除废旧系统物料类型（支持父子级树结构） + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWornMaterialTypeByIds(Long[] ids); +} diff --git a/src/main/java/com/shzg/project/worn/mapper/WornMaterialUnitMapper.java b/src/main/java/com/shzg/project/worn/mapper/WornMaterialUnitMapper.java new file mode 100644 index 0000000..26ce091 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/mapper/WornMaterialUnitMapper.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.mapper; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterialUnit; + +/** + * 物料单位Mapper接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface WornMaterialUnitMapper +{ + /** + * 查询物料单位 + * + * @param id 物料单位主键 + * @return 物料单位 + */ + public WornMaterialUnit selectWornMaterialUnitById(Long id); + + /** + * 查询物料单位列表 + * + * @param wornMaterialUnit 物料单位 + * @return 物料单位集合 + */ + public List selectWornMaterialUnitList(WornMaterialUnit wornMaterialUnit); + + /** + * 新增物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + public int insertWornMaterialUnit(WornMaterialUnit wornMaterialUnit); + + /** + * 修改物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + public int updateWornMaterialUnit(WornMaterialUnit wornMaterialUnit); + + /** + * 删除物料单位 + * + * @param id 物料单位主键 + * @return 结果 + */ + public int deleteWornMaterialUnitById(Long id); + + /** + * 批量删除物料单位 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWornMaterialUnitByIds(Long[] ids); +} diff --git a/src/main/java/com/shzg/worn/mqtt/dispatcher/MqttMessageDispatcher.java b/src/main/java/com/shzg/project/worn/mqtt/dispatcher/MqttMessageDispatcher.java similarity index 86% rename from src/main/java/com/shzg/worn/mqtt/dispatcher/MqttMessageDispatcher.java rename to src/main/java/com/shzg/project/worn/mqtt/dispatcher/MqttMessageDispatcher.java index dcb2dd6..5867d99 100644 --- a/src/main/java/com/shzg/worn/mqtt/dispatcher/MqttMessageDispatcher.java +++ b/src/main/java/com/shzg/project/worn/mqtt/dispatcher/MqttMessageDispatcher.java @@ -1,8 +1,8 @@ -package com.shzg.worn.mqtt.dispatcher; +package com.shzg.project.worn.mqtt.dispatcher; -import com.shzg.worn.mqtt.handler.HumiSensorHandler; -import com.shzg.worn.mqtt.handler.SmokeSensorHandler; -import com.shzg.worn.mqtt.handler.TempSensorHandler; +import com.shzg.project.worn.mqtt.handler.HumiSensorHandler; +import com.shzg.project.worn.mqtt.handler.SmokeSensorHandler; +import com.shzg.project.worn.mqtt.handler.TempSensorHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/shzg/worn/mqtt/handler/HumiSensorHandler.java b/src/main/java/com/shzg/project/worn/mqtt/handler/HumiSensorHandler.java similarity index 96% rename from src/main/java/com/shzg/worn/mqtt/handler/HumiSensorHandler.java rename to src/main/java/com/shzg/project/worn/mqtt/handler/HumiSensorHandler.java index 59f66c6..1b9baa1 100644 --- a/src/main/java/com/shzg/worn/mqtt/handler/HumiSensorHandler.java +++ b/src/main/java/com/shzg/project/worn/mqtt/handler/HumiSensorHandler.java @@ -1,4 +1,4 @@ -package com.shzg.worn.mqtt.handler; +package com.shzg.project.worn.mqtt.handler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/shzg/worn/mqtt/handler/SmokeSensorHandler.java b/src/main/java/com/shzg/project/worn/mqtt/handler/SmokeSensorHandler.java similarity index 96% rename from src/main/java/com/shzg/worn/mqtt/handler/SmokeSensorHandler.java rename to src/main/java/com/shzg/project/worn/mqtt/handler/SmokeSensorHandler.java index 4e37d4c..bc6daaf 100644 --- a/src/main/java/com/shzg/worn/mqtt/handler/SmokeSensorHandler.java +++ b/src/main/java/com/shzg/project/worn/mqtt/handler/SmokeSensorHandler.java @@ -1,4 +1,4 @@ -package com.shzg.worn.mqtt.handler; +package com.shzg.project.worn.mqtt.handler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/shzg/worn/mqtt/handler/TempSensorHandler.java b/src/main/java/com/shzg/project/worn/mqtt/handler/TempSensorHandler.java similarity index 96% rename from src/main/java/com/shzg/worn/mqtt/handler/TempSensorHandler.java rename to src/main/java/com/shzg/project/worn/mqtt/handler/TempSensorHandler.java index ea01589..c8c1b84 100644 --- a/src/main/java/com/shzg/worn/mqtt/handler/TempSensorHandler.java +++ b/src/main/java/com/shzg/project/worn/mqtt/handler/TempSensorHandler.java @@ -1,4 +1,4 @@ -package com.shzg.worn.mqtt.handler; +package com.shzg.project.worn.mqtt.handler; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/shzg/project/worn/service/IWornMaterialService.java b/src/main/java/com/shzg/project/worn/service/IWornMaterialService.java new file mode 100644 index 0000000..40ba3c4 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/IWornMaterialService.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.service; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterial; + +/** + * 物料Service接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface IWornMaterialService +{ + /** + * 查询物料 + * + * @param id 物料主键 + * @return 物料 + */ + public WornMaterial selectWornMaterialById(Long id); + + /** + * 查询物料列表 + * + * @param wornMaterial 物料 + * @return 物料集合 + */ + public List selectWornMaterialList(WornMaterial wornMaterial); + + /** + * 新增物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + public int insertWornMaterial(WornMaterial wornMaterial); + + /** + * 修改物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + public int updateWornMaterial(WornMaterial wornMaterial); + + /** + * 批量删除物料 + * + * @param ids 需要删除的物料主键集合 + * @return 结果 + */ + public int deleteWornMaterialByIds(Long[] ids); + + /** + * 删除物料信息 + * + * @param id 物料主键 + * @return 结果 + */ + public int deleteWornMaterialById(Long id); +} diff --git a/src/main/java/com/shzg/project/worn/service/IWornMaterialTypeService.java b/src/main/java/com/shzg/project/worn/service/IWornMaterialTypeService.java new file mode 100644 index 0000000..39a561e --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/IWornMaterialTypeService.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.service; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterialType; + +/** + * 废旧系统物料类型（支持父子级树结构）Service接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface IWornMaterialTypeService +{ + /** + * 查询废旧系统物料类型（支持父子级树结构） + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 废旧系统物料类型（支持父子级树结构） + */ + public WornMaterialType selectWornMaterialTypeById(Long id); + + /** + * 查询废旧系统物料类型（支持父子级树结构）列表 + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 废旧系统物料类型（支持父子级树结构）集合 + */ + public List selectWornMaterialTypeList(WornMaterialType wornMaterialType); + + /** + * 新增废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + public int insertWornMaterialType(WornMaterialType wornMaterialType); + + /** + * 修改废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + public int updateWornMaterialType(WornMaterialType wornMaterialType); + + /** + * 批量删除废旧系统物料类型（支持父子级树结构） + * + * @param ids 需要删除的废旧系统物料类型（支持父子级树结构）主键集合 + * @return 结果 + */ + public int deleteWornMaterialTypeByIds(Long[] ids); + + /** + * 删除废旧系统物料类型（支持父子级树结构）信息 + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 结果 + */ + public int deleteWornMaterialTypeById(Long id); +} diff --git a/src/main/java/com/shzg/project/worn/service/IWornMaterialUnitService.java b/src/main/java/com/shzg/project/worn/service/IWornMaterialUnitService.java new file mode 100644 index 0000000..9724056 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/IWornMaterialUnitService.java @@ -0,0 +1,61 @@ +package com.shzg.project.worn.service; + +import java.util.List; +import com.shzg.project.worn.domain.WornMaterialUnit; + +/** + * 物料单位Service接口 + * + * @author shzg + * @date 2026-03-11 + */ +public interface IWornMaterialUnitService +{ + /** + * 查询物料单位 + * + * @param id 物料单位主键 + * @return 物料单位 + */ + public WornMaterialUnit selectWornMaterialUnitById(Long id); + + /** + * 查询物料单位列表 + * + * @param wornMaterialUnit 物料单位 + * @return 物料单位集合 + */ + public List selectWornMaterialUnitList(WornMaterialUnit wornMaterialUnit); + + /** + * 新增物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + public int insertWornMaterialUnit(WornMaterialUnit wornMaterialUnit); + + /** + * 修改物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + public int updateWornMaterialUnit(WornMaterialUnit wornMaterialUnit); + + /** + * 批量删除物料单位 + * + * @param ids 需要删除的物料单位主键集合 + * @return 结果 + */ + public int deleteWornMaterialUnitByIds(Long[] ids); + + /** + * 删除物料单位信息 + * + * @param id 物料单位主键 + * @return 结果 + */ + public int deleteWornMaterialUnitById(Long id); +} diff --git a/src/main/java/com/shzg/project/worn/service/impl/WornMaterialServiceImpl.java b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialServiceImpl.java new file mode 100644 index 0000000..74f4ba5 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialServiceImpl.java @@ -0,0 +1,96 @@ +package com.shzg.project.worn.service.impl; + +import java.util.List; +import com.shzg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.shzg.project.worn.mapper.WornMaterialMapper; +import com.shzg.project.worn.domain.WornMaterial; +import com.shzg.project.worn.service.IWornMaterialService; + +/** + * 物料Service业务层处理 + * + * @author shzg + * @date 2026-03-11 + */ +@Service +public class WornMaterialServiceImpl implements IWornMaterialService +{ + @Autowired + private WornMaterialMapper wornMaterialMapper; + + /** + * 查询物料 + * + * @param id 物料主键 + * @return 物料 + */ + @Override + public WornMaterial selectWornMaterialById(Long id) + { + return wornMaterialMapper.selectWornMaterialById(id); + } + + /** + * 查询物料列表 + * + * @param wornMaterial 物料 + * @return 物料 + */ + @Override + public List selectWornMaterialList(WornMaterial wornMaterial) + { + return wornMaterialMapper.selectWornMaterialList(wornMaterial); + } + + /** + * 新增物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + @Override + public int insertWornMaterial(WornMaterial wornMaterial) + { + wornMaterial.setCreateTime(DateUtils.getNowDate()); + return wornMaterialMapper.insertWornMaterial(wornMaterial); + } + + /** + * 修改物料 + * + * @param wornMaterial 物料 + * @return 结果 + */ + @Override + public int updateWornMaterial(WornMaterial wornMaterial) + { + wornMaterial.setUpdateTime(DateUtils.getNowDate()); + return wornMaterialMapper.updateWornMaterial(wornMaterial); + } + + /** + * 批量删除物料 + * + * @param ids 需要删除的物料主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialByIds(Long[] ids) + { + return wornMaterialMapper.deleteWornMaterialByIds(ids); + } + + /** + * 删除物料信息 + * + * @param id 物料主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialById(Long id) + { + return wornMaterialMapper.deleteWornMaterialById(id); + } +} diff --git a/src/main/java/com/shzg/project/worn/service/impl/WornMaterialTypeServiceImpl.java b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialTypeServiceImpl.java new file mode 100644 index 0000000..100488b --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialTypeServiceImpl.java @@ -0,0 +1,96 @@ +package com.shzg.project.worn.service.impl; + +import java.util.List; +import com.shzg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.shzg.project.worn.mapper.WornMaterialTypeMapper; +import com.shzg.project.worn.domain.WornMaterialType; +import com.shzg.project.worn.service.IWornMaterialTypeService; + +/** + * 废旧系统物料类型（支持父子级树结构）Service业务层处理 + * + * @author shzg + * @date 2026-03-11 + */ +@Service +public class WornMaterialTypeServiceImpl implements IWornMaterialTypeService +{ + @Autowired + private WornMaterialTypeMapper wornMaterialTypeMapper; + + /** + * 查询废旧系统物料类型（支持父子级树结构） + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 废旧系统物料类型（支持父子级树结构） + */ + @Override + public WornMaterialType selectWornMaterialTypeById(Long id) + { + return wornMaterialTypeMapper.selectWornMaterialTypeById(id); + } + + /** + * 查询废旧系统物料类型（支持父子级树结构）列表 + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 废旧系统物料类型（支持父子级树结构） + */ + @Override + public List selectWornMaterialTypeList(WornMaterialType wornMaterialType) + { + return wornMaterialTypeMapper.selectWornMaterialTypeList(wornMaterialType); + } + + /** + * 新增废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + @Override + public int insertWornMaterialType(WornMaterialType wornMaterialType) + { + wornMaterialType.setCreateTime(DateUtils.getNowDate()); + return wornMaterialTypeMapper.insertWornMaterialType(wornMaterialType); + } + + /** + * 修改废旧系统物料类型（支持父子级树结构） + * + * @param wornMaterialType 废旧系统物料类型（支持父子级树结构） + * @return 结果 + */ + @Override + public int updateWornMaterialType(WornMaterialType wornMaterialType) + { + wornMaterialType.setUpdateTime(DateUtils.getNowDate()); + return wornMaterialTypeMapper.updateWornMaterialType(wornMaterialType); + } + + /** + * 批量删除废旧系统物料类型（支持父子级树结构） + * + * @param ids 需要删除的废旧系统物料类型（支持父子级树结构）主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialTypeByIds(Long[] ids) + { + return wornMaterialTypeMapper.deleteWornMaterialTypeByIds(ids); + } + + /** + * 删除废旧系统物料类型（支持父子级树结构）信息 + * + * @param id 废旧系统物料类型（支持父子级树结构）主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialTypeById(Long id) + { + return wornMaterialTypeMapper.deleteWornMaterialTypeById(id); + } +} diff --git a/src/main/java/com/shzg/project/worn/service/impl/WornMaterialUnitServiceImpl.java b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialUnitServiceImpl.java new file mode 100644 index 0000000..05d0021 --- /dev/null +++ b/src/main/java/com/shzg/project/worn/service/impl/WornMaterialUnitServiceImpl.java @@ -0,0 +1,96 @@ +package com.shzg.project.worn.service.impl; + +import java.util.List; +import com.shzg.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.shzg.project.worn.mapper.WornMaterialUnitMapper; +import com.shzg.project.worn.domain.WornMaterialUnit; +import com.shzg.project.worn.service.IWornMaterialUnitService; + +/** + * 物料单位Service业务层处理 + * + * @author shzg + * @date 2026-03-11 + */ +@Service +public class WornMaterialUnitServiceImpl implements IWornMaterialUnitService +{ + @Autowired + private WornMaterialUnitMapper wornMaterialUnitMapper; + + /** + * 查询物料单位 + * + * @param id 物料单位主键 + * @return 物料单位 + */ + @Override + public WornMaterialUnit selectWornMaterialUnitById(Long id) + { + return wornMaterialUnitMapper.selectWornMaterialUnitById(id); + } + + /** + * 查询物料单位列表 + * + * @param wornMaterialUnit 物料单位 + * @return 物料单位 + */ + @Override + public List selectWornMaterialUnitList(WornMaterialUnit wornMaterialUnit) + { + return wornMaterialUnitMapper.selectWornMaterialUnitList(wornMaterialUnit); + } + + /** + * 新增物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + @Override + public int insertWornMaterialUnit(WornMaterialUnit wornMaterialUnit) + { + wornMaterialUnit.setCreateTime(DateUtils.getNowDate()); + return wornMaterialUnitMapper.insertWornMaterialUnit(wornMaterialUnit); + } + + /** + * 修改物料单位 + * + * @param wornMaterialUnit 物料单位 + * @return 结果 + */ + @Override + public int updateWornMaterialUnit(WornMaterialUnit wornMaterialUnit) + { + wornMaterialUnit.setUpdateTime(DateUtils.getNowDate()); + return wornMaterialUnitMapper.updateWornMaterialUnit(wornMaterialUnit); + } + + /** + * 批量删除物料单位 + * + * @param ids 需要删除的物料单位主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialUnitByIds(Long[] ids) + { + return wornMaterialUnitMapper.deleteWornMaterialUnitByIds(ids); + } + + /** + * 删除物料单位信息 + * + * @param id 物料单位主键 + * @return 结果 + */ + @Override + public int deleteWornMaterialUnitById(Long id) + { + return wornMaterialUnitMapper.deleteWornMaterialUnitById(id); + } +} diff --git a/src/main/resources/mybatis/worn/WornMaterialMapper.xml b/src/main/resources/mybatis/worn/WornMaterialMapper.xml new file mode 100644 index 0000000..86c7f8e --- /dev/null +++ b/src/main/resources/mybatis/worn/WornMaterialMapper.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, material_name, material_short_name, material_code, type_id, unit_id, material_category, kg_factor, specification, model, barcode, weight, description, order_num, status, is_delete, create_by, create_time, update_by, update_time from worn_material + + + + + + + + insert into worn_material + + material_name, + material_short_name, + material_code, + type_id, + unit_id, + material_category, + kg_factor, + specification, + model, + barcode, + weight, + description, + order_num, + status, + is_delete, + create_by, + create_time, + update_by, + update_time, + + + #{materialName}, + #{materialShortName}, + #{materialCode}, + #{typeId}, + #{unitId}, + #{materialCategory}, + #{kgFactor}, + #{specification}, + #{model}, + #{barcode}, + #{weight}, + #{description}, + #{orderNum}, + #{status}, + #{isDelete}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update worn_material + + material_name = #{materialName}, + material_short_name = #{materialShortName}, + material_code = #{materialCode}, + type_id = #{typeId}, + unit_id = #{unitId}, + material_category = #{materialCategory}, + kg_factor = #{kgFactor}, + specification = #{specification}, + model = #{model}, + barcode = #{barcode}, + weight = #{weight}, + description = #{description}, + order_num = #{orderNum}, + status = #{status}, + is_delete = #{isDelete}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from worn_material where id = #{id} + + + + delete from worn_material where id in + + #{id} + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/worn/WornMaterialTypeMapper.xml b/src/main/resources/mybatis/worn/WornMaterialTypeMapper.xml new file mode 100644 index 0000000..f63f91c --- /dev/null +++ b/src/main/resources/mybatis/worn/WornMaterialTypeMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, parent_id, ancestors, type_code, type_name, first_letter, description, level, order_num, status, is_delete, create_by, create_time, update_by, update_time from worn_material_type + + + + + + + + insert into worn_material_type + + parent_id, + ancestors, + type_code, + type_name, + first_letter, + description, + level, + order_num, + status, + is_delete, + create_by, + create_time, + update_by, + update_time, + + + #{parentId}, + #{ancestors}, + #{typeCode}, + #{typeName}, + #{firstLetter}, + #{description}, + #{level}, + #{orderNum}, + #{status}, + #{isDelete}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update worn_material_type + + parent_id = #{parentId}, + ancestors = #{ancestors}, + type_code = #{typeCode}, + type_name = #{typeName}, + first_letter = #{firstLetter}, + description = #{description}, + level = #{level}, + order_num = #{orderNum}, + status = #{status}, + is_delete = #{isDelete}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from worn_material_type where id = #{id} + + + + delete from worn_material_type where id in + + #{id} + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/worn/WornMaterialUnitMapper.xml b/src/main/resources/mybatis/worn/WornMaterialUnitMapper.xml new file mode 100644 index 0000000..6c85cd0 --- /dev/null +++ b/src/main/resources/mybatis/worn/WornMaterialUnitMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select id, unit_name, description, order_num, status, is_delete, create_by, create_time, update_by, update_time from worn_material_unit + + + + + + + + insert into worn_material_unit + + unit_name, + description, + order_num, + status, + is_delete, + create_by, + create_time, + update_by, + update_time, + + + #{unitName}, + #{description}, + #{orderNum}, + #{status}, + #{isDelete}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update worn_material_unit + + unit_name = #{unitName}, + description = #{description}, + order_num = #{orderNum}, + status = #{status}, + is_delete = #{isDelete}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from worn_material_unit where id = #{id} + + + + delete from worn_material_unit where id in + + #{id} + + + \ No newline at end of file