From 138dfa55d76c5c16236b0dce37a9ed6d1625283e Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Thu, 22 Sep 2022 20:25:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A3=80=E5=AE=9A=E8=AE=B0=E5=BD=95=E6=97=B6=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/entity/EquipVerification.java | 30 +++++++++++++++++++ .../file/entity/EquipVerificationLog.java | 20 ++++++++++--- .../EquipVerificationController.java | 2 +- .../EquipVerificationLogController.java | 2 +- .../impl/EquipVerificationLogServiceImpl.java | 12 ++------ 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java index ede60f8..a274aa6 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerification.java @@ -16,6 +16,7 @@ */ package org.springblade.file.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import org.springblade.core.mp.base.BaseEntity; @@ -51,11 +52,33 @@ public class EquipVerification extends BaseEntity { * 设备id */ private String instrumentId; + /** + * 设备id + */ + private String code; /** * 设备名称 */ @ApiModelProperty(value = "设备名称") private String equipName; + /** + * 设备情况 + */ + @TableField(exist = false) + private String equipStatus; + /** + * 检定情况 + */ + @TableField(exist = false) + private String verificationInfo; + /** + * 检定时间（仅给记录表用） + */ + @ApiModelProperty(value = "检定时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(exist = false) + private LocalDateTime verificationTime; /** * 规格型号 */ @@ -95,4 +118,11 @@ public class EquipVerification extends BaseEntity { // private Integer status; @ApiModelProperty(value = "检定提前提示的天数") private Integer warnBefore; + + /** + * 检定人 + */ + @ApiModelProperty(value = "检定人") + @TableField(exist = false) + private long verificationUser; } diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java index c3bce29..6ae227b 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/EquipVerificationLog.java @@ -78,7 +78,7 @@ public class EquipVerificationLog extends BaseEntity { @ApiModelProperty(value = "检定时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime verification_time; + private LocalDateTime verificationTime; /** * 检定周期（天） */ @@ -93,8 +93,20 @@ public class EquipVerificationLog extends BaseEntity { @ApiModelProperty(value = "检定轮数") private Integer cicleNum; - //设备情况 + /** + * 设备id + */ + private String code; + /** + * 设备情况 + */ private String equipStatus; - //检定情况 - private String verification_info; + /** + * 检定情况 + */ + private String verificationInfo; + /** + * 检定人姓名 + */ + private String verificationUserName; } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java index 721d5cb..bec9bef 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationController.java @@ -105,7 +105,7 @@ public class EquipVerificationController extends BladeController { */ @PostMapping("/verification") @ApiOperation(value="保存检定记录") - public R verification(@RequestBody EquipVerificationVO e){ + public R verification(@RequestBody EquipVerification e){ equipVerificationLogService.insertLog(e); return R.success("检定成功"); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java index 9e814ba..5adf1f4 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/EquipVerificationLogController.java @@ -50,7 +50,7 @@ public class EquipVerificationLogController extends BladeController { .like(EquipVerificationLog::getEquipModel,equipVerificationLog.getEquipName()).or() .like(EquipVerificationLog::getManufacturerOrBrand,equipVerificationLog.getEquipName()); } - wrapper.orderByDesc(EquipVerificationLog::getCreateTime); + wrapper.orderByDesc(EquipVerificationLog::getVerificationTime); return R.data(equipVerificationLogService.page(Condition.getPage(query), wrapper)); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java index a088f3e..131459a 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/EquipVerificationLogServiceImpl.java @@ -17,18 +17,11 @@ package org.springblade.file.service.impl; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.StringUtil; import org.springblade.file.entity.EquipVerification; import org.springblade.file.entity.EquipVerificationLog; -import org.springblade.file.enums.EquipVerificationEnum; import org.springblade.file.mapper.EquipVerificationLogMapper; import org.springblade.file.mapper.EquipVerificationMapper; import org.springblade.file.service.IEquipVerificationLogService; -import org.springblade.file.service.IEquipVerificationService; -import org.springblade.file.vo.EquipVerificationVO; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; @@ -38,8 +31,6 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; -import java.util.List; -import java.util.Optional; /** * 仪器检定管理 服务实现类 @@ -79,6 +70,7 @@ public class EquipVerificationLogServiceImpl extends BaseServiceImpl Date: Thu, 22 Sep 2022 22:49:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A1=AB=E5=86=99=E5=AE=9E=E9=AA=8C?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=BF=9D=E5=AD=98=E4=B8=8B=E6=98=AF?= =?UTF-8?q?=E5=8D=95=E6=9D=BF=E8=BF=98=E6=98=AF=E5=A4=9A=E7=89=88=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E9=9D=9E=E5=85=B0=E6=89=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/lims/entry/ExamineResult.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java index dc1dab3..80db963 100644 --- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java +++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineResult.java @@ -159,4 +159,7 @@ public class ExamineResult extends BaseEntity implements Serializable { // 结果判定方法和依据 private String examineBasisContent; + + // 如果是口蹄疫，1单板，2多版，3非兰所 + private String lansuo; } \ No newline at end of file From bfe502944d35c45e990e296d7ee4995f909cb832 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 23 Sep 2022 11:19:22 +0800 Subject: [PATCH 3/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E6=8C=89=E7=85=A7=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84sql=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=96=87=E4=BB=B6=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/entity/QualityFileAssistent.java | 33 ++++++++++++ .../lims/goods/mapper/GoodsMapper.xml | 2 +- .../controller/QualityFileController.java | 25 ++++++++- .../controller/StorageFileController.java | 37 +++++++++++-- .../mapper/QualityFileAssistentMapper.java | 12 +++++ .../service/IQualityFileAssistentService.java | 11 ++++ .../file/service/IQualityFileService.java | 4 ++ .../file/service/IStorageFileService.java | 2 +- .../impl/QualityFileAssistentServiceImpl.java | 16 ++++++ .../service/impl/QualityFileServiceImpl.java | 54 ++++++++++++++++--- .../service/impl/StorageFileServiceImpl.java | 18 ++++++- 11 files changed, 197 insertions(+), 17 deletions(-) create mode 100644 lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java create mode 100644 lab-service/lab-file/src/main/java/org/springblade/file/mapper/QualityFileAssistentMapper.java create mode 100644 lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java create mode 100644 lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java new file mode 100644 index 0000000..2dbbdb9 --- /dev/null +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityFileAssistent.java @@ -0,0 +1,33 @@ +package org.springblade.file.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serializable; + +/** + * 质量文件实体类副表 + * @Description + * @Author ytl + * @Date 2022/9/22 0022 17:51 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("t_quality_file_assistant") +@ApiModel(value = "QualityFile对象的子类", description = "质量文件子类") +public class QualityFileAssistent extends BaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + private Long qualityFileId; + + private String version; + + private String versionContent; + + private String name; + + private Integer status; +} diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml index 1f7ed10..9a5c82f 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml @@ -4,7 +4,7 @@ \ No newline at end of file From 9f9c22e8a82feeeff21157d7b7a109984b9eff28 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 23 Sep 2022 16:58:45 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/entity/QualityStorageFileRel.java | 4 ++ .../capital/controller/CommandController.java | 62 +++++++++++++++++++ .../springblade/lims/commands/Command.java | 22 +++++++ .../commands/commandutils/CommandTest.java | 27 ++++++++ .../service/impl/QualityFileServiceImpl.java | 8 ++- .../lims/controller/EntrustController.java | 50 +++++++++++++-- 6 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CommandController.java create mode 100644 lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java create mode 100644 lab-service/lab-capital/src/main/java/org/springblade/lims/commands/commandutils/CommandTest.java diff --git a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityStorageFileRel.java b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityStorageFileRel.java index 0e94dd3..4ae492e 100644 --- a/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityStorageFileRel.java +++ b/lab-service-api/lab-file-api/src/main/java/org/springblade/file/entity/QualityStorageFileRel.java @@ -59,6 +59,10 @@ public class QualityStorageFileRel extends BaseEntity implements Serializable { @ApiModelProperty(value = "文件id") @NotNull private Long storageFileId; + + @ApiModelProperty(value = "文件附表id") + @NotNull + private Long qualityFileAssistantId; /** * 排序号 */ diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CommandController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CommandController.java new file mode 100644 index 0000000..59432a0 --- /dev/null +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/capital/controller/CommandController.java @@ -0,0 +1,62 @@ +package org.springblade.lims.capital.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.apache.poi.ss.formula.functions.T; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.SpringUtil; +import org.springblade.core.tool.utils.StringUtil; +import org.springblade.lims.commands.Command; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @Description 扫描枪扫描执行命令相关 + * @Author ytl + * @Date 2022/9/23 0023 14:29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/command") +@Api(value = "扫描枪扫描执行命令相关", tags = "扫描枪扫描执行命令相关") +public class CommandController extends BladeController { + + + @GetMapping("/execute") + @ApiOperation(value = "执行命令", notes = "传入扫描枪扫描的命令字符串，里面必然携带要执行的命令的名称") + public R execute(String commandStr){ + boolean result = false; + //解析commandStr + Map params = this.commandAnalysis(commandStr); + + Object bean = SpringUtil.getBean("command_" + String.valueOf(params.get("name"))); + if(bean instanceof Command){ + result = executeCommand((Command) bean, params); + } + + if(result){ + return R.success("命令执行成功"); + }else{ + return R.fail("命令执行失败，没有找到相关命令"); + } + } + + private boolean executeCommand(Command c, Map s){ + return c.execute(s); + } + + private Map commandAnalysis(String s){ + Map map = new ConcurrentHashMap<>(); + + //通过某种格式解析指令 + + map.put("name","test"); + return map; + } +} diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java new file mode 100644 index 0000000..d06a7ee --- /dev/null +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java @@ -0,0 +1,22 @@ +package org.springblade.lims.commands; + +import java.util.Map; + +/** + * @Description 命令的抽象类 + * @Author ytl + * @Date 2022/9/23 0023 14:16 + */ +public abstract class Command { + /** + * 命令的名称 + */ + String name; + + /** + * 命令的执行 + * @param params 命令的参数 + * @return true命令执行成功，false命令执行失败 + */ + public abstract boolean execute(Map params); +} diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/commandutils/CommandTest.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/commandutils/CommandTest.java new file mode 100644 index 0000000..08fa46d --- /dev/null +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/commandutils/CommandTest.java @@ -0,0 +1,27 @@ +package org.springblade.lims.commands.commandutils; + +import org.springblade.lims.commands.Command; +import org.springframework.stereotype.Component; + +import java.util.Map; + +/** + * @Description 测试命令 + * @Author ytl + * @Date 2022/9/23 0023 14:24 + */ +@Component("command_test") +public class CommandTest extends Command { + + private String name; + + public CommandTest(){ + this.name = "CommandTest"; + } + + + @Override + public boolean execute(Map params){ + return true; + } +} diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java index ed9b8e8..0dce65c 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java @@ -105,22 +105,26 @@ public class QualityFileServiceImpl extends BaseServiceImpl deptIds = qualityFile.getDeptIds(); qualityFileDeptRelService.saveBatch(deptIds.stream().map(deptId -> QualityFileDeptRel.builder().qualityFileId(qualityFileId).deptId(deptId).build()).collect(Collectors.toList())); Set fileRels = qualityFile.getFiles(); + //根据主表ID删除文件与存储关联的相关记录 qualityStorageFileRelService.removeByQualityFileId(qualityFileId); fileRels.forEach(dto -> dto.setQualityFileId(qualityFileId)); int pageCount = storageFileService.countPageCount(fileRels.stream().map(QualityStorageFileRel::getStorageFileId).collect(Collectors.toSet())); + //重新保存文件与存储关联关系 qualityStorageFileRelService.saveBatch(new ArrayList<>(fileRels)); qualityFile.setPageCount(pageCount); @@ -129,6 +133,8 @@ public class QualityFileServiceImpl extends BaseServiceImpl result = new HashMap<>(); + + ImageEntity farView = new ImageEntity(); + farView.setHeight(50);//设置高度 + farView.setWidth(90);//设置宽度 + farView.setType(ImageEntity.Data);//类型 + + FileInputStream fis = null; + try { +// fis = new FileInputStream(new File(s1)); +// byte[] bytes = readInputStream(fis); + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + ImageIO.write(img, "png",bos ); + byte[] bytes = bos.toByteArray(); + farView.setData(bytes); + //farView.setData(bytes); + } catch (Exception e) { + e.printStackTrace(); + } + result.put("img", farView); + //ImageIO.write(img, "png", outFile); + // Desktop.getDesktop().open(outFile); } - + /** + * 读输入流 + */ + private static byte[] readInputStream(InputStream inStream) throws Exception { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int len = 0; + while ((len = inStream.read(buffer)) != -1) { + outStream.write(buffer, 0, len); + } + inStream.close(); + return outStream.toByteArray(); + } /** * 24.获取委托单 */ From 3996a6ab7d277b064afdb2cf4941b8734393729a Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 23 Sep 2022 17:06:04 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A3=80=E5=AE=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/service/IQualityFileAssistentService.java | 1 + .../service/impl/QualityFileAssistentServiceImpl.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java index c23025e..b9b0300 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/IQualityFileAssistentService.java @@ -8,4 +8,5 @@ import org.springblade.core.mp.base.BaseService; * @Date 2022/9/22 0022 18:14 */ public interface IQualityFileAssistentService extends BaseService { + boolean addOrUpdate(QualityFileAssistent file); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java index 8ab9deb..0bf399b 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileAssistentServiceImpl.java @@ -13,4 +13,14 @@ import org.springframework.stereotype.Service; */ @Service public class QualityFileAssistentServiceImpl extends BaseServiceImpl implements IQualityFileAssistentService { + @Override + public boolean addOrUpdate(QualityFileAssistent file) { + + if (file.getId() != null) { + this.updateById(file); + }else{ + this.save(file); + } + return true; + } } From 7700b5d0def6549921595c654bcfb43a706827d7 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 23 Sep 2022 17:07:24 +0800 Subject: [PATCH 8/8] 1 --- .../QualityFileAssistentController.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java new file mode 100644 index 0000000..8d70958 --- /dev/null +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileAssistentController.java @@ -0,0 +1,39 @@ +package org.springblade.file.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springblade.file.entity.QualityFileAssistent; +import org.springblade.file.mapper.QualityStorageFileRelMapper; +import org.springblade.file.service.IQualityFileAssistentService; +import org.springblade.file.service.impl.QualityFileAssistentServiceImpl; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 质量文件版本管理 + * @Description + * @Author ytl + * @Date 2022/9/23 0023 16:28 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/qualityfileassistent") +@Api(value = "质量文件版本") +public class QualityFileAssistentController extends BladeController { + + private final IQualityFileAssistentService qualityFileAssistentService; + + @PutMapping("/update") + public R update(QualityFileAssistent file){ + return R.data(qualityFileAssistentService.addOrUpdate(file)) ; + } + + @DeleteMapping("/delete") + public R delete(QualityFileAssistent file){ + return R.data(qualityFileAssistentService.removeById(file)); + } +}