diff --git a/os-admin/pom.xml b/os-admin/pom.xml index 73d5148..746ffba 100644 --- a/os-admin/pom.xml +++ b/os-admin/pom.xml @@ -80,6 +80,12 @@ haiwei-ems + + + com.haiwei + haiwei-mes + + diff --git a/os-mes/pom.xml b/os-mes/pom.xml new file mode 100644 index 0000000..2094f82 --- /dev/null +++ b/os-mes/pom.xml @@ -0,0 +1,28 @@ + + + + haiwei + com.haiwei + 3.8.7 + + 4.0.0 + + haiwei-mes + + + MES模块 + + + + + + + com.haiwei + haiwei-common + + + + + \ No newline at end of file diff --git a/os-mes/src/main/java/com/os/mes/base/controller/BaseFactoryController.java b/os-mes/src/main/java/com/os/mes/base/controller/BaseFactoryController.java new file mode 100644 index 0000000..b8cf50b --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/base/controller/BaseFactoryController.java @@ -0,0 +1,106 @@ +package com.os.mes.base.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.os.common.annotation.Log; +import com.os.common.core.controller.BaseController; +import com.os.common.core.domain.AjaxResult; +import com.os.common.enums.BusinessType; +import com.os.mes.base.domain.BaseFactory; +import com.os.mes.base.service.IBaseFactoryService; +import com.os.common.utils.poi.ExcelUtil; +import com.os.common.core.page.TableDataInfo; + +/** + * 工厂管理Controller + * + * @author Yinq + * @date 2024-05-09 + */ +@RestController +@RequestMapping("/mes/base/baseFactory") +public class BaseFactoryController extends BaseController +{ + @Autowired + private IBaseFactoryService baseFactoryService; + + /** + * 查询工厂管理列表 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:list')") + @GetMapping("/list") + public TableDataInfo list(BaseFactory baseFactory) + { + startPage(); + List list = baseFactoryService.selectBaseFactoryList(baseFactory); + return getDataTable(list); + } + + /** + * 导出工厂管理列表 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:export')") + @Log(title = "工厂管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseFactory baseFactory) + { + List list = baseFactoryService.selectBaseFactoryList(baseFactory); + ExcelUtil util = new ExcelUtil(BaseFactory.class); + util.exportExcel(response, list, "工厂管理数据"); + } + + /** + * 获取工厂管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:query')") + @GetMapping(value = "/{objId}") + public AjaxResult getInfo(@PathVariable("objId") Long objId) + { + return success(baseFactoryService.selectBaseFactoryByObjId(objId)); + } + + /** + * 新增工厂管理 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:add')") + @Log(title = "工厂管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseFactory baseFactory) + { + baseFactory.setCreateBy(getUsername()); + return toAjax(baseFactoryService.insertBaseFactory(baseFactory)); + } + + /** + * 修改工厂管理 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:edit')") + @Log(title = "工厂管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseFactory baseFactory) + { + baseFactory.setUpdateBy(getUsername()); + return toAjax(baseFactoryService.updateBaseFactory(baseFactory)); + } + + /** + * 删除工厂管理 + */ + @PreAuthorize("@ss.hasPermi('mes/base:baseFactory:remove')") + @Log(title = "工厂管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public AjaxResult remove(@PathVariable Long[] objIds) + { + return toAjax(baseFactoryService.deleteBaseFactoryByObjIds(objIds)); + } +} diff --git a/os-mes/src/main/java/com/os/mes/base/domain/BaseFactory.java b/os-mes/src/main/java/com/os/mes/base/domain/BaseFactory.java new file mode 100644 index 0000000..a12e9bc --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/base/domain/BaseFactory.java @@ -0,0 +1,154 @@ +package com.os.mes.base.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.os.common.annotation.Excel; +import com.os.common.core.domain.BaseEntity; + +/** + * 工厂管理对象 base_factory + * + * @author Yinq + * @date 2024-05-09 + */ +public class BaseFactory extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long objId; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + /** 工厂编号 */ + @Excel(name = "工厂编号") + private String factoryCode; + + /** 工厂名称 */ + @Excel(name = "工厂名称") + private String factoryName; + + /** 工厂状态（0启用 1停用） */ + @Excel(name = "工厂状态", readConverterExp = "0=启用,1=停用") + private String factoryStatus; + + /** 创建人 */ + @Excel(name = "创建人") + private String createdBy; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; + + /** 更新人 */ + @Excel(name = "更新人") + private String updatedBy; + + /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; + + public void setObjId(Long objId) + { + this.objId = objId; + } + + public Long getObjId() + { + return objId; + } + public void setCompanyName(String companyName) + { + this.companyName = companyName; + } + + public String getCompanyName() + { + return companyName; + } + public void setFactoryCode(String factoryCode) + { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() + { + return factoryCode; + } + public void setFactoryName(String factoryName) + { + this.factoryName = factoryName; + } + + public String getFactoryName() + { + return factoryName; + } + public void setFactoryStatus(String factoryStatus) + { + this.factoryStatus = factoryStatus; + } + + public String getFactoryStatus() + { + return factoryStatus; + } + public void setCreatedBy(String createdBy) + { + this.createdBy = createdBy; + } + + public String getCreatedBy() + { + return createdBy; + } + public void setCreatedTime(Date createdTime) + { + this.createdTime = createdTime; + } + + public Date getCreatedTime() + { + return createdTime; + } + public void setUpdatedBy(String updatedBy) + { + this.updatedBy = updatedBy; + } + + public String getUpdatedBy() + { + return updatedBy; + } + public void setUpdatedTime(Date updatedTime) + { + this.updatedTime = updatedTime; + } + + public Date getUpdatedTime() + { + return updatedTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("objId", getObjId()) + .append("companyName", getCompanyName()) + .append("factoryCode", getFactoryCode()) + .append("factoryName", getFactoryName()) + .append("factoryStatus", getFactoryStatus()) + .append("remark", getRemark()) + .append("createdBy", getCreatedBy()) + .append("createdTime", getCreatedTime()) + .append("updatedBy", getUpdatedBy()) + .append("updatedTime", getUpdatedTime()) + .toString(); + } +} diff --git a/os-mes/src/main/java/com/os/mes/base/mapper/BaseFactoryMapper.java b/os-mes/src/main/java/com/os/mes/base/mapper/BaseFactoryMapper.java new file mode 100644 index 0000000..505a703 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/base/mapper/BaseFactoryMapper.java @@ -0,0 +1,61 @@ +package com.os.mes.base.mapper; + +import java.util.List; +import com.os.mes.base.domain.BaseFactory; + +/** + * 工厂管理Mapper接口 + * + * @author Yinq + * @date 2024-05-09 + */ +public interface BaseFactoryMapper +{ + /** + * 查询工厂管理 + * + * @param objId 工厂管理主键 + * @return 工厂管理 + */ + public BaseFactory selectBaseFactoryByObjId(Long objId); + + /** + * 查询工厂管理列表 + * + * @param baseFactory 工厂管理 + * @return 工厂管理集合 + */ + public List selectBaseFactoryList(BaseFactory baseFactory); + + /** + * 新增工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + public int insertBaseFactory(BaseFactory baseFactory); + + /** + * 修改工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + public int updateBaseFactory(BaseFactory baseFactory); + + /** + * 删除工厂管理 + * + * @param objId 工厂管理主键 + * @return 结果 + */ + public int deleteBaseFactoryByObjId(Long objId); + + /** + * 批量删除工厂管理 + * + * @param objIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseFactoryByObjIds(Long[] objIds); +} diff --git a/os-mes/src/main/java/com/os/mes/base/service/IBaseFactoryService.java b/os-mes/src/main/java/com/os/mes/base/service/IBaseFactoryService.java new file mode 100644 index 0000000..9ec2132 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/base/service/IBaseFactoryService.java @@ -0,0 +1,61 @@ +package com.os.mes.base.service; + +import java.util.List; +import com.os.mes.base.domain.BaseFactory; + +/** + * 工厂管理Service接口 + * + * @author Yinq + * @date 2024-05-09 + */ +public interface IBaseFactoryService +{ + /** + * 查询工厂管理 + * + * @param objId 工厂管理主键 + * @return 工厂管理 + */ + public BaseFactory selectBaseFactoryByObjId(Long objId); + + /** + * 查询工厂管理列表 + * + * @param baseFactory 工厂管理 + * @return 工厂管理集合 + */ + public List selectBaseFactoryList(BaseFactory baseFactory); + + /** + * 新增工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + public int insertBaseFactory(BaseFactory baseFactory); + + /** + * 修改工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + public int updateBaseFactory(BaseFactory baseFactory); + + /** + * 批量删除工厂管理 + * + * @param objIds 需要删除的工厂管理主键集合 + * @return 结果 + */ + public int deleteBaseFactoryByObjIds(Long[] objIds); + + /** + * 删除工厂管理信息 + * + * @param objId 工厂管理主键 + * @return 结果 + */ + public int deleteBaseFactoryByObjId(Long objId); +} diff --git a/os-mes/src/main/java/com/os/mes/base/service/impl/BaseFactoryServiceImpl.java b/os-mes/src/main/java/com/os/mes/base/service/impl/BaseFactoryServiceImpl.java new file mode 100644 index 0000000..d24216e --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/base/service/impl/BaseFactoryServiceImpl.java @@ -0,0 +1,93 @@ +package com.os.mes.base.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.os.mes.base.mapper.BaseFactoryMapper; +import com.os.mes.base.domain.BaseFactory; +import com.os.mes.base.service.IBaseFactoryService; + +/** + * 工厂管理Service业务层处理 + * + * @author Yinq + * @date 2024-05-09 + */ +@Service +public class BaseFactoryServiceImpl implements IBaseFactoryService +{ + @Autowired + private BaseFactoryMapper baseFactoryMapper; + + /** + * 查询工厂管理 + * + * @param objId 工厂管理主键 + * @return 工厂管理 + */ + @Override + public BaseFactory selectBaseFactoryByObjId(Long objId) + { + return baseFactoryMapper.selectBaseFactoryByObjId(objId); + } + + /** + * 查询工厂管理列表 + * + * @param baseFactory 工厂管理 + * @return 工厂管理 + */ + @Override + public List selectBaseFactoryList(BaseFactory baseFactory) + { + return baseFactoryMapper.selectBaseFactoryList(baseFactory); + } + + /** + * 新增工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + @Override + public int insertBaseFactory(BaseFactory baseFactory) + { + return baseFactoryMapper.insertBaseFactory(baseFactory); + } + + /** + * 修改工厂管理 + * + * @param baseFactory 工厂管理 + * @return 结果 + */ + @Override + public int updateBaseFactory(BaseFactory baseFactory) + { + return baseFactoryMapper.updateBaseFactory(baseFactory); + } + + /** + * 批量删除工厂管理 + * + * @param objIds 需要删除的工厂管理主键 + * @return 结果 + */ + @Override + public int deleteBaseFactoryByObjIds(Long[] objIds) + { + return baseFactoryMapper.deleteBaseFactoryByObjIds(objIds); + } + + /** + * 删除工厂管理信息 + * + * @param objId 工厂管理主键 + * @return 结果 + */ + @Override + public int deleteBaseFactoryByObjId(Long objId) + { + return baseFactoryMapper.deleteBaseFactoryByObjId(objId); + } +} diff --git a/os-mes/src/main/resources/mapper/mes/base/BaseFactoryMapper.xml b/os-mes/src/main/resources/mapper/mes/base/BaseFactoryMapper.xml new file mode 100644 index 0000000..4f4aea6 --- /dev/null +++ b/os-mes/src/main/resources/mapper/mes/base/BaseFactoryMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + select obj_id, + company_name, + factory_code, + factory_name, + factory_status, + remark, + created_by, + created_time, + updated_by, + updated_time + from base_factory + + + + + + + + insert into base_factory + + company_name, + factory_code, + factory_name, + factory_status, + remark, + created_by, + created_time, + updated_by, + updated_time, + + + #{companyName}, + #{factoryCode}, + #{factoryName}, + #{factoryStatus}, + #{remark}, + #{createdBy}, + #{createdTime}, + #{updatedBy}, + #{updatedTime}, + + + + + update base_factory + + company_name = #{companyName}, + factory_code = #{factoryCode}, + factory_name = #{factoryName}, + factory_status = #{factoryStatus}, + remark = #{remark}, + created_by = #{createdBy}, + created_time = #{createdTime}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + + where obj_id = #{objId} + + + + delete + from base_factory + where obj_id = #{objId} + + + + delete from base_factory where obj_id in + + #{objId} + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6d20260..c130423 100644 --- a/pom.xml +++ b/pom.xml @@ -209,6 +209,13 @@ ${haiwei.version} + + + com.haiwei + haiwei-mes + ${haiwei.version} + + @@ -220,6 +227,7 @@ os-generator os-common os-ems + os-mes pom