From 379222715511cc4d6efd4abbbb3463f5485f590d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:27:30 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 261 insertions(+), 0 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java b/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java
new file mode 100644
index 0000000..4839fa0
--- /dev/null
+++ b/cnas-require/src/main/java/com/ruoyi/requier/controller/DeviceController.java
@@ -0,0 +1,261 @@
+package com.ruoyi.requier.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
+import com.ruoyi.requier.dto.DataConfigDto;
+import com.ruoyi.requier.dto.DeviceDto;
+import com.ruoyi.requier.pojo.Device;
+import com.ruoyi.requier.pojo.PkMaster;
+import com.ruoyi.requier.service.DataConfigService;
+import com.ruoyi.requier.service.DeviceService;
+import com.ruoyi.requier.service.PkMasterService;
+import com.ruoyi.system.mapper.UserMapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 璁惧(DeviceController)琛ㄦ帶鍒跺眰
+ */
+@Api(tags = "璁惧")
+@RestController
+@RequestMapping("/deviceScope")
+public class DeviceController {
+
+ @Resource
+ private UserMapper userMapper;
+ @Resource
+ private DeviceService deviceService;
+
+ @Value("${file.path}")
+ private String filePath;
+
+ @Autowired
+ private DataConfigService dataConfigService;
+
+ @Autowired
+ private PkMasterService pkMasterService;
+
+ /**
+ * 鑾峰彇浜哄憳淇℃伅
+ * @return
+ * @throws Exception
+ */
+ @GetMapping("/selectUserList")
+ public Result selectUserList() {
+ return Result.success(deviceService.selectUserList());
+ }
+
+ /**
+ * 鏍规嵁departLimsId 鑾峰彇浜哄憳 (selectUserList鍓嶇璋冪敤鎺ュ彛澶 瀹规槗鎶ラ敊)
+ */
+ @GetMapping("/selectUserListByDepartLimsId")
+ public Result selectUserListByDepartLimsId(String departLimsId) {
+ return Result.success(deviceService.selectUserListByDepartLimsId(departLimsId));
+ }
+
+
+ @ApiOperation(value = "鏌ョ湅璁惧浜岀淮鐮佹寜閽�")
+ @GetMapping("/showDeviceQrCodeButton")
+ public void showDeviceQrCodeButton() { }
+
+ //璁惧宸ュ叿鏄庣粏
+ @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
+ @GetMapping("/selectDeviceParameter")
+ public Result selectDeviceParameter(Page page,DeviceDto deviceDto,Boolean laboratoryNameIsNull) {
+ return Result.success(deviceService.selectDeviceParameter(page, deviceDto, laboratoryNameIsNull));
+ }
+
+ @ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
+ @PostMapping("/addDeviceParameter")
+ public Result addDeviceParameter(@RequestBody Device itemParameter) {
+ return Result.success(deviceService.addDeviceParameter(itemParameter));
+ }
+
+ @ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
+ @DeleteMapping("/delDeviceParameter")
+ public Result<?> delDeviceParameter(Integer id) {
+ return Result.success(deviceService.delDeviceParameter(id));
+ }
+
+ @ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
+ @PostMapping("/upDeviceParameter")
+ public Result<?> upDeviceParameter(@RequestBody Device itemParameter) {
+ return Result.success(deviceService.upDeviceParameter(itemParameter));
+ }
+
+ @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+ @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+ public Result<?> isItAllowedToModifyTheCollectedValues() {
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鑾峰彇璁惧鎬昏")
+ @GetMapping("/selectEquipmentOverview")
+ public Result selectEquipmentOverview() {
+ return Result.success(deviceService.selectEquipmentOverview());
+ }
+
+ @ApiOperation(value = "鑾峰彇琚巿鏉冧汉")
+ @GetMapping("/authorizedPerson")
+ public Result authorizedPerson() {
+ return Result.success(deviceService.authorizedPerson());
+ }
+
+ @ApiOperation(value = "鎼滅储")
+ @GetMapping("/search")
+ public Result search(Integer status, String deviceName, String specificationModel, String largeCategory) {
+ return Result.success(deviceService.search(status, deviceName, specificationModel, largeCategory));
+ }
+
+ //鍥剧墖涓婁紶
+ @ApiOperation(value = "璁惧鍥剧墖涓婁紶")
+ @PostMapping("/uploadFile")
+ public Result uploadFile(MultipartFile file) {
+
+ System.out.println(file);
+ String urlString;
+ String pathName;
+ String filename = file.getOriginalFilename();
+ try {
+ String path = filePath;
+ File realpath = new File(path);
+ if (!realpath.exists()) {
+ realpath.mkdirs();
+ }
+ pathName = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMdd")) + "-" + file.getOriginalFilename();
+ urlString = realpath + "/" + pathName;
+ file.transferTo(new File(urlString));
+ HashMap<String, String> map = new HashMap<>();
+ map.put("name", filename);
+ map.put("url", pathName);
+ return Result.success(map);
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.err.println("鍥剧墖涓婁紶閿欒");
+ return null;
+ }
+ }
+
+ @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
+ @GetMapping("/selectDevicePrincipal")
+ public Result selectDevicePrincipal() {
+ return Result.success(deviceService.selectDevicePrincipal());
+ }
+
+ @ApiOperation(value = "閫氳繃椤圭洰鑾峰彇璁惧鍒楄〃")
+ @PostMapping("/selectDeviceByCategory")
+ public Result selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass,String sonLaboratory) {
+ return Result.success(deviceService.selectDeviceByCategory(inspectionItem, inspectionItemSubclass,sonLaboratory));
+ }
+
+ @ApiOperation(value = "閫氳繃璁惧缂栧彿鑾峰彇璁惧鍒楄〃")
+ @GetMapping("/selectDeviceByCode")
+ public Result<DeviceDto> selectDeviceByCode(Integer id) {
+ return Result.success(deviceService.selectDeviceByCode(id));
+ }
+
+ /**
+ *
+ * @param request 鍙栬姹備腑鐨刬p
+ * @param id 妫�楠屾牱鍝� 涓婚敭id
+ * @param entrustCode 濮旀墭缂栧彿
+ * @param sampleCode 鏍峰搧缂栧彿
+ * @param fiberOpticRibbon 鍏夌氦甯︾紪鍙�
+ * @return
+ */
+ @ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
+ @GetMapping("/dataCollection")
+ public Result<?> dataAcquisition(HttpServletRequest request,
+ @RequestParam("id") Integer id,
+ @RequestParam("entrustCode") String entrustCode,
+ @RequestParam("sampleCode") String sampleCode,
+ @RequestParam(value = "fiberOpticRibbon", required = false) String fiberOpticRibbon) {
+ return deviceService.dataAcquisition(request, id, entrustCode, sampleCode, fiberOpticRibbon);
+ }
+
+ @ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
+ @GetMapping("/determineWhetherToCollectData")
+ public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
+ return deviceService.determineWhetherToCollectData(managementNumber, request);
+ }
+
+ @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
+ @PostMapping("/saveDataAcquisitionConfiguration")
+ public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+ @GetMapping("/queryDataAcquisitionConfiguration")
+ public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId,
+ @RequestParam("isDevice") Boolean isDevice,
+ @RequestParam(value = "inspectionItem", required = false) String inspectionItem,
+ @RequestParam(value = "inspectionItemSubclass", required = false) String inspectionItemSubclass) {
+ return dataConfigService.queryDataAcquisitionConfiguration(deviceId, isDevice, inspectionItem, inspectionItemSubclass);
+ }
+
+ @ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
+ @DeleteMapping("/deleteDataAcquisitionConfiguration")
+ public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
+ List<String> split = Arrays.asList(ids.split(","));
+ List<String> collect = split.stream().distinct().collect(Collectors.toList());
+ dataConfigService.removeBatchByIds(collect);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鑿滃崟")
+ @PostMapping("/menu")
+ public Result menu() {
+ return Result.success(deviceService.menu());
+ }
+
+
+ @ApiOperation(value = "娓╁害寰幆鏁伴噰")
+ @PostMapping("/temDataAcquisition")
+ public Result<?> temDataAcquisition(@RequestBody PkMaster pkMaster) {
+ return Result.success(pkMasterService.temDataAcquisition(pkMaster));
+ }
+
+ @ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
+ @GetMapping("/treeDevice")
+ public Result treeDevice(String deviceName) {
+ return Result.success(deviceService.treeDevice(deviceName));
+ }
+
+
+ @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
+ @PostMapping("/temDataAcquisition2")
+ public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
+ return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
+ }
+
+ @ApiOperation(value = "鍒楄〃缁熻瀵煎嚭")
+ @PostMapping("/export")
+ public void exportData(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
+// DeviceDto deviceDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
+// deviceService.export(deviceDto,response);
+ }
+
+
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.3