设备列表查询接口修改

zhuo

2025-02-15 74205424049d169a8d3bbabb74b4c8c9adf1ec99

 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -1,21 +1,17 @@
package com.yuanchu.mom.controller;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.DataConfig;
import com.yuanchu.mom.pojo.Device;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.utils.DataAcquisition;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -24,12 +20,15 @@

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)表控制层
@@ -47,26 +46,40 @@
    @Autowired
    private DataConfigService dataConfigService;

    /**
     * 获取人员信息
     * @return
     * @throws Exception
     */
    @ValueAuth
    @GetMapping("/selectUserList")
    public Result selectUserList() {
        return  Result.success(deviceService.selectUserList());
    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询设备详情列表")
    @PostMapping("/selectDeviceParameter")
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data) throws Exception {
    public Result selectDeviceParameter(@RequestBody Map<String, Object> data,@RequestParam(value = "laboratoryNameIsNull", required = false) Boolean laboratoryNameIsNull) throws Exception {
        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
        DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
        return Result.success(deviceService.selectDeviceParameter(page, itemParameter,laboratoryNameIsNull));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "添加设备详情参数")
    @PostMapping("/addDeviceParameter")
    public Result addDeviceParameter(@RequestBody Device itemParameter) {
        return Result.success(deviceService.addDeviceParameter(itemParameter));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "删除设备详情参数")
    @PostMapping("/delDeviceParameter")
    public Result<?> delDeviceParameter(Integer id) {
        return Result.success(deviceService.delDeviceParameter(id));
    }

    @ValueClassify("设备")
    @ApiOperation(value = "修改设备详情参数")
    @PostMapping("/upDeviceParameter")
@@ -138,61 +151,84 @@
    }

    @ApiOperation(value = "通过设备编号获取设备列表")
    @PostMapping("/selectDeviceByCode")
    @GetMapping("/selectDeviceByCode")
    @ValueAuth
    public Result selectDeviceByCode(String code) {
        return Result.success(deviceService.selectDeviceByCode(code));
    public Result selectDeviceByCode(Integer id) {
        return Result.success(deviceService.selectDeviceByCode(id));
    }

//    @ValueClassify("设备")
//    @ApiOperation(value = "查询数采配置")
//    @PostMapping("/getNumberCollect")
//    public Result<?> getNumberCollect(Integer id) {
//        DeviceDto1 deviceDto1 = new DeviceDto1();
//        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
//        return Result.success(deviceDto1);
//    }
//
//    @ValueClassify("设备")
//    @ApiOperation(value = "维护数采配置")
//    @PostMapping("/numberCollect")
//    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
//        Device device = new Device();
//        BeanUtils.copyProperties(deviceDto1,device);
//        return Result.success(deviceService.updateById(device));
//    }
    @ValueAuth
    @ValueClassify("设备")
    @ApiOperation("/数采-数据采集")
    @GetMapping("/dataCollection")
    public Result<?> dataAcquisition(HttpServletRequest request, @RequestParam("id") Integer id,
                                     @RequestParam("entrustCode") String entrustCode,
                                     @RequestParam("sampleCode") String sampleCode) {
        return deviceService.dataAcquisition(request, id, entrustCode, sampleCode);
    }

    @ValueAuth
    @ApiModelProperty("/数采")
    @GetMapping("/text")
    public Result<?> text(HttpServletRequest request) {
        return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device()));
    @ApiOperation(value = "判断该设备是否可以数采")
    @GetMapping("/determineWhetherToCollectData")
    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
        return deviceService.determineWhetherToCollectData(managementNumber, request);
    }

    @ValueClassify("设备")
    @ApiOperation(value = "维护数采配置")
    @PostMapping("/saveDataAcquisitionConfiguration")
    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
        dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
        return Result.success();
    }

    @ValueClassify("设备")
    @ApiOperation(value = "查询数采配置")
    @GetMapping("/queryDataAcquisitionConfiguration")
    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                .eq(DataConfig::getDeviceId, deviceId)
                .eq(DataConfig::getInsProductItem, insProductItem));
        return Result.success(list);
    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);
    }

    @ValueClassify("设备")
    @ApiOperation(value = "删除数采配置")
    @DeleteMapping("/deleteDataAcquisitionConfiguration")
    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
        dataConfigService.removeById(id);
    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();
    }
}

    @ValueAuth
    @ApiOperation(value = "菜单")
    @PostMapping("/menu")
    public Result menu() {
        return Result.success(deviceService.menu());
    }


    @ApiOperation(value = "左侧设备树形栏")
    @GetMapping("/treeDevice")
    @ValueAuth
    public Result treeDevice(String deviceName) {
        return Result.success(deviceService.treeDevice(deviceName));
    }

    @ApiOperation(value = "设备档案导出")
    @GetMapping("/exportDeviceFile")
    @ValueAuth
    public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
        deviceService.exportDeviceFile(deviceId,response);
    }

    @ApiOperation(value = "仪器设备一览表导出")
    @GetMapping("/exportEquipmentDetails")
    @ValueAuth
    public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
        deviceService.exportEquipmentDetails(response);
    }

}