lenovo
2 years ago
parent
4ddc2007ba
commit
5fa329bdc0
25 changed files with 260 additions and 52 deletions
@ -1,16 +1,19 @@ |
|||||||
package org.jeecg.modules.demo.base.entity; |
package org.jeecg.modules.demo.base.entity; |
||||||
|
|
||||||
import lombok.Data; |
import lombok.Data; |
||||||
import org.jeecg.modules.demo.pro.entity.ZyProcessAccessories; |
import org.jeecg.modules.demo.accessories.entity.ZyAccessories; |
||||||
import org.jeecg.modules.demo.pro.entity.ZyProcessAction; |
import org.jeecg.modules.demo.device.entity.ZyDevicetypel; |
||||||
import org.jeecg.modules.demo.pro.entity.ZyProcessFabric; |
import org.jeecg.modules.demo.fabric.entity.ZyFabric; |
||||||
|
import org.jeecg.modules.demo.tools.entity.ZyToolTypes; |
||||||
|
|
||||||
import java.util.List; |
import java.util.List; |
||||||
|
|
||||||
@Data |
@Data |
||||||
public class ZyAllProcess { |
public class ZyAllProcess { |
||||||
private ZyProcess zyProcess; |
private ZyProcess zyProcess; |
||||||
private List<ZyProcessAccessories> zyProcessAccessories; |
private List<ZyClothAction> zyClothActions;//基础动作
|
||||||
private List<ZyProcessFabric> zyProcessFabric; |
private List<ZyAccessories> zyAccessories;//辅料管理
|
||||||
private List<ZyProcessAction> zyProcessAction; |
private List<ZyFabric> zyFabrics;//面料管理
|
||||||
|
private List<ZyDevicetypel> zyDevicetypes;//设备管理
|
||||||
|
private List<ZyToolTypes> zyToolTypes; //工具管理
|
||||||
} |
} |
||||||
|
|||||||
@ -0,0 +1,101 @@ |
|||||||
|
package org.jeecg.modules.demo.device.entity; |
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableId; |
||||||
|
import com.baomidou.mybatisplus.annotation.TableName; |
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat; |
||||||
|
import io.swagger.annotations.ApiModel; |
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.Data; |
||||||
|
import org.jeecg.common.aspect.annotation.Dict; |
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel; |
||||||
|
import org.springframework.format.annotation.DateTimeFormat; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
import java.util.Date; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 设备类型 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2021-11-11 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
@Data |
||||||
|
@TableName("zy_devicetype") |
||||||
|
@ApiModel(value="zy_devicetype对象", description="设备类型") |
||||||
|
public class ZyDevicetypel implements Serializable { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
/**主键*/ |
||||||
|
@TableId(type = IdType.ASSIGN_ID) |
||||||
|
@ApiModelProperty(value = "主键") |
||||||
|
private String id; |
||||||
|
/**创建人*/ |
||||||
|
@ApiModelProperty(value = "创建人") |
||||||
|
private String createBy; |
||||||
|
/**创建日期*/ |
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||||
|
@ApiModelProperty(value = "创建日期") |
||||||
|
private Date createTime; |
||||||
|
/**更新人*/ |
||||||
|
@ApiModelProperty(value = "更新人") |
||||||
|
private String updateBy; |
||||||
|
/**更新日期*/ |
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||||
|
@ApiModelProperty(value = "更新日期") |
||||||
|
private Date updateTime; |
||||||
|
/**所属部门*/ |
||||||
|
@ApiModelProperty(value = "所属部门") |
||||||
|
private String sysOrgCode; |
||||||
|
/**父级节点*/ |
||||||
|
@Excel(name = "父级节点", width = 15) |
||||||
|
@ApiModelProperty(value = "父级节点") |
||||||
|
private String pid; |
||||||
|
/**是否有子节点*/ |
||||||
|
@Excel(name = "是否有子节点", width = 15, dicCode = "yn") |
||||||
|
@Dict(dicCode = "yn") |
||||||
|
@ApiModelProperty(value = "是否有子节点") |
||||||
|
private String hasChild; |
||||||
|
/**类型编号*/ |
||||||
|
@Excel(name = "类型编号", width = 15) |
||||||
|
@ApiModelProperty(value = "类型编号") |
||||||
|
private String code; |
||||||
|
/**类型名称*/ |
||||||
|
@Excel(name = "类型名称", width = 15) |
||||||
|
@ApiModelProperty(value = "类型名称") |
||||||
|
private String name; |
||||||
|
/**类型图片*/ |
||||||
|
@Excel(name = "类型图片", width = 15) |
||||||
|
@ApiModelProperty(value = "类型图片") |
||||||
|
private String img; |
||||||
|
/**类型品牌*/ |
||||||
|
@Excel(name = "类型品牌", width = 15) |
||||||
|
@ApiModelProperty(value = "类型品牌") |
||||||
|
private String brand; |
||||||
|
/**型号*/ |
||||||
|
@Excel(name = "型号", width = 15) |
||||||
|
@ApiModelProperty(value = "型号") |
||||||
|
private String model; |
||||||
|
/**生产厂商*/ |
||||||
|
@Excel(name = "生产厂商", width = 15) |
||||||
|
@ApiModelProperty(value = "生产厂商") |
||||||
|
private String manufacturer; |
||||||
|
/**供货商*/ |
||||||
|
@Excel(name = "供货商", width = 15) |
||||||
|
@ApiModelProperty(value = "供货商") |
||||||
|
private String supplier; |
||||||
|
/**联系人*/ |
||||||
|
@Excel(name = "联系人", width = 15) |
||||||
|
@ApiModelProperty(value = "联系人") |
||||||
|
private String contact; |
||||||
|
/**产地*/ |
||||||
|
@Excel(name = "产地", width = 15) |
||||||
|
@ApiModelProperty(value = "产地") |
||||||
|
private String place; |
||||||
|
/**二维码*/ |
||||||
|
@Excel(name = "二维码", width = 15) |
||||||
|
@ApiModelProperty(value = "二维码") |
||||||
|
private String erweima; |
||||||
|
} |
||||||
@ -0,0 +1,21 @@ |
|||||||
|
package org.jeecg.modules.demo.device.mapper; |
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||||
|
import org.apache.ibatis.annotations.Mapper; |
||||||
|
import org.apache.ibatis.annotations.Select; |
||||||
|
import org.jeecg.modules.demo.device.entity.ZyDevicetypel; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 设备类型 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2021-11-11 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
@Mapper |
||||||
|
public interface ZyDevicetypeMapper1 extends BaseMapper<ZyDevicetypel> { |
||||||
|
|
||||||
|
@Select("select * from zy_devicetype where id in (select machine_id from zy_process_machine where process_id=#{id})") |
||||||
|
List<ZyDevicetypel> selectByid(String id); |
||||||
|
} |
||||||
@ -0,0 +1,20 @@ |
|||||||
|
package org.jeecg.modules.demo.device.service; |
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService; |
||||||
|
import org.jeecg.modules.demo.device.entity.ZyDevicetypel; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 设备类型 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2021-11-11 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
public interface IZyDevicetypeService1 extends IService<ZyDevicetypel> { |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
List<ZyDevicetypel> selectByid(String id); |
||||||
|
} |
||||||
@ -0,0 +1,30 @@ |
|||||||
|
package org.jeecg.modules.demo.device.service.impl; |
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||||
|
import org.jeecg.modules.demo.device.entity.ZyDevicetypel; |
||||||
|
import org.jeecg.modules.demo.device.mapper.ZyDevicetypeMapper1; |
||||||
|
import org.jeecg.modules.demo.device.service.IZyDevicetypeService1; |
||||||
|
import org.springframework.beans.factory.annotation.Autowired; |
||||||
|
import org.springframework.stereotype.Service; |
||||||
|
|
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
/** |
||||||
|
* @Description: 设备类型 |
||||||
|
* @Author: jeecg-boot |
||||||
|
* @Date: 2021-11-11 |
||||||
|
* @Version: V1.0 |
||||||
|
*/ |
||||||
|
@Service |
||||||
|
public class ZyDevicetypeServiceImpl1 extends ServiceImpl<ZyDevicetypeMapper1, ZyDevicetypel> implements IZyDevicetypeService1 { |
||||||
|
|
||||||
|
@Autowired |
||||||
|
private ZyDevicetypeMapper1 zyDevicetypeMapper; |
||||||
|
|
||||||
|
|
||||||
|
@Override |
||||||
|
public List<ZyDevicetypel> selectByid(String id) { |
||||||
|
return zyDevicetypeMapper.selectByid(id); |
||||||
|
} |
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue