Song/Hydrology_new
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改删除bug

Browse Source
This commit is contained in:
qdxkrs 2022-06-22 17:36:42 +08:00
parent 90f22fa887
commit ca01cb1536
25 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xkrs/microservice/controller/AppManageController.java → src/main/java/com/xkrs/microservice/common/tool/controller/AppManageController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/CacheController.java → src/main/java/com/xkrs/microservice/common/tool/controller/CacheController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/CropClassifyRecordController.java → src/main/java/com/xkrs/microservice/common/tool/controller/CropClassifyRecordController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/DicBusinessServiceController.java → src/main/java/com/xkrs/microservice/common/tool/controller/DicBusinessServiceController.java
View File

@ -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.*;

2
src/main/java/com/xkrs/microservice/controller/FarmingInfoController.java → src/main/java/com/xkrs/microservice/common/tool/controller/FarmingInfoController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/FileDocumentController.java → src/main/java/com/xkrs/microservice/common/tool/controller/FileDocumentController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/FileServerController.java → src/main/java/com/xkrs/microservice/common/tool/controller/FileServerController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/HelloController.java → src/main/java/com/xkrs/microservice/common/tool/controller/HelloController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/HydrologicalStationController.java → src/main/java/com/xkrs/microservice/common/tool/controller/HydrologicalStationController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/IndependentCheckController.java → src/main/java/com/xkrs/microservice/common/tool/controller/IndependentCheckController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/IrrigationCheckController.java → src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationCheckController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/IrrigationRecordController.java → src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationRecordController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/IrrigationSarRecordController.java → src/main/java/com/xkrs/microservice/common/tool/controller/IrrigationSarRecordController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/ShpAdmController.java → src/main/java/com/xkrs/microservice/common/tool/controller/ShpAdmController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/SysManageController.java → src/main/java/com/xkrs/microservice/common/tool/controller/SysManageController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/SysUserController.java → src/main/java/com/xkrs/microservice/common/tool/controller/SysUserController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/TeaGardenPlotController.java → src/main/java/com/xkrs/microservice/common/tool/controller/TeaGardenPlotController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/TifProductController.java → src/main/java/com/xkrs/microservice/common/tool/controller/TifProductController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/TypicalFarmerController.java → src/main/java/com/xkrs/microservice/common/tool/controller/TypicalFarmerController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/TypicalPlotController.java → src/main/java/com/xkrs/microservice/common/tool/controller/TypicalPlotController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/TypicalPlotIrrigationController.java → src/main/java/com/xkrs/microservice/common/tool/controller/TypicalPlotIrrigationController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/WcsRecordController.java → src/main/java/com/xkrs/microservice/common/tool/controller/WcsRecordController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/WeatherController.java → src/main/java/com/xkrs/microservice/common/tool/controller/WeatherController.java
View File

@ -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;

2
src/main/java/com/xkrs/microservice/controller/WeatherStationController.java → src/main/java/com/xkrs/microservice/common/tool/controller/WeatherStationController.java
View File

@ -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;

13
src/main/java/com/xkrs/microservice/service/impl/TeaGardenPlotServiceImpl.java
View File

@ -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);