From ae2d52827d289dd985014a63c08b0913d083b215 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 09 四月 2024 08:48:38 +0800
Subject: [PATCH] 去掉opc相关业务
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java | 410 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 205 insertions(+), 205 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
index fdb5f5a..58dbb08 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryOpcDeviceController.java
@@ -1,205 +1,205 @@
-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.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);
+// }
+//
+//}
--
Gitblit v1.9.3