diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index d7d8f9f..deb9653 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -21,4 +21,6 @@ public class OtherData{ private String remark; private Long disasterId; + + private Integer visualFlag; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java index d0ac039..816ddef 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java @@ -65,8 +65,8 @@ public class CenterController { )); } @PostMapping("/updatePassword") - public R updatePassword(String oldPassword, String password, String email) { - return R.data(guestInfoService.updatePassword(oldPassword, password, email)); + public R updatePassword(@RequestBody Map param) { + return R.data(guestInfoService.updatePassword(param.get("originalPassword"), param.get("password"), param.get("email"))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml index c665bf9..5f47773 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml @@ -77,6 +77,7 @@ di.id = #{id} + and gmdr.STATUS != 2 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java index 64056ea..3d1a2e8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java @@ -6,26 +6,34 @@ import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.GuestInfoService; import com.kening.vordm.vo.UserVo; +import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.utils.DigestUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE; + /** * @author G1393 * @description 针对表【guest_info(游客信息表/志愿者)】的数据库操作Service实现 * @createDate 2023-04-04 15:54:30 */ @Service + public class GuestInfoServiceImpl extends ServiceImpl implements GuestInfoService { - + @Autowired + private BladeRedis bladeRedis; @Override public Boolean updatePassword(String oldPassword, String password, String email) { String op = DigestUtil.encrypt(oldPassword); UserVo user = this.baseMapper.getBladeUserByEmail(email); int i = 0; if(op.equals(user.getPassword())){ - i = this.baseMapper.updatePassword(email, password); - return true; + i = this.baseMapper.updatePassword(email, DigestUtil.encrypt(password)); + CacheUtil.clear(USER_CACHE); + return i>0; }else{ return false; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java index 74e40f0..5652da0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.OtherData; -import com.kening.vordm.mapper.DataUploadMapper; import com.kening.vordm.mapper.OtherDataMapper; -import com.kening.vordm.service.DataUploadService; import com.kening.vordm.service.OtherDataService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -25,6 +23,7 @@ import java.util.Map; /** * 管理员用户实现类 + * * @author liyuchen */ @Slf4j @@ -45,24 +44,26 @@ public class OtherDataServiceImpl extends ServiceImpl params) { - page.setRecords(baseMapper.queryDisasterPage(page,params)); + page.setRecords(baseMapper.queryDisasterPage(page, params)); return page; } /** * 分页列表查询 + * * @param page * @param params * @return */ @Override public IPage queryPage(IPage page, Map params) { - page.setRecords(baseMapper.queryPage(page,params)); + page.setRecords(baseMapper.queryPage(page, params)); return page; } /** * 根据角色名称获取角色id + * * @param roleName * @return */ @@ -73,13 +74,13 @@ public class OtherDataServiceImpl extends ServiceImpl link = new ArrayList<>(); //文件大小 @@ -97,7 +98,7 @@ public class OtherDataServiceImpl extends ServiceImpl