Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6a0773d0cf
|
@ -21,4 +21,6 @@ public class OtherData{
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
|
|
||||||
|
private Integer visualFlag;
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,8 +65,8 @@ public class CenterController {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
@PostMapping("/updatePassword")
|
@PostMapping("/updatePassword")
|
||||||
public R<Boolean> updatePassword(String oldPassword, String password, String email) {
|
public R<Boolean> updatePassword(@RequestBody Map<String, String> param) {
|
||||||
return R.data(guestInfoService.updatePassword(oldPassword, password, email));
|
return R.data(guestInfoService.updatePassword(param.get("originalPassword"), param.get("password"), param.get("email")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,7 @@
|
||||||
<if test="id != null and id != ''">
|
<if test="id != null and id != ''">
|
||||||
di.id = #{id}
|
di.id = #{id}
|
||||||
</if>
|
</if>
|
||||||
|
and gmdr.STATUS != 2
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -6,26 +6,34 @@ import com.kening.vordm.entity.GuestInfo;
|
||||||
import com.kening.vordm.mapper.GuestInfoMapper;
|
import com.kening.vordm.mapper.GuestInfoMapper;
|
||||||
import com.kening.vordm.service.GuestInfoService;
|
import com.kening.vordm.service.GuestInfoService;
|
||||||
import com.kening.vordm.vo.UserVo;
|
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.springblade.core.tool.utils.DigestUtil;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author G1393
|
* @author G1393
|
||||||
* @description 针对表【guest_info(游客信息表/志愿者)】的数据库操作Service实现
|
* @description 针对表【guest_info(游客信息表/志愿者)】的数据库操作Service实现
|
||||||
* @createDate 2023-04-04 15:54:30
|
* @createDate 2023-04-04 15:54:30
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
|
|
||||||
public class GuestInfoServiceImpl extends ServiceImpl<GuestInfoMapper, GuestInfo>
|
public class GuestInfoServiceImpl extends ServiceImpl<GuestInfoMapper, GuestInfo>
|
||||||
implements GuestInfoService {
|
implements GuestInfoService {
|
||||||
|
@Autowired
|
||||||
|
private BladeRedis bladeRedis;
|
||||||
@Override
|
@Override
|
||||||
public Boolean updatePassword(String oldPassword, String password, String email) {
|
public Boolean updatePassword(String oldPassword, String password, String email) {
|
||||||
String op = DigestUtil.encrypt(oldPassword);
|
String op = DigestUtil.encrypt(oldPassword);
|
||||||
UserVo user = this.baseMapper.getBladeUserByEmail(email);
|
UserVo user = this.baseMapper.getBladeUserByEmail(email);
|
||||||
int i = 0;
|
int i = 0;
|
||||||
if(op.equals(user.getPassword())){
|
if(op.equals(user.getPassword())){
|
||||||
i = this.baseMapper.updatePassword(email, password);
|
i = this.baseMapper.updatePassword(email, DigestUtil.encrypt(password));
|
||||||
return true;
|
CacheUtil.clear(USER_CACHE);
|
||||||
|
return i>0;
|
||||||
}else{
|
}else{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.kening.vordm.entity.EntityData;
|
import com.kening.vordm.entity.EntityData;
|
||||||
import com.kening.vordm.entity.OtherData;
|
import com.kening.vordm.entity.OtherData;
|
||||||
import com.kening.vordm.mapper.DataUploadMapper;
|
|
||||||
import com.kening.vordm.mapper.OtherDataMapper;
|
import com.kening.vordm.mapper.OtherDataMapper;
|
||||||
import com.kening.vordm.service.DataUploadService;
|
|
||||||
import com.kening.vordm.service.OtherDataService;
|
import com.kening.vordm.service.OtherDataService;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
@ -25,6 +23,7 @@ import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 管理员用户实现类
|
* 管理员用户实现类
|
||||||
|
*
|
||||||
* @author liyuchen
|
* @author liyuchen
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
@ -45,24 +44,26 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public IPage queryDisasterPage(IPage page, Map<String, Object> params) {
|
public IPage queryDisasterPage(IPage page, Map<String, Object> params) {
|
||||||
page.setRecords(baseMapper.queryDisasterPage(page,params));
|
page.setRecords(baseMapper.queryDisasterPage(page, params));
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页列表查询
|
* 分页列表查询
|
||||||
|
*
|
||||||
* @param page
|
* @param page
|
||||||
* @param params
|
* @param params
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public IPage queryPage(IPage page, Map<String, Object> params) {
|
public IPage queryPage(IPage page, Map<String, Object> params) {
|
||||||
page.setRecords(baseMapper.queryPage(page,params));
|
page.setRecords(baseMapper.queryPage(page, params));
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据角色名称获取角色id
|
* 根据角色名称获取角色id
|
||||||
|
*
|
||||||
* @param roleName
|
* @param roleName
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
|
@ -73,13 +74,13 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传数据
|
* 上传数据
|
||||||
|
*
|
||||||
* @param OtherData
|
* @param OtherData
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean uploadData(OtherData OtherData) {
|
public boolean uploadData(OtherData OtherData) {
|
||||||
log.info("上传数据:{}",OtherData);
|
|
||||||
//路径拼接
|
//路径拼接
|
||||||
List<String> link = new ArrayList<>();
|
List<String> link = new ArrayList<>();
|
||||||
//文件大小
|
//文件大小
|
||||||
|
@ -97,7 +98,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
//实体数据
|
//实体数据
|
||||||
entityData.setType(OtherData.getType());
|
entityData.setType(OtherData.getType());
|
||||||
entityData.setSize(sum);
|
entityData.setSize(sum);
|
||||||
entityData.setLink(StringUtils.join(link,","));
|
entityData.setLink(StringUtils.join(link, ","));
|
||||||
entityData.setDisasterId(OtherData.getDisasterId());
|
entityData.setDisasterId(OtherData.getDisasterId());
|
||||||
entityData.setUploadTime(new Date());
|
entityData.setUploadTime(new Date());
|
||||||
entityData.setRemark(OtherData.getRemark());
|
entityData.setRemark(OtherData.getRemark());
|
||||||
|
@ -106,6 +107,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
|
||||||
entityData.setUploaderId(AuthUtil.getUserId());
|
entityData.setUploaderId(AuthUtil.getUserId());
|
||||||
entityData.setManagerId(AuthUtil.getUserId());
|
entityData.setManagerId(AuthUtil.getUserId());
|
||||||
entityData.setReviewTime(new Date());
|
entityData.setReviewTime(new Date());
|
||||||
|
entityData.setVisualFlag(OtherData.getVisualFlag());
|
||||||
return save(entityData);
|
return save(entityData);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
package com.kening.vordm.service.impl;
|
package com.kening.vordm.service.impl;
|
||||||
|
|
||||||
import com.alibaba.nacos.common.utils.StringUtils;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.kening.vordm.entity.EntityData;
|
|
||||||
import com.kening.vordm.entity.OtherData;
|
import com.kening.vordm.entity.OtherData;
|
||||||
import com.kening.vordm.entity.PictureInfo;
|
import com.kening.vordm.entity.PictureInfo;
|
||||||
import com.kening.vordm.mapper.PictureInfoMapper;
|
import com.kening.vordm.mapper.PictureInfoMapper;
|
||||||
|
@ -11,12 +9,10 @@ import lombok.AllArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springblade.core.oss.MinioTemplate;
|
import org.springblade.core.oss.MinioTemplate;
|
||||||
import org.springblade.core.oss.model.BladeFile;
|
import org.springblade.core.oss.model.BladeFile;
|
||||||
import org.springblade.core.secure.utils.AuthUtil;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue