设备开发

src/main/java/com/dc/dc_project/controller/EquipmentController.java

@@ -1,8 +1,11 @@
 package com.dc.dc_project.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.dc.dc_project.common.ResponseResult;
 import com.dc.dc_project.model.dto.EquipmentAddDto;
+import com.dc.dc_project.model.dto.EquipmentDto;
+import com.dc.dc_project.model.pojo.Equipment;
 import com.dc.dc_project.service.EquipmentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,13 +23,26 @@ public class EquipmentController {
     private final EquipmentService equipmentService;
 
     @PostMapping("/list")
-    public String list() {
+    public ResponseResult list(EquipmentDto equipmentDto) {
-        return equipmentService.list().toString();
+        Long userId = StpUtil.getLoginIdAsLong();
+        return equipmentService.getlist(equipmentDto, userId);
     }
 
     @PostMapping("/add")
     public ResponseResult add(@RequestBody @Validated EquipmentAddDto equipmentDto) {
-        Long userId = 1L;
+        Long userId = StpUtil.getLoginIdAsLong();
         return equipmentService.add(equipmentDto, userId);
     }
+
+    @PostMapping("/delete")
+    public ResponseResult delete(@RequestBody Equipment equipment) {
+        Long userId = StpUtil.getLoginIdAsLong();
+        return equipmentService.delete(equipment, userId);
+    }
+
+    @PostMapping("/update")
+    public ResponseResult update(@RequestBody EquipmentAddDto equipment) {
+        Long userId = StpUtil.getLoginIdAsLong();
+        return equipmentService.updateEquipment(equipment, userId);
+    }
 }

src/main/java/com/dc/dc_project/model/dto/EquipmentAddDto.java

@@ -14,6 +14,8 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 @NoArgsConstructor
 public class EquipmentAddDto {
+
+    private Long id;
     /**
      * 所属组织ID（试验室）
      */
@@ -24,6 +26,11 @@ public class EquipmentAddDto {
      */
     private String name;
 
+    /**
+     * 设备编号
+     */
+    private String equipmentNo;
+
     /**
      * 设备型号
      */
@@ -79,6 +86,8 @@ public class EquipmentAddDto {
      */
     private LocalDate validUntil;
 
+    private Integer remindDays;
+
     /**
      * 存放位置
      */
@@ -120,4 +129,11 @@ public class EquipmentAddDto {
      */
     private String calibrationCertificate;
 
+    /**
+     * 使用状态
+     */
+    private Integer useStatus;
+
+
+
 }

src/main/java/com/dc/dc_project/model/dto/EquipmentDto.java

@@ -0,0 +1,29 @@
+package com.dc.dc_project.model.dto;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+@Data
+public class EquipmentDto extends Page<EquipmentDto> {
+
+    private Long orgId;
+
+    private String equipmentNo;
+
+    private String name;
+
+    private String model;
+
+    private String manufacturer;
+
+    private Integer status;
+
+    private String remark;
+
+    private Integer traceabilityMethod;
+
+    private Integer useStatus;
+
+
+}

src/main/java/com/dc/dc_project/model/pojo/Equipment.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dc.dc_project.model.dto.EquipmentAddDto;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -32,6 +30,12 @@ public class Equipment {
     @TableField(value = "org_id")
     private Long orgId;
 
+    /**
+     * 设备编号
+     */
+    @TableField(value = "equipment_no")
+    private String equipmentNo;
+
     /**
      * 设备名称
      */
@@ -165,26 +169,26 @@ public class Equipment {
     private LocalDate serialData;
 
     /**
-     * 使用状态
+     * 使用状态（1良好）
      */
     @TableField(value = "use_status")
-    private Long useStatus;
+    private Integer useStatus;
 
     /**
-     * 朔源方式
+     * 溯源方式（1校准，2自校）
      */
     @TableField(value = "traceability_method")
     private Long traceabilityMethod;
 
     /**
-     * 检测证书编号
+     * 检定证书编号
      */
     @TableField(value = "calibration_certificate")
     private String calibrationCertificate;
-
     public static Equipment DtoToEquipment(EquipmentAddDto equipmentDto) {
         Equipment equipment = new Equipment();
         equipment.setOrgId(equipmentDto.getOrgId());
+        equipment.setEquipmentNo(equipmentDto.getEquipmentNo());
         equipment.setName(equipmentDto.getName());
         equipment.setModel(equipmentDto.getModel());
         equipment.setManufacturer(equipmentDto.getManufacturer());
@@ -205,8 +209,8 @@ public class Equipment {
         equipment.setSerialData(equipmentDto.getSerialData());
         equipment.setTraceabilityMethod(equipmentDto.getTraceabilityMethod());
         equipment.setCalibrationCertificate(equipmentDto.getCalibrationCertificate());
+        equipment.setUseStatus(equipmentDto.getUseStatus());
+        equipment.setRemindDays(equipmentDto.getRemindDays());
         return equipment;
     }
-
-
 }

src/main/java/com/dc/dc_project/service/EquipmentService.java

@@ -2,6 +2,7 @@ package com.dc.dc_project.service;
 
 import com.dc.dc_project.common.ResponseResult;
 import com.dc.dc_project.model.dto.EquipmentAddDto;
+import com.dc.dc_project.model.dto.EquipmentDto;
 import com.dc.dc_project.model.pojo.Equipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,25 @@ public interface EquipmentService extends IService<Equipment> {
      * @return
      */
     ResponseResult add(EquipmentAddDto equipmentDto, Long userId);
+
+    /**
+     * 获取设备列表
+     * @param equipmentDto
+     * @return
+     */
+    ResponseResult getlist(EquipmentDto equipmentDto, Long userId);
+
+    /**
+     * 删除设备
+     * @param equipment
+     * @return
+     */
+    ResponseResult delete(Equipment equipment, Long userId);
+
+    /**
+     * 修改设备
+     * @param equipment
+     * @return
+     */
+    ResponseResult updateEquipment(EquipmentAddDto equipment, Long userId);
 }

src/main/java/com/dc/dc_project/service/impl/EquipmentServiceImpl.java

@@ -1,10 +1,13 @@
 package com.dc.dc_project.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dc.dc_project.common.ResponseResult;
+import com.dc.dc_project.enums.IsDeleted;
 import com.dc.dc_project.mapper.PersonnelMapper;
 import com.dc.dc_project.model.dto.EquipmentAddDto;
+import com.dc.dc_project.model.dto.EquipmentDto;
 import com.dc.dc_project.model.pojo.Equipment;
 import com.dc.dc_project.model.pojo.Personnel;
 import com.dc.dc_project.service.EquipmentService;
@@ -14,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.List;
+
 import static com.dc.dc_project.model.pojo.Equipment.DtoToEquipment;
 
 /**
@@ -49,6 +54,80 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         Equipment equipment = DtoToEquipment(equipmentDto);
         return this.save(equipment) ? ResponseResult.success() : ResponseResult.error();
     }
+
+    @Override
+    public ResponseResult getlist(EquipmentDto equipmentDto, Long userId) {
+        //
+
+        LambdaQueryWrapper<Equipment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Equipment::getIsDeleted, IsDeleted.NO.getCode())
+                .like(equipmentDto.getName() != null, Equipment::getName, equipmentDto.getName())
+                .like(equipmentDto.getModel() != null, Equipment::getModel, equipmentDto.getModel())
+                .like(equipmentDto.getManufacturer() != null, Equipment::getManufacturer, equipmentDto.getManufacturer())
+                .eq(equipmentDto.getStatus() != null, Equipment::getStatus, equipmentDto.getStatus())
+                .like(equipmentDto.getEquipmentNo() != null, Equipment::getEquipmentNo, equipmentDto.getEquipmentNo())
+                .like(equipmentDto.getRemark() != null, Equipment::getRemark, equipmentDto.getRemark())
+                .eq(equipmentDto.getTraceabilityMethod() != null, Equipment::getTraceabilityMethod, equipmentDto.getTraceabilityMethod())
+                .eq(equipmentDto.getUseStatus() != null, Equipment::getUseStatus, equipmentDto.getUseStatus());
+        Page<Equipment> page = new Page<>(equipmentDto.getCurrent(), equipmentDto.getSize());
+        Page<Equipment> data = this.page(page, queryWrapper);
+
+
+        return ResponseResult.success(data);
+    }
+
+    @Override
+    public ResponseResult delete(Equipment equipment, Long userId) {
+
+        if(equipment.getId() ==  null){
+            return ResponseResult.error("设备ID不能为空");
+        }
+        Equipment equipment1 = this.getById(equipment.getId());
+        if(equipment1 == null){
+            return ResponseResult.error("设备不存在");
+        }
+        equipment1.setIsDeleted(IsDeleted.YES.getCode());
+
+        return this.updateById(equipment1) ? ResponseResult.success() : ResponseResult.error();
+    }
+
+    @Override
+    public ResponseResult updateEquipment(EquipmentAddDto equipment, Long userId) {
+
+        if(equipment.getId() ==  null){
+            return ResponseResult.error("设备ID不能为空");
+        }
+
+        Equipment equipment1 = this.getById(equipment.getId());
+        if(equipment1 == null){
+            return ResponseResult.error("设备不存在");
+        }
+        equipment1.setOrgId(equipment.getOrgId() != null? equipment.getOrgId() : equipment1.getOrgId());
+        equipment1.setEquipmentNo(equipment.getEquipmentNo() != null? equipment.getEquipmentNo() : equipment1.getEquipmentNo());
+        equipment1.setName(equipment.getName() != null? equipment.getName() : equipment1.getName());
+        equipment1.setModel(equipment.getModel() != null? equipment.getModel() : equipment1.getModel());
+        equipment1.setManufacturer(equipment.getManufacturer() != null? equipment.getManufacturer() : equipment1.getManufacturer());
+        equipment1.setSerialNo(equipment.getSerialNo() != null? equipment.getSerialNo() : equipment1.getSerialNo());
+        equipment1.setPurchaseDate(equipment.getPurchaseDate() != null? equipment.getPurchaseDate() : equipment1.getPurchaseDate());
+        equipment1.setPrice(equipment.getPrice() != null? equipment.getPrice() : equipment1.getPrice());
+        equipment1.setRangeValue(equipment.getRangeValue() != null? equipment.getRangeValue() : equipment1.getRangeValue());
+        equipment1.setAccuracy(equipment.getAccuracy() != null? equipment.getAccuracy() : equipment1.getAccuracy());
+        equipment1.setStatus(equipment.getStatus() != null? equipment.getStatus() : equipment1.getStatus());
+        equipment1.setCalibrationOrg(equipment.getCalibrationOrg() != null? equipment.getCalibrationOrg() : equipment1.getCalibrationOrg());
+        equipment1.setCalibrationDate(equipment.getCalibrationDate() != null? equipment.getCalibrationDate() : equipment1.getCalibrationDate());
+        equipment1.setValidUntil(equipment.getValidUntil() != null? equipment.getValidUntil() : equipment1.getValidUntil());
+        equipment1.setLocation(equipment.getLocation() != null? equipment.getLocation() : equipment1.getLocation());
+        equipment1.setResponsibleUser(equipment.getResponsibleUser() != null? equipment.getResponsibleUser() : equipment1.getResponsibleUser());
+        equipment1.setRemindDays(equipment.getRemindDays() != null? equipment.getRemindDays() : equipment1.getRemindDays());
+        equipment1.setLocation(equipment.getLocation() != null? equipment.getLocation() : equipment1.getLocation());
+        equipment1.setResponsibleUser(equipment.getResponsibleUser() != null? equipment.getResponsibleUser() : equipment1.getResponsibleUser());
+        equipment1.setRemark(equipment.getRemark() != null? equipment.getRemark() : equipment1.getRemark());
+        equipment1.setSerialData(equipment.getSerialData());
+        equipment1.setTraceabilityMethod(equipment.getTraceabilityMethod() != null? equipment.getTraceabilityMethod() : equipment1.getTraceabilityMethod());
+        equipment1.setCalibrationCertificate(equipment.getCalibrationCertificate() != null? equipment.getCalibrationCertificate() : equipment1.getCalibrationCertificate());
+
+        return this.updateById(equipment1) ? ResponseResult.success() : ResponseResult.error();
+    }
 }