修改删除bug

src/main/java/com/xkrs/microservice/common/tool/controller/AppManageController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.FileAppEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/CacheController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.service.CacheService;
 import org.springframework.context.i18n.LocaleContextHolder;

src/main/java/com/xkrs/microservice/common/tool/controller/CropClassifyRecordController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.CropClassifyRecordEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/DicBusinessServiceController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.*;

src/main/java/com/xkrs/microservice/common/tool/controller/FarmingInfoController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.FarmingInfoEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/FileDocumentController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.FileDocumentEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/FileServerController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.model.vo.FileServerResultVo;
 import com.xkrs.microservice.service.FileServerService;

src/main/java/com/xkrs/microservice/common/tool/controller/HelloController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import org.springframework.context.i18n.LocaleContextHolder;

src/main/java/com/xkrs/microservice/common/tool/controller/HydrologicalStationController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.HydrologicalStationEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/IndependentCheckController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.IndependentCheckEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationCheckController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.IrrigationCheckEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationRecordController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.IrrigationRecordEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationSarRecordController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.IrrigationSarRecordEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/ShpAdmController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.vo.ShpCityVo;

src/main/java/com/xkrs/microservice/common/tool/controller/SysManageController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import nl.basjes.parse.useragent.UserAgent;

src/main/java/com/xkrs/microservice/common/tool/controller/SysUserController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.SysRoleEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/TeaGardenPlotController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.TeaGardenPlotEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/TifProductController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.TifProductEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/TypicalFarmerController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.TypicalFarmerEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/TypicalPlotController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.TypicalPlotEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/TypicalPlotIrrigationController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.TypicalPlotIrrigationEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/WcsRecordController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.entity.WcsRecordEntity;

src/main/java/com/xkrs/microservice/common/tool/controller/WeatherController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.common.tool.PageBean;

src/main/java/com/xkrs/microservice/common/tool/controller/WeatherStationController.java

@@ -1,4 +1,4 @@
-package com.xkrs.microservice.controller;
+package com.xkrs.microservice.common.tool.controller;
 
 import com.xkrs.microservice.common.encapsulation.PromptMessageEnum;
 import com.xkrs.microservice.model.vo.ForecastWeather7DayVo;

src/main/java/com/xkrs/microservice/service/impl/TeaGardenPlotServiceImpl.java

@@ -8,8 +8,10 @@ import com.xkrs.microservice.util.CopyPropertiesUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -57,7 +59,8 @@ public class TeaGardenPlotServiceImpl implements TeaGardenPlotService {
      * 新增典型地块记录
      * @param teaGardenPlotQo
      */
-    @Cacheable(keyGenerator = "keyGenerator", unless="#result == null")
+    @Transactional(rollbackFor=Exception.class)
+    @CacheEvict(value = "TeaGardenPlotServiceCache",allEntries = true)
     @Override
     public void add(TeaGardenPlotQo teaGardenPlotQo){
         TeaGardenPlotEntity teaGardenPlotEntity = new TeaGardenPlotEntity();
@@ -73,7 +76,8 @@ public class TeaGardenPlotServiceImpl implements TeaGardenPlotService {
      * 更新典型地块记录
      * @param teaGardenPlotQo
      */
-    @Cacheable(keyGenerator = "keyGenerator", unless="#result == null")
+    @Transactional(rollbackFor=Exception.class)
+    @CacheEvict(value = "TeaGardenPlotServiceCache",allEntries = true)
     @Override
     public void update(TeaGardenPlotQo teaGardenPlotQo){
         TeaGardenPlotEntity teaGardenPlotEntity = new TeaGardenPlotEntity();
@@ -90,11 +94,12 @@ public class TeaGardenPlotServiceImpl implements TeaGardenPlotService {
      * @param id
      * @return
      */
-    @Cacheable(keyGenerator = "keyGenerator", unless="#result == null")
+    @Transactional(rollbackFor=Exception.class)
+    @CacheEvict(value = "TeaGardenPlotServiceCache",allEntries = true)
     @Override
     public int delete(Integer id){
         Optional<TeaGardenPlotEntity> teaGardenPlotEntityOptional = teaGardenPlotDao.findById(id);
-        if(teaGardenPlotEntityOptional.isPresent()){
+        if(teaGardenPlotEntityOptional.isEmpty()){
             return 1;
         }
         teaGardenPlotDao.deleteById(id);