diff --git a/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java b/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java index 383ae8f..2bf2cae 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java +++ b/agri-system/src/main/java/com/agri/system/controller/SysAgriInfoController.java @@ -4,11 +4,16 @@ import com.agri.common.annotation.Log; import com.agri.common.core.controller.BaseController; import com.agri.common.core.domain.AjaxResult; import com.agri.common.core.page.TableDataInfo; +import com.agri.common.enums.AgriEnum; import com.agri.common.enums.BusinessType; +import com.agri.common.utils.SecurityUtils; import com.agri.common.utils.poi.ExcelUtil; import com.agri.system.domain.SysAgriInfo; +import com.agri.system.domain.SysUserAgri; import com.agri.system.domain.vo.AgriInfoView; import com.agri.system.service.ISysAgriInfoService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; @@ -124,8 +129,8 @@ public class SysAgriInfoController extends BaseController * @return */ @PreAuthorize("@ss.hasPermi('assets:agri:addAgriFromMobile')") - @GetMapping("/addAgriFromMobile") - public Map addAgriFromMobile(SysAgriInfo sysAgriInfo) { + @PostMapping("/addAgriFromMobile") + public Map addAgriFromMobile(@RequestBody SysAgriInfo sysAgriInfo) { return success(sysAgriInfoService.addAgriFromMobile(sysAgriInfo)); } diff --git a/agri-system/src/main/java/com/agri/system/controller/SysUserAgriController.java b/agri-system/src/main/java/com/agri/system/controller/SysUserAgriController.java index bc1b6fb..495af79 100644 --- a/agri-system/src/main/java/com/agri/system/controller/SysUserAgriController.java +++ b/agri-system/src/main/java/com/agri/system/controller/SysUserAgriController.java @@ -7,7 +7,9 @@ import com.agri.common.core.controller.BaseController; import com.agri.common.core.domain.AjaxResult; import com.agri.common.core.page.TableDataInfo; import com.agri.common.enums.BusinessType; +import com.agri.common.utils.SecurityUtils; import com.agri.common.utils.poi.ExcelUtil; +import com.agri.system.domain.SysAgriInfo; import com.agri.system.domain.SysUserAgri; import com.agri.system.service.ISysUserAgriService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -142,4 +144,22 @@ public class SysUserAgriController extends BaseController { } return success(); } + + + /** + * 删除大棚管理 + */ + @PreAuthorize("@ss.hasPermi('assets:userAgri:remove')") + @Log(title = "大棚管理", businessType = BusinessType.DELETE) + @DeleteMapping("/removeAgri") + public AjaxResult removeAgri(@RequestBody SysUserAgri userAgri) + { + if (!SecurityUtils.isAdmin()) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("agri_id", userAgri.getImei()); + queryWrapper.eq("user_id", SecurityUtils.getUserId()); + boolean remove = sysUserAgriService.remove(queryWrapper); + } + return success(); + } } diff --git a/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java b/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java index a4ef3de..ff8eb6c 100644 --- a/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java +++ b/agri-system/src/main/java/com/agri/system/domain/SysAgriInfo.java @@ -3,6 +3,7 @@ package com.agri.system.domain; import com.agri.common.annotation.Excel; import com.agri.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -66,6 +67,7 @@ public class SysAgriInfo extends BaseEntity /** 逻辑删除(0-未删,1-已删) */ @Excel(name = "逻辑删除(0-未删,1-已删)") + @TableLogic(value = "0", delval = "1") private Integer isDeleted; /** diff --git a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java b/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java index f0dcc5a..89a5d64 100644 --- a/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java +++ b/agri-system/src/main/java/com/agri/system/service/impl/SysAgriInfoServiceImpl.java @@ -11,6 +11,7 @@ import com.agri.system.domain.vo.AgriInfoView; import com.agri.system.mapper.SysAgriInfoMapper; import com.agri.system.service.ISysAgriInfoService; import com.agri.system.service.ISysUserAgriService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml index 5e738f9..3363c40 100644 --- a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml +++ b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml @@ -150,16 +150,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from sys_agri_info where id = #{id} - + + update sys_agri_info set is_deleted = 1 where id = #{id} + - - delete from sys_agri_info where id in + + update sys_agri_info set is_deleted = 1 where id in #{id} - +