设备管理

sd-business/src/main/java/com/sd/business/controller/craft/CraftProcessController.java

@@ -7,6 +7,7 @@ import com.sd.business.entity.craft.dto.CraftProcessSelectDto;
 import com.sd.business.entity.craft.vo.CraftProcessVo;
 import com.sd.business.service.craft.CraftProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +49,7 @@ public class CraftProcessController {
      * 工艺_工序新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody CraftProcessDto craftProcessDto) {
+    public void add(@Validated @RequestBody CraftProcessDto craftProcessDto) {
         craftProcessService.add(craftProcessDto);
     }
 

sd-business/src/main/java/com/sd/business/controller/equipment/EquipmentController.java

@@ -0,0 +1,72 @@
+package com.sd.business.controller.equipment;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.equipment.dto.EquipmentDto;
+import com.sd.business.entity.equipment.dto.EquipmentSelectDto;
+import com.sd.business.entity.equipment.vo.EquipmentVo;
+import com.sd.business.service.equipment.EquipmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 设备 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@RestController
+@RequestMapping("/equipment")
+public class EquipmentController {
+
+    @Autowired
+    private EquipmentService equipmentService;
+
+    /**
+     * 设备分页
+     */
+    @PostMapping("/page")
+    public Page<EquipmentVo> page(@RequestBody EquipmentSelectDto dto) {
+        return equipmentService.getPage(dto);
+    }
+
+    /**
+     * 设备明细
+     */
+    @PostMapping("/detail")
+    public EquipmentVo detail(@RequestBody BaseSelectDto dto) {
+        return equipmentService.detail(dto.getId());
+    }
+
+    /**
+     * 设备新增
+     */
+    @PostMapping("/add")
+    public void add(@Validated @RequestBody EquipmentDto equipmentDto) {
+        equipmentService.add(equipmentDto);
+    }
+
+    /**
+     * 设备编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody EquipmentDto equipmentDto) {
+        equipmentService.edit(equipmentDto);
+    }
+
+    /**
+     * 设备删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        equipmentService.delete(dto.getId());
+    }
+
+}

sd-business/src/main/java/com/sd/business/entity/craft/po/CraftProcess.java

@@ -5,6 +5,9 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 工艺_工序
@@ -21,16 +24,19 @@ public class CraftProcess extends BasePo {
     /**
      * 工序编码
      */
+    @NotBlank(message = "工序编码不能为空")
     private String code;
 
     /**
      * 工序名称
      */
+    @NotBlank(message = "工序名称不能为空")
     private String name;
 
     /**
      * 标准工时（秒）
      */
+    @NotNull(message = "标准工时不能为空")
     private Integer manHour;
 
     /**

sd-business/src/main/java/com/sd/business/entity/equipment/dto/EquipmentDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.equipment.dto;
+
+import com.sd.business.entity.equipment.po.Equipment;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 设备新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@Getter
+@Setter
+public class EquipmentDto extends Equipment {
+
+}

sd-business/src/main/java/com/sd/business/entity/equipment/dto/EquipmentSelectDto.java

@@ -0,0 +1,32 @@
+package com.sd.business.entity.equipment.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 设备列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@Getter
+@Setter
+public class EquipmentSelectDto extends BaseSelectDto {
+
+    /**
+     * 设备编码
+     */
+    private String code;
+
+    /**
+     * 设备名称
+     */
+    private String name;
+
+    /**
+     * 工序id
+     */
+    private Long craftProcessId;
+
+}

sd-business/src/main/java/com/sd/business/entity/equipment/po/Equipment.java

@@ -0,0 +1,73 @@
+package com.sd.business.entity.equipment.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备
+ * </p>
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@Getter
+@Setter
+@TableName("equipment")
+public class Equipment extends BasePo {
+
+    /**
+     * 设备编码
+     */
+    @NotBlank(message = "设备编码不能为空")
+    private String code;
+
+    /**
+     * 设备名称
+     */
+    @NotBlank(message = "设备名称不能为空")
+    private String name;
+
+    /**
+     * 工序id
+     */
+    @NotNull(message = "工序id不能为空")
+    private Long craftProcessId;
+
+    /**
+     * 规格
+     */
+    private String spec;
+
+    /**
+     * 制造商
+     */
+    private String manufacturer;
+
+    /**
+     * 制造商电话
+     */
+    private String manufacturerTelephone;
+
+    /**
+     * 生产日期
+     */
+    private Date productionDate;
+
+    /**
+     * 生产编号
+     */
+    private String productionNumber;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

sd-business/src/main/java/com/sd/business/entity/equipment/vo/EquipmentVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.equipment.vo;
+
+import com.sd.business.entity.equipment.po.Equipment;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 设备列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@Getter
+@Setter
+public class EquipmentVo extends Equipment {
+
+}

sd-business/src/main/java/com/sd/business/mapper/equipment/EquipmentMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.equipment.po.Equipment;
+import com.sd.business.entity.equipment.vo.EquipmentVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 设备 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-25
+ */
+public interface EquipmentMapper extends BaseMapper<Equipment> {
+
+    /**
+     * 设备分页
+     */
+    Page<EquipmentVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Equipment> wrapper);
+
+}

sd-business/src/main/java/com/sd/business/service/equipment/EquipmentService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.equipment;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.equipment.dto.EquipmentDto;
+import com.sd.business.entity.equipment.dto.EquipmentSelectDto;
+import com.sd.business.entity.equipment.po.Equipment;
+import com.sd.business.entity.equipment.vo.EquipmentVo;
+
+
+/**
+ * <p>
+ * 设备 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-25
+ */
+public interface EquipmentService extends BaseService<Equipment> {
+
+    /**
+     * 设备分页
+     */
+    Page<EquipmentVo> getPage(EquipmentSelectDto dto);
+
+    /**
+     * 设备明细
+     */
+    EquipmentVo detail(Long id);
+
+    /**
+     * 设备新增
+     */
+    void add(EquipmentDto equipmentDto);
+
+    /**
+     * 设备编辑
+     */
+    void edit(EquipmentDto equipmentDto);
+
+    /**
+     * 设备删除
+     */
+    void delete(Long id);
+
+}

sd-business/src/main/java/com/sd/business/service/equipment/impl/EquipmentServiceImpl.java

@@ -0,0 +1,61 @@
+package com.sd.business.service.equipment.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.equipment.dto.EquipmentDto;
+import com.sd.business.entity.equipment.dto.EquipmentSelectDto;
+import com.sd.business.entity.equipment.po.Equipment;
+import com.sd.business.entity.equipment.vo.EquipmentVo;
+import com.sd.business.mapper.equipment.EquipmentMapper;
+import com.sd.business.service.equipment.EquipmentService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 设备 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-25
+ */
+@Service
+public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements EquipmentService {
+
+    @Override
+    public Page<EquipmentVo> getPage(EquipmentSelectDto dto) {
+        IWrapper<Equipment> wrapper = getWrapper();
+        wrapper.like("e", Equipment::getName, dto.getName());
+        wrapper.like("e", Equipment::getCode, dto.getCode());
+        wrapper.eq("e", Equipment::getCraftProcessId, dto.getCraftProcessId());
+        wrapper.orderByDesc("e", Equipment::getId);
+
+        Page<EquipmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public EquipmentVo detail(Long id) {
+        Equipment Equipment = this.getById(id);
+        EquipmentVo result = BeanUtil.toBean(Equipment, EquipmentVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(EquipmentDto equipmentDto) {
+        this.save(equipmentDto);
+    }
+
+    @Override
+    public void edit(EquipmentDto equipmentDto) {
+        this.updateById(equipmentDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

sd-business/src/main/resources/mapper/equipment/EquipmentMapper.xml

@@ -0,0 +1,23 @@
+<?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.sd.business.mapper.equipment.EquipmentMapper">
+    <select id="getPage" resultType="com.sd.business.entity.equipment.vo.EquipmentVo">
+        select e.id,
+               e.code,
+               e.name,
+               e.craft_process_id,
+               e.spec,
+               e.manufacturer,
+               e.manufacturer_telephone,
+               e.production_date,
+               e.production_number,
+               e.remark,
+               e.create_user,
+               e.create_time,
+               e.update_user,
+               e.update_time
+        from equipment e
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>