#update
This commit is contained in:
@@ -3,37 +3,20 @@ package com.maibu.web.controller.system;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.maibu.annotation.Log;
|
||||
import com.maibu.core.business.Device;
|
||||
import com.maibu.core.business.DeviceModel;import com.maibu.core.business.DeviceRunStatistics;
|
||||
import com.maibu.core.business.DeviceModel;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.enums.ConnectType;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.enums.BusinessType;
|
||||
import com.maibu.mapper.DeviceRunStatisticsMapper;
|
||||
import com.maibu.mybatis.LambdaQueryWrapperX;
|
||||
import com.maibu.service.IDeviceService;
|
||||
import com.maibu.service.SysDeviceModelService;
|
||||
import com.maibu.service.impl.SysDeviceModelService;
|
||||
import com.maibu.utils.ServletUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.poi.ss.usermodel.Row;
|
||||
import org.apache.poi.ss.usermodel.Sheet;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.OutputStream;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLEncoder;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
@@ -1,25 +1,19 @@
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.maibu.core.business.IoTCommonDevice;
|
||||
import com.maibu.core.business.Product;
|
||||
import com.maibu.core.business.dto.DeviceConfigDTO;
|
||||
import com.maibu.core.business.dto.ProductDTO;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.memory.GlobalMemory;
|
||||
import com.maibu.service.DeviceProductService;
|
||||
import com.maibu.service.IotDeviceCommonService;
|
||||
import com.maibu.service.impl.IotDeviceCommonService;
|
||||
import com.maibu.utils.ServletUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -84,10 +78,11 @@ public class SysIotCommDeviceController extends BaseController {
|
||||
/**
|
||||
* 删除设备
|
||||
*/
|
||||
@DeleteMapping("/{id}")
|
||||
@PostMapping("/delete")
|
||||
@ApiOperation("删除设备")
|
||||
public AjaxResult remove(@PathVariable Long id) {
|
||||
return toAjax(deviceService.removeById(id) ? 1 : 0);
|
||||
public AjaxResult remove(@RequestBody List<Long> ids) {
|
||||
deviceService.removeByIds(ids);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
|
||||
@@ -119,4 +114,5 @@ public class SysIotCommDeviceController extends BaseController {
|
||||
return AjaxResult.success("缓存更新成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,25 +1,16 @@
|
||||
package com.maibu.web.controller.system;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import com.maibu.core.business.DeviceModel;
|
||||
import com.maibu.core.business.Product;
|
||||
import com.maibu.core.business.dto.ProductDTO;
|
||||
import com.maibu.core.controller.BaseController;
|
||||
import com.maibu.core.domain.AjaxResult;
|
||||
import com.maibu.core.page.TableDataInfo;
|
||||
import com.maibu.service.DeviceProductService;
|
||||
import com.maibu.service.SysDeviceModelService;
|
||||
import com.maibu.utils.ServletUtils;
|
||||
import com.maibu.service.impl.DeviceProductService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -39,92 +30,30 @@ public class SysProductController extends BaseController {
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("查询产品列表")
|
||||
public TableDataInfo list(ProductDTO productDTO) {
|
||||
Integer pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
|
||||
Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
|
||||
|
||||
Page<Product> page = new Page<>(pageNum, pageSize);
|
||||
|
||||
// DTO 转 Entity 用于查询筛选
|
||||
Product product = new Product();
|
||||
BeanUtils.copyProperties(productDTO, product);
|
||||
|
||||
Page<Product> resultPage = productService.selectProductPage(page, product);
|
||||
return getDataTable(resultPage.getRecords(), resultPage.getTotal());
|
||||
List<Product> resultPage = productService.selectProductPage(productDTO);
|
||||
return getDataTable(resultPage);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增产品
|
||||
* 新增产品/修改
|
||||
*/
|
||||
//@PreAuthorize("@ss.hasPermi('iot:product:add')")
|
||||
@PostMapping("/add")
|
||||
@PostMapping("/save")
|
||||
@ApiOperation("新增产品")
|
||||
public AjaxResult add(@RequestBody ProductDTO productDTO) {
|
||||
if (productDTO.getName() == null || productDTO.getName().isEmpty()) {
|
||||
return AjaxResult.error("产品名称不能为空");
|
||||
}
|
||||
if (productDTO.getCode() == null || productDTO.getCode().isEmpty()) {
|
||||
return AjaxResult.error("产品编码不能为空");
|
||||
}
|
||||
|
||||
// 检查编码是否重复
|
||||
Product existProduct = productService.selectByCode(productDTO.getCode());
|
||||
if (existProduct != null) {
|
||||
return AjaxResult.error("产品编码已存在");
|
||||
}
|
||||
|
||||
// DTO 转 Entity
|
||||
Product product = new Product();
|
||||
BeanUtils.copyProperties(productDTO, product);
|
||||
product.setCreateTime(LocalDateTime.now());
|
||||
product.setDelFlag(false);
|
||||
|
||||
boolean success = productService.save(product);
|
||||
return toAjax(success ? 1 : 0);
|
||||
public AjaxResult add(@RequestBody Product product) {
|
||||
return AjaxResult.success(productService.save(product));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改产品
|
||||
*/
|
||||
@PostMapping("/update")
|
||||
@ApiOperation("修改产品")
|
||||
public AjaxResult edit(@RequestBody ProductDTO productDTO) {
|
||||
if (productDTO.getId() == null) {
|
||||
return AjaxResult.error("产品 ID 不能为空");
|
||||
}
|
||||
|
||||
Product existProduct = productService.getById(productDTO.getId());
|
||||
if (existProduct == null) {
|
||||
return AjaxResult.error("产品不存在");
|
||||
}
|
||||
|
||||
// 如果修改了编码,检查是否重复
|
||||
if (productDTO.getCode() != null && !productDTO.getCode().equals(existProduct.getCode())) {
|
||||
Product duplicate = productService.selectByCode(productDTO.getCode());
|
||||
if (duplicate != null) {
|
||||
return AjaxResult.error("产品编码已存在");
|
||||
}
|
||||
}
|
||||
|
||||
// DTO 转 Entity
|
||||
Product product = new Product();
|
||||
BeanUtils.copyProperties(productDTO, product);
|
||||
product.setUpdateTime(LocalDateTime.now());
|
||||
|
||||
boolean success = productService.updateById(product);
|
||||
return toAjax(success ? 1 : 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除产品
|
||||
*/
|
||||
//@PreAuthorize("@ss.hasPermi('iot:product:remove')")
|
||||
@DeleteMapping("delete/{id}")
|
||||
@PostMapping("delete")
|
||||
@ApiOperation("删除产品")
|
||||
public AjaxResult remove(@PathVariable Long id) {
|
||||
boolean success = productService.removeById(id);
|
||||
return toAjax(success ? 1 : 0);
|
||||
public AjaxResult remove(@RequestBody List<Long> ids) {
|
||||
return AjaxResult.success(productService.removeByIds(ids));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user