From ddb9a98d5b5d3c5393baf963762a9a928d1c0710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E9=9B=AA=E4=BC=9F?= Date: Mon, 25 Nov 2024 16:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesProductionQualifiedController.java | 94 ++++++++++++ .../hw/mes/domain/MesProductionQualified.java | 103 +++++++++++++ .../mes/mapper/MesProductionQualifiedDao.java | 86 +++++++++++ .../MesProductionQualifiedService.java | 59 ++++++++ .../MesProductionQualifiedServiceImpl.java | 86 +++++++++++ .../mes/MesProductionQualifiedMapper.xml | 139 ++++++++++++++++++ 6 files changed, 567 insertions(+) create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionQualifiedController.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductionQualified.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/MesProductionQualifiedService.java create mode 100644 hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductionQualifiedServiceImpl.java create mode 100644 hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionQualifiedController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionQualifiedController.java new file mode 100644 index 00000000..616c027f --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductionQualifiedController.java @@ -0,0 +1,94 @@ +package com.hw.mes.controller; + +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.web.page.TableDataInfo; +import com.hw.mes.domain.MesProductionQualified; +import com.hw.mes.service.MesProductionQualifiedService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * 生产合格情况(MesProductionQualified)表控制层 + * + * @author makejava + * @since 2024-11-25 11:14:21 + */ +@RestController +@RequestMapping("mesProductionQualified") +public class MesProductionQualifiedController extends BaseController { + /** + * 服务对象 + */ + @Resource + private MesProductionQualifiedService mesProductionQualifiedService; + + /** + * 分页查询 + * + * @param mesProductionQualified 筛选条件 + * @param + * @return 查询结果 + */ + @GetMapping + public TableDataInfo queryByPage(MesProductionQualified mesProductionQualified) { + startPage(); + List list = mesProductionQualifiedService.selectMesProductionQualifiedList(mesProductionQualified); + return getDataTable(list); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{qualifiedId}") + public ResponseEntity queryById(@PathVariable("qualifiedId") Long id) { + return ResponseEntity.ok(this.mesProductionQualifiedService.queryById(id)); + } + + /** + * 新增数据 + * + * @param mesProductionQualified 实体 + * @return 新增结果 + */ + @PostMapping + public ResponseEntity add(@RequestBody MesProductionQualified mesProductionQualified) { + mesProductionQualified.setCreateTime(new Date()); + mesProductionQualified.setCreateBy(mesProductionQualified.getName()); + return ResponseEntity.ok(this.mesProductionQualifiedService.insert(mesProductionQualified)); + } + + /** + * 编辑数据 + * + * @param mesProductionQualified 实体 + * @return 编辑结果 + */ + @PutMapping + public ResponseEntity edit(@RequestBody MesProductionQualified mesProductionQualified) { + mesProductionQualified.setUpdateBy(mesProductionQualified.getName()); + return ResponseEntity.ok(this.mesProductionQualifiedService.update(mesProductionQualified)); + } + + /** + * 删除数据 + * + * @param id 主键 + * @return 删除是否成功 + */ + @DeleteMapping + public ResponseEntity deleteById(Long id) { + return ResponseEntity.ok(this.mesProductionQualifiedService.deleteById(id)); + } + +} + diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductionQualified.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductionQualified.java new file mode 100644 index 00000000..8a8cf287 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesProductionQualified.java @@ -0,0 +1,103 @@ +package com.hw.mes.domain; + +import com.hw.common.core.web.domain.BaseEntity; + +import java.io.Serializable; +import java.util.Date; + +/** + * 生产合格情况(MesProductionQualified)实体类 + * + * @author makejava + * @since 2024-11-25 11:14:22 + */ +public class MesProductionQualified implements Serializable { + private static final long serialVersionUID = 552085890413243010L; + /** + * 主键标识;此表不会长期保存 + */ + private Long qualifiedId; + /** + * 生产者姓名 + */ + private String name; + /** + * 合格率 + */ + private String passRate; + /** + * 创建人 + */ + private String createBy; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; + + + public Long getQualifiedId() { + return qualifiedId; + } + + public void setQualifiedId(Long qualifiedId) { + this.qualifiedId = qualifiedId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPassRate() { + return passRate; + } + + public void setPassRate(String passRate) { + this.passRate = passRate; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + +} + diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java new file mode 100644 index 00000000..07e15ee0 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesProductionQualifiedDao.java @@ -0,0 +1,86 @@ +package com.hw.mes.mapper; + +import com.hw.mes.domain.MesProductionQualified; +import org.apache.ibatis.annotations.Param; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +/** + * 生产合格情况(MesProductionQualified)表数据库访问层 + * + * @author makejava + * @since 2024-11-25 11:14:21 + */ +public interface MesProductionQualifiedDao { + + /** + * 通过ID查询单条数据 + * + * @param qualifiedId 主键 + * @return 实例对象 + */ + + /** + * 查询指定行数据 + * + * @param mesProductionQualified 查询条件 + * @param pageable 分页对象 + * @return 对象列表 + */ + List queryAllByLimit(MesProductionQualified mesProductionQualified, @Param("pageable") Pageable pageable); + + /** + * 统计总行数 + * + * @param mesProductionQualified 查询条件 + * @return 总行数 + */ + long count(MesProductionQualified mesProductionQualified); + + /** + * 新增数据 + * + * @param mesProductionQualified 实例对象 + * @return 影响行数 + */ + int insert(MesProductionQualified mesProductionQualified); + + /** + * 批量新增数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + */ + int insertBatch(@Param("entities") List entities); + + /** + * 批量新增或按主键更新数据（MyBatis原生foreach方法） + * + * @param entities List 实例对象列表 + * @return 影响行数 + * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 + */ + int insertOrUpdateBatch(@Param("entities") List entities); + + /** + * 修改数据 + * + * @param mesProductionQualified 实例对象 + * @return 影响行数 + */ + int update(MesProductionQualified mesProductionQualified); + + /** + * 通过主键删除数据 + * + * @param qualifiedId 主键 + * @return 影响行数 + */ + int deleteById(Long qualifiedId); + + List selectMesProductionQualifiedList(MesProductionQualified mesProductionQualified); + + MesProductionQualified selectMesProductionQualifiedListById(@Param("qualifiedId") Long qualifiedId); +} + diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/MesProductionQualifiedService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/MesProductionQualifiedService.java new file mode 100644 index 00000000..26c65161 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/MesProductionQualifiedService.java @@ -0,0 +1,59 @@ +package com.hw.mes.service; + +import com.hw.mes.domain.MesProductionQualified; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; + +import java.util.List; + +/** + * 生产合格情况(MesProductionQualified)表服务接口 + * + * @author makejava + * @since 2024-11-25 11:14:31 + */ +public interface MesProductionQualifiedService { + + /** + * 通过ID查询单条数据 + * + * @param qualifiedId 主键 + * @return 实例对象 + */ + MesProductionQualified queryById(Long qualifiedId); + + /** + * 分页查询 + * + * @param mesProductionQualified 筛选条件 + * @param pageRequest 分页对象 + * @return 查询结果 + */ + Page queryByPage(MesProductionQualified mesProductionQualified, PageRequest pageRequest); + + /** + * 新增数据 + * + * @param mesProductionQualified 实例对象 + * @return 实例对象 + */ + MesProductionQualified insert(MesProductionQualified mesProductionQualified); + + /** + * 修改数据 + * + * @param mesProductionQualified 实例对象 + * @return 实例对象 + */ + MesProductionQualified update(MesProductionQualified mesProductionQualified); + + /** + * 通过主键删除数据 + * + * @param qualifiedId 主键 + * @return 是否成功 + */ + boolean deleteById(Long qualifiedId); + + List selectMesProductionQualifiedList(MesProductionQualified mesProductionQualified); +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductionQualifiedServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductionQualifiedServiceImpl.java new file mode 100644 index 00000000..92a40d21 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductionQualifiedServiceImpl.java @@ -0,0 +1,86 @@ +package com.hw.mes.service.impl; + +import com.hw.mes.domain.MesProductionQualified; +import com.hw.mes.mapper.MesProductionQualifiedDao; +import com.hw.mes.service.MesProductionQualifiedService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * 生产合格情况(MesProductionQualified)表服务实现类 + * + * @author makejava + * @since 2024-11-25 11:14:31 + */ +@Service("mesProductionQualifiedService") +public class MesProductionQualifiedServiceImpl implements MesProductionQualifiedService { + @Resource + private MesProductionQualifiedDao mesProductionQualifiedDao; + + @Override + public MesProductionQualified queryById(Long qualifiedId) { + return mesProductionQualifiedDao.selectMesProductionQualifiedListById(qualifiedId); + } + + /** + * 通过ID查询单条数据 + * + * @param qualifiedId 主键 + * @return 实例对象 + */ + + + @Override + public Page queryByPage(MesProductionQualified mesProductionQualified, PageRequest pageRequest) { + return null; + } + + + /** + * 新增数据 + * + * @param mesProductionQualified 实例对象 + * @return 实例对象 + */ + @Override + public MesProductionQualified insert(MesProductionQualified mesProductionQualified) { + this.mesProductionQualifiedDao.insert(mesProductionQualified); + return mesProductionQualified; + } + + /** + * 修改数据 + * + * @param mesProductionQualified 实例对象 + * @return 实例对象 + */ + @Override + public MesProductionQualified update(MesProductionQualified mesProductionQualified) { + mesProductionQualified.setUpdateTime(new Date()); + this.mesProductionQualifiedDao.update(mesProductionQualified); + return this.queryById(mesProductionQualified.getQualifiedId()); + } + + @Override + public List selectMesProductionQualifiedList(MesProductionQualified mesProductionQualified) { + return mesProductionQualifiedDao.selectMesProductionQualifiedList(mesProductionQualified); + + } + + /** + * 通过主键删除数据 + * + * @param qualifiedId 主键 + * @return 是否成功 + */ + @Override + public boolean deleteById(Long qualifiedId) { + return this.mesProductionQualifiedDao.deleteById(qualifiedId) > 0; + } +} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml new file mode 100644 index 00000000..54eefa8c --- /dev/null +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductionQualifiedMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select alarm_info_id, alarm_info_type, handle_status, create_by, create_date, update_by, update_date from mes_alarm_info + + + + + + + + + + insert into mes_alarm_info + + alarm_info_type, + handle_status, + create_by, + create_date, + update_by, + update_date, + + + #{alarmInfoType}, + #{handleStatus}, + #{createBy}, + #{createDate}, + #{updateBy}, + #{updateDate}, + + + + + update mes_alarm_info + + alarm_info_type = #{alarmInfoType}, + handle_status = #{handleStatus}, + create_by = #{createBy}, + create_date = #{createDate}, + update_by = #{updateBy}, + update_date = #{updateDate}, + + where alarm_info_id = #{alarmInfoId} + + + update mes_production_qualified + + name = #{name}, + pass_rate = #{passRate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where qualified_id = #{qualifiedId} + + + + delete from mes_alarm_info where alarm_info_id = #{alarmInfoId} + + + + insert into mes_production_qualified + + name, + pass_rate, + create_by, + create_time, + update_by, + update_time, + + + #{name}, + #{passRate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + \ No newline at end of file