Merge remote-tracking branch 'origin/master'
commit
fdf2c8ce69
@ -0,0 +1,97 @@
|
||||
package com.op.device.controller;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
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.op.common.log.annotation.Log;
|
||||
import com.op.common.log.enums.BusinessType;
|
||||
import com.op.common.security.annotation.RequiresPermissions;
|
||||
import com.op.device.domain.EquFaultType;
|
||||
import com.op.device.service.IEquFaultTypeService;
|
||||
import com.op.common.core.web.controller.BaseController;
|
||||
import com.op.common.core.web.domain.AjaxResult;
|
||||
import com.op.common.core.utils.poi.ExcelUtil;
|
||||
import com.op.common.core.web.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 故障类型维护Controller
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/faultType")
|
||||
public class EquFaultTypeController extends BaseController {
|
||||
@Autowired
|
||||
private IEquFaultTypeService equFaultTypeService;
|
||||
|
||||
/**
|
||||
* 查询故障类型维护列表
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(EquFaultType equFaultType) {
|
||||
startPage();
|
||||
List<EquFaultType> list = equFaultTypeService.selectEquFaultTypeList(equFaultType);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出故障类型维护列表
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:export")
|
||||
@Log(title = "故障类型维护", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, EquFaultType equFaultType) {
|
||||
List<EquFaultType> list = equFaultTypeService.selectEquFaultTypeList(equFaultType);
|
||||
ExcelUtil<EquFaultType> util = new ExcelUtil<EquFaultType>(EquFaultType.class);
|
||||
util.exportExcel(response, list, "故障类型维护数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取故障类型维护详细信息
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:query")
|
||||
@GetMapping(value = "/{faultId}")
|
||||
public AjaxResult getInfo(@PathVariable("faultId") String faultId) {
|
||||
return success(equFaultTypeService.selectEquFaultTypeByFaultId(faultId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增故障类型维护
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:add")
|
||||
@Log(title = "故障类型维护", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@RequestBody EquFaultType equFaultType) {
|
||||
return toAjax(equFaultTypeService.insertEquFaultType(equFaultType));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改故障类型维护
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:edit")
|
||||
@Log(title = "故障类型维护", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@RequestBody EquFaultType equFaultType) {
|
||||
return toAjax(equFaultTypeService.updateEquFaultType(equFaultType));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除故障类型维护
|
||||
*/
|
||||
@RequiresPermissions("device:faultType:remove")
|
||||
@Log(title = "故障类型维护", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{faultIds}")
|
||||
public AjaxResult remove(@PathVariable String[] faultIds) {
|
||||
return toAjax(equFaultTypeService.deleteEquFaultTypeByFaultIds(faultIds));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,146 @@
|
||||
package com.op.device.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 故障类型维护对象 equ_fault_type
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public class EquFaultType extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String faultId;
|
||||
|
||||
/** 故障类型编码 */
|
||||
@Excel(name = "故障类型编码")
|
||||
private String faultCode;
|
||||
|
||||
/** 故障类型 */
|
||||
@Excel(name = "故障类型")
|
||||
private String faultType;
|
||||
|
||||
/** 故障子类 */
|
||||
@Excel(name = "故障子类")
|
||||
private String faultSubclass;
|
||||
|
||||
/** 备注 */
|
||||
@Excel(name = "备注")
|
||||
private String faultRemark;
|
||||
|
||||
/** 工厂编码 */
|
||||
@Excel(name = "工厂编码")
|
||||
private String factoryCode;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 删除标志 */
|
||||
@Excel(name = "删除标志")
|
||||
private String delFlag;
|
||||
|
||||
public void setFaultId(String faultId) {
|
||||
this.faultId = faultId;
|
||||
}
|
||||
|
||||
public String getFaultId() {
|
||||
return faultId;
|
||||
}
|
||||
public void setFaultCode(String faultCode) {
|
||||
this.faultCode = faultCode;
|
||||
}
|
||||
|
||||
public String getFaultCode() {
|
||||
return faultCode;
|
||||
}
|
||||
public void setFaultType(String faultType) {
|
||||
this.faultType = faultType;
|
||||
}
|
||||
|
||||
public String getFaultType() {
|
||||
return faultType;
|
||||
}
|
||||
public void setFaultSubclass(String faultSubclass) {
|
||||
this.faultSubclass = faultSubclass;
|
||||
}
|
||||
|
||||
public String getFaultSubclass() {
|
||||
return faultSubclass;
|
||||
}
|
||||
public void setFaultRemark(String faultRemark) {
|
||||
this.faultRemark = faultRemark;
|
||||
}
|
||||
|
||||
public String getFaultRemark() {
|
||||
return faultRemark;
|
||||
}
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
public void setAttr3(String attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public String getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("faultId", getFaultId())
|
||||
.append("faultCode", getFaultCode())
|
||||
.append("faultType", getFaultType())
|
||||
.append("faultSubclass", getFaultSubclass())
|
||||
.append("faultRemark", getFaultRemark())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,181 @@
|
||||
package com.op.device.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.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 检查项/设备关联对象 equ_item_equipment
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public class EquItemEquipment extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 关联code */
|
||||
@Excel(name = "关联code")
|
||||
private String connCode;
|
||||
|
||||
/** 检查项code */
|
||||
@Excel(name = "检查项code")
|
||||
private String itemCode;
|
||||
|
||||
/** 设备code */
|
||||
@Excel(name = "设备code")
|
||||
private String equipmentCode;
|
||||
|
||||
/** 工厂 */
|
||||
@Excel(name = "工厂")
|
||||
private String factoryCode;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 删除标识 */
|
||||
private String delFlag;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createdBy;
|
||||
|
||||
/** 创建时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createdTime;
|
||||
|
||||
/** 更新人 */
|
||||
@Excel(name = "更新人")
|
||||
private String updatedBy;
|
||||
|
||||
/** 更新时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date updatedTime;
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
public void setConnCode(String connCode) {
|
||||
this.connCode = connCode;
|
||||
}
|
||||
|
||||
public String getConnCode() {
|
||||
return connCode;
|
||||
}
|
||||
public void setItemCode(String itemCode) {
|
||||
this.itemCode = itemCode;
|
||||
}
|
||||
|
||||
public String getItemCode() {
|
||||
return itemCode;
|
||||
}
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
public void setAttr3(String attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public String getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
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("id", getId())
|
||||
.append("connCode", getConnCode())
|
||||
.append("itemCode", getItemCode())
|
||||
.append("equipmentCode", getEquipmentCode())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("createdBy", getCreatedBy())
|
||||
.append("createdTime", getCreatedTime())
|
||||
.append("updatedBy", getUpdatedBy())
|
||||
.append("updatedTime", getUpdatedTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.op.device.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.device.domain.EquFaultType;
|
||||
|
||||
/**
|
||||
* 故障类型维护Mapper接口
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public interface EquFaultTypeMapper {
|
||||
/**
|
||||
* 查询故障类型维护
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 故障类型维护
|
||||
*/
|
||||
public EquFaultType selectEquFaultTypeByFaultId(String faultId);
|
||||
|
||||
/**
|
||||
* 查询故障类型维护列表
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 故障类型维护集合
|
||||
*/
|
||||
public List<EquFaultType> selectEquFaultTypeList(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 新增故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquFaultType(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 修改故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquFaultType(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 删除故障类型维护
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquFaultTypeByFaultId(String faultId);
|
||||
|
||||
/**
|
||||
* 批量删除故障类型维护
|
||||
*
|
||||
* @param faultIds 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquFaultTypeByFaultIds(String[] faultIds);
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
package com.op.device.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.op.device.domain.EquItemEquipment;
|
||||
|
||||
/**
|
||||
* 检查项/设备关联Mapper接口
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public interface EquItemEquipmentMapper {
|
||||
/**
|
||||
* 查询检查项/设备关联
|
||||
*
|
||||
* @param id 检查项/设备关联主键
|
||||
* @return 检查项/设备关联
|
||||
*/
|
||||
public EquItemEquipment selectEquItemEquipmentById(String id);
|
||||
|
||||
/**
|
||||
* 查询检查项/设备关联列表
|
||||
*
|
||||
* @param equItemEquipment 检查项/设备关联
|
||||
* @return 检查项/设备关联集合
|
||||
*/
|
||||
public List<EquItemEquipment> selectEquItemEquipmentList(EquItemEquipment equItemEquipment);
|
||||
|
||||
/**
|
||||
* 新增检查项/设备关联
|
||||
*
|
||||
* @param equItemEquipment 检查项/设备关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquItemEquipment(EquItemEquipment equItemEquipment);
|
||||
|
||||
/**
|
||||
* 修改检查项/设备关联
|
||||
*
|
||||
* @param equItemEquipment 检查项/设备关联
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquItemEquipment(EquItemEquipment equItemEquipment);
|
||||
|
||||
/**
|
||||
* 删除检查项/设备关联
|
||||
*
|
||||
* @param id 检查项/设备关联主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquItemEquipmentById(String id);
|
||||
|
||||
/**
|
||||
* 批量删除检查项/设备关联
|
||||
*
|
||||
* @param ids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquItemEquipmentByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 获取流水号
|
||||
* @return
|
||||
*/
|
||||
int selectSerialNumber();
|
||||
|
||||
/**
|
||||
* 通过检查项code查询关联设备code列表
|
||||
* @param itemCode
|
||||
* @return
|
||||
*/
|
||||
List<String> selectEquipmentCodeList(String itemCode);
|
||||
|
||||
/**
|
||||
* 通过检查项code删除关联信息
|
||||
* @param itemCode
|
||||
*/
|
||||
void deleteEquItemEquipmentByItemCode(String itemCode);
|
||||
|
||||
/**
|
||||
* 逻辑删除-通过itemId删除设备关联信息
|
||||
* @param itemId
|
||||
*/
|
||||
void delEquItemEquipmentByItemId(String itemId);
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package com.op.device.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.op.device.domain.EquFaultType;
|
||||
|
||||
/**
|
||||
* 故障类型维护Service接口
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
public interface IEquFaultTypeService {
|
||||
/**
|
||||
* 查询故障类型维护
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 故障类型维护
|
||||
*/
|
||||
public EquFaultType selectEquFaultTypeByFaultId(String faultId);
|
||||
|
||||
/**
|
||||
* 查询故障类型维护列表
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 故障类型维护集合
|
||||
*/
|
||||
public List<EquFaultType> selectEquFaultTypeList(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 新增故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertEquFaultType(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 修改故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateEquFaultType(EquFaultType equFaultType);
|
||||
|
||||
/**
|
||||
* 批量删除故障类型维护
|
||||
*
|
||||
* @param faultIds 需要删除的故障类型维护主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquFaultTypeByFaultIds(String[] faultIds);
|
||||
|
||||
/**
|
||||
* 删除故障类型维护信息
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteEquFaultTypeByFaultId(String faultId);
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
package com.op.device.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.op.common.core.utils.DateUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.op.device.mapper.EquFaultTypeMapper;
|
||||
import com.op.device.domain.EquFaultType;
|
||||
import com.op.device.service.IEquFaultTypeService;
|
||||
|
||||
/**
|
||||
* 故障类型维护Service业务层处理
|
||||
*
|
||||
* @author wws
|
||||
* @date 2023-10-12
|
||||
*/
|
||||
@Service
|
||||
public class EquFaultTypeServiceImpl implements IEquFaultTypeService {
|
||||
@Autowired
|
||||
private EquFaultTypeMapper equFaultTypeMapper;
|
||||
|
||||
/**
|
||||
* 查询故障类型维护
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 故障类型维护
|
||||
*/
|
||||
@Override
|
||||
public EquFaultType selectEquFaultTypeByFaultId(String faultId) {
|
||||
return equFaultTypeMapper.selectEquFaultTypeByFaultId(faultId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询故障类型维护列表
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 故障类型维护
|
||||
*/
|
||||
@Override
|
||||
public List<EquFaultType> selectEquFaultTypeList(EquFaultType equFaultType) {
|
||||
return equFaultTypeMapper.selectEquFaultTypeList(equFaultType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertEquFaultType(EquFaultType equFaultType) {
|
||||
equFaultType.setCreateTime(DateUtils.getNowDate());
|
||||
return equFaultTypeMapper.insertEquFaultType(equFaultType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改故障类型维护
|
||||
*
|
||||
* @param equFaultType 故障类型维护
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateEquFaultType(EquFaultType equFaultType) {
|
||||
equFaultType.setUpdateTime(DateUtils.getNowDate());
|
||||
return equFaultTypeMapper.updateEquFaultType(equFaultType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除故障类型维护
|
||||
*
|
||||
* @param faultIds 需要删除的故障类型维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteEquFaultTypeByFaultIds(String[] faultIds) {
|
||||
return equFaultTypeMapper.deleteEquFaultTypeByFaultIds(faultIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除故障类型维护信息
|
||||
*
|
||||
* @param faultId 故障类型维护主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteEquFaultTypeByFaultId(String faultId) {
|
||||
return equFaultTypeMapper.deleteEquFaultTypeByFaultId(faultId);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,118 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.device.mapper.EquFaultTypeMapper">
|
||||
|
||||
<resultMap type="EquFaultType" id="EquFaultTypeResult">
|
||||
<result property="faultId" column="fault_id" />
|
||||
<result property="faultCode" column="fault_code" />
|
||||
<result property="faultType" column="fault_type" />
|
||||
<result property="faultSubclass" column="fault_subclass" />
|
||||
<result property="faultRemark" column="fault_remark" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEquFaultTypeVo">
|
||||
select fault_id, fault_code, fault_type, fault_subclass, fault_remark, factory_code, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time from equ_fault_type
|
||||
</sql>
|
||||
|
||||
<select id="selectEquFaultTypeList" parameterType="EquFaultType" resultMap="EquFaultTypeResult">
|
||||
<include refid="selectEquFaultTypeVo"/>
|
||||
<where>
|
||||
<if test="faultCode != null and faultCode != ''"> and fault_code like concat('%', #{faultCode}, '%')</if>
|
||||
<if test="faultType != null and faultType != ''"> and fault_type like concat('%', #{faultType}, '%')</if>
|
||||
<if test="faultSubclass != null and faultSubclass != ''"> and fault_subclass like concat('%', #{faultSubclass}, '%')</if>
|
||||
<if test="faultRemark != null and faultRemark != ''"> and fault_remark = #{faultRemark}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag}</if>
|
||||
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
|
||||
<if test="createTime != null "> and create_time = #{createTime}</if>
|
||||
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
|
||||
<if test="updateTime != null "> and update_time = #{updateTime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectEquFaultTypeByFaultId" parameterType="String" resultMap="EquFaultTypeResult">
|
||||
<include refid="selectEquFaultTypeVo"/>
|
||||
where fault_id = #{faultId}
|
||||
</select>
|
||||
|
||||
<insert id="insertEquFaultType" parameterType="EquFaultType">
|
||||
insert into equ_fault_type
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="faultId != null">fault_id,</if>
|
||||
<if test="faultCode != null and faultCode != ''">fault_code,</if>
|
||||
<if test="faultType != null and faultType != ''">fault_type,</if>
|
||||
<if test="faultSubclass != null and faultSubclass != ''">fault_subclass,</if>
|
||||
<if test="faultRemark != null">fault_remark,</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="faultId != null">#{faultId},</if>
|
||||
<if test="faultCode != null and faultCode != ''">#{faultCode},</if>
|
||||
<if test="faultType != null and faultType != ''">#{faultType},</if>
|
||||
<if test="faultSubclass != null and faultSubclass != ''">#{faultSubclass},</if>
|
||||
<if test="faultRemark != null">#{faultRemark},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEquFaultType" parameterType="EquFaultType">
|
||||
update equ_fault_type
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="faultCode != null and faultCode != ''">fault_code = #{faultCode},</if>
|
||||
<if test="faultType != null and faultType != ''">fault_type = #{faultType},</if>
|
||||
<if test="faultSubclass != null and faultSubclass != ''">fault_subclass = #{faultSubclass},</if>
|
||||
<if test="faultRemark != null">fault_remark = #{faultRemark},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
</trim>
|
||||
where fault_id = #{faultId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteEquFaultTypeByFaultId" parameterType="String">
|
||||
delete from equ_fault_type where fault_id = #{faultId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEquFaultTypeByFaultIds" parameterType="String">
|
||||
delete from equ_fault_type where fault_id in
|
||||
<foreach item="faultId" collection="array" open="(" separator="," close=")">
|
||||
#{faultId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,134 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.op.device.mapper.EquItemEquipmentMapper">
|
||||
|
||||
<resultMap type="EquItemEquipment" id="EquItemEquipmentResult">
|
||||
<result property="id" column="id" />
|
||||
<result property="connCode" column="conn_code" />
|
||||
<result property="itemCode" column="item_code" />
|
||||
<result property="equipmentCode" column="equipment_code" />
|
||||
<result property="factoryCode" column="factory_code" />
|
||||
<result property="attr1" column="attr1" />
|
||||
<result property="attr2" column="attr2" />
|
||||
<result property="attr3" column="attr3" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createdBy" column="created_by" />
|
||||
<result property="createdTime" column="created_time" />
|
||||
<result property="updatedBy" column="updated_by" />
|
||||
<result property="updatedTime" column="updated_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEquItemEquipmentVo">
|
||||
select id, conn_code, item_code, equipment_code, factory_code, attr1, attr2, attr3, del_flag, created_by, created_time, updated_by, updated_time from equ_item_equipment
|
||||
</sql>
|
||||
|
||||
<select id="selectEquItemEquipmentList" parameterType="EquItemEquipment" resultMap="EquItemEquipmentResult">
|
||||
<include refid="selectEquItemEquipmentVo"/>
|
||||
<where>
|
||||
<if test="connCode != null and connCode != ''"> and conn_code = #{connCode}</if>
|
||||
<if test="itemCode != null and itemCode != ''"> and item_code = #{itemCode}</if>
|
||||
<if test="equipmentCode != null and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
|
||||
<if test="factoryCode != null and factoryCode != ''"> and factory_code = #{factoryCode}</if>
|
||||
<if test="attr1 != null and attr1 != ''"> and attr1 = #{attr1}</if>
|
||||
<if test="attr2 != null and attr2 != ''"> and attr2 = #{attr2}</if>
|
||||
<if test="attr3 != null and attr3 != ''"> and attr3 = #{attr3}</if>
|
||||
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
|
||||
<if test="createdTime != null "> and created_time = #{createdTime}</if>
|
||||
<if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
|
||||
<if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
|
||||
</where>
|
||||
and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<select id="selectEquItemEquipmentById" parameterType="String" resultMap="EquItemEquipmentResult">
|
||||
<include refid="selectEquItemEquipmentVo"/>
|
||||
where id = #{id} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<select id="selectSerialNumber" resultType="java.lang.Integer">
|
||||
SELECT COUNT(id)+1 AS serialNum
|
||||
FROM equ_item_equipment
|
||||
WHERE CONVERT(date, GETDATE()) = CONVERT(date,created_time) and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<select id="selectEquipmentCodeList" resultType="java.lang.String">
|
||||
select equipment_code AS 'equipmentCode' from equ_item_equipment where item_code = #{itemCode} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<insert id="insertEquItemEquipment" parameterType="EquItemEquipment">
|
||||
insert into equ_item_equipment
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">id,</if>
|
||||
<if test="connCode != null and connCode != ''">conn_code,</if>
|
||||
<if test="itemCode != null and itemCode != ''">item_code,</if>
|
||||
<if test="equipmentCode != null and equipmentCode != ''">equipment_code,</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code,</if>
|
||||
<if test="attr1 != null">attr1,</if>
|
||||
<if test="attr2 != null">attr2,</if>
|
||||
<if test="attr3 != null">attr3,</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag,</if>
|
||||
<if test="createdBy != null and createdBy != ''">created_by,</if>
|
||||
<if test="createdTime != null">created_time,</if>
|
||||
<if test="updatedBy != null and updatedBy != ''">updated_by,</if>
|
||||
<if test="updatedTime != null">updated_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">#{id},</if>
|
||||
<if test="connCode != null and connCode != ''">#{connCode},</if>
|
||||
<if test="itemCode != null and itemCode != ''">#{itemCode},</if>
|
||||
<if test="equipmentCode != null and equipmentCode != ''">#{equipmentCode},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">#{factoryCode},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="attr3 != null">#{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
|
||||
<if test="createdBy != null and createdBy != ''">#{createdBy},</if>
|
||||
<if test="createdTime != null">#{createdTime},</if>
|
||||
<if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if>
|
||||
<if test="updatedTime != null">#{updatedTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateEquItemEquipment" parameterType="EquItemEquipment">
|
||||
update equ_item_equipment
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="connCode != null and connCode != ''">conn_code = #{connCode},</if>
|
||||
<if test="itemCode != null and itemCode != ''">item_code = #{itemCode},</if>
|
||||
<if test="equipmentCode != null and equipmentCode != ''">equipment_code = #{equipmentCode},</if>
|
||||
<if test="factoryCode != null and factoryCode != ''">factory_code = #{factoryCode},</if>
|
||||
<if test="attr1 != null">attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">attr2 = #{attr2},</if>
|
||||
<if test="attr3 != null">attr3 = #{attr3},</if>
|
||||
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
|
||||
<if test="createdBy != null and createdBy != ''">created_by = #{createdBy},</if>
|
||||
<if test="createdTime != null">created_time = #{createdTime},</if>
|
||||
<if test="updatedBy != null and updatedBy != ''">updated_by = #{updatedBy},</if>
|
||||
<if test="updatedTime != null">updated_time = #{updatedTime},</if>
|
||||
</trim>
|
||||
where id = #{id} and del_flag = '0'
|
||||
</update>
|
||||
|
||||
<delete id="deleteEquItemEquipmentById" parameterType="String">
|
||||
delete from equ_item_equipment where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEquItemEquipmentByIds" parameterType="String">
|
||||
delete from equ_item_equipment where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
<delete id="deleteEquItemEquipmentByItemCode">
|
||||
delete from equ_item_equipment where item_code = #{itemCode}
|
||||
</delete>
|
||||
|
||||
<delete id="delEquItemEquipmentByItemId">
|
||||
update equ_item_equipment
|
||||
set del_flag = '1'
|
||||
where item_code =
|
||||
(select item_code from equ_check_item where item_id = #{itemId})
|
||||
</delete>
|
||||
</mapper>
|
||||
@ -0,0 +1,104 @@
|
||||
package com.op.mes.domain.dto;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 料罐接口数据
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-07-03
|
||||
*/
|
||||
public class LGInfoDto {
|
||||
|
||||
private String deviceCode;
|
||||
private String deviceName;
|
||||
private String id;
|
||||
private String used;
|
||||
private String usedUnit;
|
||||
private String createDate;
|
||||
private Date lgCreateTime;
|
||||
private Date createTime;
|
||||
private String factoryCode;
|
||||
private String delFlag;
|
||||
|
||||
public Date getLgCreateTime() {
|
||||
return lgCreateTime;
|
||||
}
|
||||
|
||||
public void setLgCreateTime(Date lgCreateTime) {
|
||||
this.lgCreateTime = lgCreateTime;
|
||||
}
|
||||
|
||||
public String getCreateDate() {
|
||||
return createDate;
|
||||
}
|
||||
|
||||
public void setCreateDate(String createDate) {
|
||||
this.createDate = createDate;
|
||||
}
|
||||
|
||||
public String getDeviceCode() {
|
||||
return deviceCode;
|
||||
}
|
||||
|
||||
public void setDeviceCode(String deviceCode) {
|
||||
this.deviceCode = deviceCode;
|
||||
}
|
||||
|
||||
public String getUsed() {
|
||||
return used;
|
||||
}
|
||||
|
||||
public void setUsed(String used) {
|
||||
this.used = used;
|
||||
}
|
||||
|
||||
public String getUsedUnit() {
|
||||
return usedUnit;
|
||||
}
|
||||
|
||||
public void setUsedUnit(String usedUnit) {
|
||||
this.usedUnit = usedUnit;
|
||||
}
|
||||
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDeviceName() {
|
||||
return deviceName;
|
||||
}
|
||||
|
||||
public void setDeviceName(String deviceName) {
|
||||
this.deviceName = deviceName;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue