feat(dry): 添加工单ID查询故障记录功能 - 在 DryOpcDeviceController、OpcController 和 OpcCus...

bsw215583320

2024-11-25 e434aa108151ca8c5b5f430be51eefdb6ef7c309

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java

@@ -1,205 +1,207 @@
//package org.jeecg.modules.dry.controller;
//
//import java.util.Arrays;
//import java.util.List;
//import java.util.Map;
//import java.util.stream.Collectors;
//import java.io.IOException;
//import java.io.UnsupportedEncodingException;
//import java.net.URLDecoder;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//
//import com.kangaroohy.milo.model.ReadWriteEntity;
//import com.kangaroohy.milo.service.MiloService;
//import org.jeecg.common.api.vo.Result;
//import org.jeecg.common.system.query.QueryGenerator;
//import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.dry.entity.DryOpcDevice;
//import org.jeecg.modules.dry.service.IDryOpcDeviceService;
//
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import lombok.extern.slf4j.Slf4j;
//
//import org.jeecgframework.poi.excel.ExcelImportUtil;
//import org.jeecgframework.poi.excel.def.NormalExcelConstants;
//import org.jeecgframework.poi.excel.entity.ExportParams;
//import org.jeecgframework.poi.excel.entity.ImportParams;
//import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
//import org.jeecg.common.system.base.controller.JeecgController;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//import org.springframework.web.multipart.MultipartFile;
//import org.springframework.web.multipart.MultipartHttpServletRequest;
//import org.springframework.web.servlet.ModelAndView;
//import com.alibaba.fastjson.JSON;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.jeecg.common.aspect.annotation.AutoLog;
//import org.apache.shiro.authz.annotation.RequiresPermissions;
//
// /**
// * @Description: dry_opc_device
// * @Author: jeecg-boot
// * @Date:   2023-11-28
// * @Version: V1.0
// */
//@Api(tags="dry_opc_device")
//@RestController
//@RequestMapping("/dry/dryOpcDevice")
//@Slf4j
//public class DryOpcDeviceController extends JeecgController<DryOpcDevice, IDryOpcDeviceService> {
//   @Autowired
//   private IDryOpcDeviceService dryOpcDeviceService;
//
//
//   @Autowired
//   private MiloService miloService;
//
//
//   /**
//    * 分页列表查询
//    *
//    * @param dryOpcDevice
//    * @param pageNo
//    * @param pageSize
//    * @param req
//    * @return
//    */
//   //@AutoLog(value = "dry_opc_device-分页列表查询")
//   @ApiOperation(value="dry_opc_device-分页列表查询", notes="dry_opc_device-分页列表查询")
//   @GetMapping(value = "/list")
//   public Result<IPage<DryOpcDevice>> queryPageList(DryOpcDevice dryOpcDevice,
//                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
//                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
//                           HttpServletRequest req) {
//      QueryWrapper<DryOpcDevice> queryWrapper = QueryGenerator.initQueryWrapper(dryOpcDevice, req.getParameterMap());
//      Page<DryOpcDevice> page = new Page<DryOpcDevice>(pageNo, pageSize);
//      IPage<DryOpcDevice> pageList = dryOpcDeviceService.page(page, queryWrapper);
//      return Result.OK(pageList);
//   }
//
//    @GetMapping(value = "/listAll")
//    public Result<List<DryOpcDevice>> queryList(DryOpcDevice dryOpcDevice,
//
//                                         HttpServletRequest req) {
//       QueryWrapper<DryOpcDevice> queryWrapper = QueryGenerator.initQueryWrapper(dryOpcDevice, req.getParameterMap());
//       queryWrapper.orderByAsc("sort_order");
//       List<DryOpcDevice> list = dryOpcDeviceService.list(queryWrapper);
//      list.forEach(item -> {
//         try {
//            ReadWriteEntity readWriteEntity = miloService.readFromOpcUa(item.getIdentifier());
//            item.setValue((Boolean) readWriteEntity.getValue());
//         } catch (Exception e) {
//            throw new RuntimeException(e);
//         }
//      });
//       return Result.OK(list);
//    }
//
//
//   /**
//    *   添加
//    *
//    * @param dryOpcDevice
//    * @return
//    */
//   @AutoLog(value = "dry_opc_device-添加")
//   @ApiOperation(value="dry_opc_device-添加", notes="dry_opc_device-添加")
//   @RequiresPermissions("dry:dry_opc_device:add")
//   @PostMapping(value = "/add")
//   public Result<String> add(@RequestBody DryOpcDevice dryOpcDevice) {
//      dryOpcDeviceService.save(dryOpcDevice);
//      return Result.OK("添加成功！");
//   }
//
//   /**
//    *  编辑
//    *
//    * @param dryOpcDevice
//    * @return
//    */
//   @AutoLog(value = "dry_opc_device-编辑")
//   @ApiOperation(value="dry_opc_device-编辑", notes="dry_opc_device-编辑")
//   @RequiresPermissions("dry:dry_opc_device:edit")
//   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
//   public Result<String> edit(@RequestBody DryOpcDevice dryOpcDevice) {
//      dryOpcDeviceService.updateById(dryOpcDevice);
//      return Result.OK("编辑成功!");
//   }
//
//   /**
//    *   通过id删除
//    *
//    * @param id
//    * @return
//    */
//   @AutoLog(value = "dry_opc_device-通过id删除")
//   @ApiOperation(value="dry_opc_device-通过id删除", notes="dry_opc_device-通过id删除")
//   @RequiresPermissions("dry:dry_opc_device:delete")
//   @DeleteMapping(value = "/delete")
//   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
//      dryOpcDeviceService.removeById(id);
//      return Result.OK("删除成功!");
//   }
//
//   /**
//    *  批量删除
//    *
//    * @param ids
//    * @return
//    */
//   @AutoLog(value = "dry_opc_device-批量删除")
//   @ApiOperation(value="dry_opc_device-批量删除", notes="dry_opc_device-批量删除")
//   @RequiresPermissions("dry:dry_opc_device:deleteBatch")
//   @DeleteMapping(value = "/deleteBatch")
//   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
//      this.dryOpcDeviceService.removeByIds(Arrays.asList(ids.split(",")));
//      return Result.OK("批量删除成功!");
//   }
//
//   /**
//    * 通过id查询
//    *
//    * @param id
//    * @return
//    */
//   //@AutoLog(value = "dry_opc_device-通过id查询")
//   @ApiOperation(value="dry_opc_device-通过id查询", notes="dry_opc_device-通过id查询")
//   @GetMapping(value = "/queryById")
//   public Result<DryOpcDevice> queryById(@RequestParam(name="id",required=true) String id) {
//      DryOpcDevice dryOpcDevice = dryOpcDeviceService.getById(id);
//      if(dryOpcDevice==null) {
//         return Result.error("未找到对应数据");
//      }
//      return Result.OK(dryOpcDevice);
//   }
//
//    /**
//    * 导出excel
//    *
//    * @param request
//    * @param dryOpcDevice
//    */
//    @RequiresPermissions("dry:dry_opc_device:exportXls")
//    @RequestMapping(value = "/exportXls")
//    public ModelAndView exportXls(HttpServletRequest request, DryOpcDevice dryOpcDevice) {
//        return super.exportXls(request, dryOpcDevice, DryOpcDevice.class, "dry_opc_device");
//    }
//
//    /**
//      * 通过excel导入数据
//    *
//    * @param request
//    * @param response
//    * @return
//    */
//    @RequiresPermissions("dry:dry_opc_device:importExcel")
//    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
//    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
//        return super.importExcel(request, response, DryOpcDevice.class);
//    }
//
//}
package org.jeecg.modules.dry.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.dry.entity.DryOpcDevice;
import org.jeecg.modules.dry.service.IDryOpcDeviceService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;

 /**
 * @Description: dry_opc_device
 * @Author: jeecg-boot
 * @Date:   2023-11-28
 * @Version: V1.0
 */
@Api(tags="dry_opc_device")
@RestController
@RequestMapping("/dry/dryOpcDevice")
@Slf4j
@ConditionalOnProperty(name = "kangaroohy.milo.enabled", havingValue = "true")
public class DryOpcDeviceController extends JeecgController<DryOpcDevice, IDryOpcDeviceService> {
   @Autowired
   private IDryOpcDeviceService dryOpcDeviceService;


   @Autowired
   private MiloService miloService;


   /**
    * 分页列表查询
    *
    * @param dryOpcDevice
    * @param pageNo
    * @param pageSize
    * @param req
    * @return
    */
   //@AutoLog(value = "dry_opc_device-分页列表查询")
   @ApiOperation(value="dry_opc_device-分页列表查询", notes="dry_opc_device-分页列表查询")
   @GetMapping(value = "/list")
   public Result<IPage<DryOpcDevice>> queryPageList(DryOpcDevice dryOpcDevice,
                           @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                           @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                           HttpServletRequest req) {
      QueryWrapper<DryOpcDevice> queryWrapper = QueryGenerator.initQueryWrapper(dryOpcDevice, req.getParameterMap());
      Page<DryOpcDevice> page = new Page<DryOpcDevice>(pageNo, pageSize);
      IPage<DryOpcDevice> pageList = dryOpcDeviceService.page(page, queryWrapper);
      return Result.OK(pageList);
   }

    @GetMapping(value = "/listAll")
    public Result<List<DryOpcDevice>> queryList(DryOpcDevice dryOpcDevice,

                                         HttpServletRequest req) {
       QueryWrapper<DryOpcDevice> queryWrapper = QueryGenerator.initQueryWrapper(dryOpcDevice, req.getParameterMap());
       queryWrapper.orderByAsc("sort_order");
       List<DryOpcDevice> list = dryOpcDeviceService.list(queryWrapper);
      list.forEach(item -> {
         try {
            ReadWriteEntity readWriteEntity = miloService.readFromOpcUa(item.getIdentifier());
            item.setValue((Boolean) readWriteEntity.getValue());
         } catch (Exception e) {
            throw new RuntimeException(e);
         }
      });
       return Result.OK(list);
    }


   /**
    *   添加
    *
    * @param dryOpcDevice
    * @return
    */
   @AutoLog(value = "dry_opc_device-添加")
   @ApiOperation(value="dry_opc_device-添加", notes="dry_opc_device-添加")
   @RequiresPermissions("dry:dry_opc_device:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody DryOpcDevice dryOpcDevice) {
      dryOpcDeviceService.save(dryOpcDevice);
      return Result.OK("添加成功！");
   }

   /**
    *  编辑
    *
    * @param dryOpcDevice
    * @return
    */
   @AutoLog(value = "dry_opc_device-编辑")
   @ApiOperation(value="dry_opc_device-编辑", notes="dry_opc_device-编辑")
   @RequiresPermissions("dry:dry_opc_device:edit")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public Result<String> edit(@RequestBody DryOpcDevice dryOpcDevice) {
      dryOpcDeviceService.updateById(dryOpcDevice);
      return Result.OK("编辑成功!");
   }

   /**
    *   通过id删除
    *
    * @param id
    * @return
    */
   @AutoLog(value = "dry_opc_device-通过id删除")
   @ApiOperation(value="dry_opc_device-通过id删除", notes="dry_opc_device-通过id删除")
   @RequiresPermissions("dry:dry_opc_device:delete")
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      dryOpcDeviceService.removeById(id);
      return Result.OK("删除成功!");
   }

   /**
    *  批量删除
    *
    * @param ids
    * @return
    */
   @AutoLog(value = "dry_opc_device-批量删除")
   @ApiOperation(value="dry_opc_device-批量删除", notes="dry_opc_device-批量删除")
   @RequiresPermissions("dry:dry_opc_device:deleteBatch")
   @DeleteMapping(value = "/deleteBatch")
   public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      this.dryOpcDeviceService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功!");
   }

   /**
    * 通过id查询
    *
    * @param id
    * @return
    */
   //@AutoLog(value = "dry_opc_device-通过id查询")
   @ApiOperation(value="dry_opc_device-通过id查询", notes="dry_opc_device-通过id查询")
   @GetMapping(value = "/queryById")
   public Result<DryOpcDevice> queryById(@RequestParam(name="id",required=true) String id) {
      DryOpcDevice dryOpcDevice = dryOpcDeviceService.getById(id);
      if(dryOpcDevice==null) {
         return Result.error("未找到对应数据");
      }
      return Result.OK(dryOpcDevice);
   }

    /**
    * 导出excel
    *
    * @param request
    * @param dryOpcDevice
    */
    @RequiresPermissions("dry:dry_opc_device:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, DryOpcDevice dryOpcDevice) {
        return super.exportXls(request, dryOpcDevice, DryOpcDevice.class, "dry_opc_device");
    }

    /**
      * 通过excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    @RequiresPermissions("dry:dry_opc_device:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, DryOpcDevice.class);
    }

}