修改批量删除和批量审核功能-liyuchen
This commit is contained in:
parent
4d0aeb8bc6
commit
5abcf7ada1
|
@ -2,6 +2,8 @@ package com.kening.vordm.entity;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数据上传实体类
|
* 数据上传实体类
|
||||||
* @author liyuchen
|
* @author liyuchen
|
||||||
|
@ -16,5 +18,9 @@ public class DataUpload extends EntityData{
|
||||||
|
|
||||||
private String disasterKeyword;
|
private String disasterKeyword;
|
||||||
|
|
||||||
|
private String disasterCountry;
|
||||||
|
|
||||||
|
private Date disasterTime;
|
||||||
|
|
||||||
private Long disasterId;
|
private Long disasterId;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 其他数据实体类
|
* 其他数据实体类
|
||||||
* @extends 继承基础数据实体类
|
|
||||||
* @author liyuchen
|
* @author liyuchen
|
||||||
* @date 2023/04/12
|
* @date 2023/04/12
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -66,6 +67,12 @@ public class PictureInfo implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer isDeleted;
|
private Integer isDeleted;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 图片对象
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
private MultipartFile file;
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
|
||||||
@SpringCloudApplication
|
@SpringCloudApplication
|
||||||
public class VoRdmApplication {
|
public class VoRdmApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
BladeApplication.run("yyhouc-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
||||||
// BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
// BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Query;
|
||||||
import org.springblade.core.secure.BladeUser;
|
import org.springblade.core.secure.BladeUser;
|
||||||
import org.springblade.core.tool.api.R;
|
import org.springblade.core.tool.api.R;
|
||||||
import org.springblade.core.tool.utils.DigestUtil;
|
import org.springblade.core.tool.utils.DigestUtil;
|
||||||
|
import org.springblade.core.tool.utils.Func;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -55,7 +56,7 @@ public class AdministratorController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/delete")
|
@DeleteMapping("/delete")
|
||||||
public R<Boolean> delete(@RequestParam Long ids){
|
public R<Boolean> delete(@RequestParam String ids){
|
||||||
return R.status(service.removeById(ids));
|
return R.status(service.removeByIds(Func.toLongList(ids)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
package com.kening.vordm.controller;
|
package com.kening.vordm.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.kening.vordm.entity.DataUpload;
|
import com.kening.vordm.entity.DataUpload;
|
||||||
import com.kening.vordm.entity.EntityData;
|
import com.kening.vordm.entity.EntityData;
|
||||||
|
import com.kening.vordm.entity.Hotspot;
|
||||||
import com.kening.vordm.entity.OtherData;
|
import com.kening.vordm.entity.OtherData;
|
||||||
import com.kening.vordm.service.DataUploadService;
|
import com.kening.vordm.service.DataUploadService;
|
||||||
import com.kening.vordm.service.OtherDataService;
|
import com.kening.vordm.service.OtherDataService;
|
||||||
|
@ -11,6 +13,7 @@ import org.springblade.core.mp.support.Condition;
|
||||||
import org.springblade.core.mp.support.Query;
|
import org.springblade.core.mp.support.Query;
|
||||||
import org.springblade.core.secure.utils.AuthUtil;
|
import org.springblade.core.secure.utils.AuthUtil;
|
||||||
import org.springblade.core.tool.api.R;
|
import org.springblade.core.tool.api.R;
|
||||||
|
import org.springblade.core.tool.utils.Func;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -65,10 +68,7 @@ public class OtherDataController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/remove")
|
@DeleteMapping("/remove")
|
||||||
public R remove(@RequestParam Long id){
|
public R remove(@RequestParam String id){
|
||||||
EntityData entityData = new EntityData();
|
return R.status(service.removeByIds(Func.toLongList(id)));
|
||||||
entityData.setId(id);
|
|
||||||
entityData.setIsDeleted(1);
|
|
||||||
return R.status(service.updateById(entityData));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package com.kening.vordm.controller;
|
||||||
|
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.kening.vordm.entity.*;
|
import com.kening.vordm.entity.*;
|
||||||
import com.kening.vordm.service.HotspotService;
|
import com.kening.vordm.service.HotspotService;
|
||||||
import com.kening.vordm.service.PictureInfoService;
|
import com.kening.vordm.service.PictureInfoService;
|
||||||
|
@ -11,6 +12,7 @@ import lombok.AllArgsConstructor;
|
||||||
import org.springblade.core.mp.support.Condition;
|
import org.springblade.core.mp.support.Condition;
|
||||||
import org.springblade.core.mp.support.Query;
|
import org.springblade.core.mp.support.Query;
|
||||||
import org.springblade.core.tool.api.R;
|
import org.springblade.core.tool.api.R;
|
||||||
|
import org.springblade.core.tool.utils.Func;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -43,20 +45,27 @@ public class PictureInfoController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("/upload")
|
@PostMapping("/upload")
|
||||||
public R audit(OtherData OtherData){
|
public R upload(OtherData OtherData){
|
||||||
return R.status(service.uploadData(OtherData));
|
return R.status(service.uploadData(OtherData));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改图片信息
|
||||||
|
* @param pictureInfo
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/update")
|
||||||
|
public R upadte(PictureInfo pictureInfo){
|
||||||
|
return R.status(service.updatePicture(pictureInfo));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 逻辑删除图片数据
|
* 逻辑删除图片数据
|
||||||
* @param id
|
* @param id
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/remove")
|
@DeleteMapping("/remove")
|
||||||
public R remove(@RequestParam Long id){
|
public R remove(@RequestParam String id){
|
||||||
PictureInfo pictureInfo = new PictureInfo();
|
return R.status(service.removeByIds(Func.toLongList(id)));
|
||||||
pictureInfo.setId(id);
|
|
||||||
pictureInfo.setIsDeleted(1);
|
|
||||||
return R.status(service.updateById(pictureInfo));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.kening.vordm.controller;
|
package com.kening.vordm.controller;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.kening.vordm.entity.*;
|
import com.kening.vordm.entity.*;
|
||||||
import com.kening.vordm.service.HotspotService;
|
import com.kening.vordm.service.HotspotService;
|
||||||
import com.kening.vordm.service.OtherDataService;
|
import com.kening.vordm.service.OtherDataService;
|
||||||
|
@ -10,6 +11,7 @@ import lombok.AllArgsConstructor;
|
||||||
import org.springblade.core.mp.support.Condition;
|
import org.springblade.core.mp.support.Condition;
|
||||||
import org.springblade.core.mp.support.Query;
|
import org.springblade.core.mp.support.Query;
|
||||||
import org.springblade.core.tool.api.R;
|
import org.springblade.core.tool.api.R;
|
||||||
|
import org.springblade.core.tool.utils.Func;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -63,6 +65,27 @@ public class VisualDataController {
|
||||||
return R.data(hotspotService.page(Condition.getPage(query),Condition.getQueryWrapper(params,Hotspot.class)));
|
return R.data(hotspotService.page(Condition.getPage(query),Condition.getQueryWrapper(params,Hotspot.class)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新词云数据
|
||||||
|
* @param wordCLouds
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateWordCloud")
|
||||||
|
public R updateWordCloud(@RequestBody WordCLouds wordCLouds){
|
||||||
|
return R.status(wordCloudsService.updateById(wordCLouds));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新热点数据
|
||||||
|
* @param hotspot
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PutMapping("/updateHotspot")
|
||||||
|
public R updateHotspot(@RequestBody Hotspot hotspot){
|
||||||
|
return R.status(hotspotService.updateById(hotspot));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 移除词云或者热点数据
|
* 移除词云或者热点数据
|
||||||
* @param id
|
* @param id
|
||||||
|
@ -70,17 +93,11 @@ public class VisualDataController {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/remove")
|
@DeleteMapping("/remove")
|
||||||
public R remove(@RequestParam Long id,@RequestParam Integer type){
|
public R remove(@RequestParam String id,@RequestParam Integer type){
|
||||||
if(type == 1){
|
if(type == 1){
|
||||||
WordCLouds wordCLouds = new WordCLouds();
|
return R.status(wordCloudsService.removeByIds(Func.toLongList(id)));
|
||||||
wordCLouds.setId(id);
|
|
||||||
wordCLouds.setIsDeleted(1);
|
|
||||||
return R.status(wordCloudsService.updateById(wordCLouds));
|
|
||||||
}else {
|
}else {
|
||||||
Hotspot hotspot = new Hotspot();
|
return R.status(hotspotService.removeByIds(Func.toLongList(id)));
|
||||||
hotspot.setId(id);
|
|
||||||
hotspot.setIsDeleted(1);
|
|
||||||
return R.status(hotspotService.updateById(hotspot));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
select
|
select
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId
|
di.id as disasterId,
|
||||||
|
di.disaster_time as disasterTime,
|
||||||
|
di.disaster_country as disasterCountry
|
||||||
from entity_data ed
|
from entity_data ed
|
||||||
left join blade_user bu on bu.id = ed.uploader_id
|
left join blade_user bu on bu.id = ed.uploader_id
|
||||||
left join disaster_info di on di.id = ed.disaster_id
|
left join disaster_info di on di.id = ed.disaster_id
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
select
|
select
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId
|
di.id as disasterId,
|
||||||
|
di.disaster_time as disasterTime,
|
||||||
|
di.disaster_country as disasterCountry
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
select
|
select
|
||||||
di.disaster_keyword,
|
di.disaster_keyword,
|
||||||
bdb.dict_value as disasterType,
|
bdb.dict_value as disasterType,
|
||||||
di.id as disasterId
|
di.id as disasterId,
|
||||||
|
di.disaster_time as disasterTime,
|
||||||
|
di.disaster_country as disasterCountry
|
||||||
from disaster_info di
|
from disaster_info di
|
||||||
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
left join blade_dict_biz bdb on di.disaster_type = dict_key
|
||||||
</select>
|
</select>
|
||||||
|
|
|
@ -14,7 +14,15 @@ public interface PictureInfoService extends IService<PictureInfo> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传图片信息数据
|
* 上传图片信息数据
|
||||||
|
* @param otherData
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
boolean uploadData(OtherData otherData);
|
boolean uploadData(OtherData otherData);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改图片信息
|
||||||
|
* @param pictureInfo
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
boolean updatePicture(PictureInfo pictureInfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,8 +64,6 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
try{
|
try{
|
||||||
//设置标题
|
//设置标题
|
||||||
String subject = "Welcome to register";
|
String subject = "Welcome to register";
|
||||||
//设置要使用的模板
|
|
||||||
String emailTemplate = "email";
|
|
||||||
//设置要填充模板的参数
|
//设置要填充模板的参数
|
||||||
Map<String, Object> dataMap = new HashMap<>();
|
Map<String, Object> dataMap = new HashMap<>();
|
||||||
dataMap.put("account", administrator.getAccount());
|
dataMap.put("account", administrator.getAccount());
|
||||||
|
@ -75,7 +73,6 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
email.setSubject(subject);
|
email.setSubject(subject);
|
||||||
email.setDataMap(dataMap);
|
email.setDataMap(dataMap);
|
||||||
email.setTos(new String[]{administrator.getEmail()});
|
email.setTos(new String[]{administrator.getEmail()});
|
||||||
email.setForm("15806764589@163.com");
|
|
||||||
emailService.sendTemplate(email);
|
emailService.sendTemplate(email);
|
||||||
log.info("邮件发送成功");
|
log.info("邮件发送成功");
|
||||||
}catch (Exception e){
|
}catch (Exception e){
|
||||||
|
|
|
@ -35,6 +35,25 @@ implements PictureInfoService {
|
||||||
*/
|
*/
|
||||||
private MinioTemplate minioTemplate;
|
private MinioTemplate minioTemplate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修改图片信息
|
||||||
|
* @param pictureInfo
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean updatePicture(PictureInfo pictureInfo) {
|
||||||
|
MultipartFile multipartFile = pictureInfo.getFile();
|
||||||
|
BladeFile bladeFile = minioTemplate.putFile(multipartFile);
|
||||||
|
PictureInfo picture = new PictureInfo();
|
||||||
|
picture.setLink(bladeFile.getLink());
|
||||||
|
picture.setName(bladeFile.getOriginalName());
|
||||||
|
picture.setSize(multipartFile.getSize());
|
||||||
|
picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1));
|
||||||
|
picture.setIsMain(pictureInfo.getIsMain());
|
||||||
|
picture.setId(pictureInfo.getId());
|
||||||
|
return updateById(picture);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上传图片
|
* 上传图片
|
||||||
* @param otherData
|
* @param otherData
|
||||||
|
|
|
@ -66,9 +66,6 @@
|
||||||
<!--您好,感谢您的注册,这是一封验证邮件,请点击下面的链接完成注册,感谢您的支持!
|
<!--您好,感谢您的注册,这是一封验证邮件,请点击下面的链接完成注册,感谢您的支持!
|
||||||
<a href="#" th:href="@{http://www.baidu.com/register/{id}(id=${id})}">激活账号</a>-->
|
<a href="#" th:href="@{http://www.baidu.com/register/{id}(id=${id})}">激活账号</a>-->
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<!-- <div class="header">
|
|
||||||
<h1>欢迎加入宠物之家!</h1>
|
|
||||||
</div>-->
|
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<h2>Hello, thank you for your registration</h2>
|
<h2>Hello, thank you for your registration</h2>
|
||||||
<p>Your account number:<b><span th:text="${account}"></span></b></p>
|
<p>Your account number:<b><span th:text="${account}"></span></b></p>
|
||||||
|
@ -76,13 +73,10 @@
|
||||||
<p>The date you registered:<b><span th:text="${time}"></span></b></p>
|
<p>The date you registered:<b><span th:text="${time}"></span></b></p>
|
||||||
<P><b>Please click login:<a href="http://192.168.31.77:8888">Point-me jump</a></b></P>
|
<P><b>Please click login:<a href="http://192.168.31.77:8888">Point-me jump</a></b></P>
|
||||||
<p></p>
|
<p></p>
|
||||||
<!-- <p>当您在使用本网站时,务必要遵守法律法规</p>
|
|
||||||
<p>如果您有什么疑问可以联系管理员,Email: <b>r1624603357@126.com</b></p>-->
|
|
||||||
</div>
|
</div>
|
||||||
<div class="footer">
|
<div class="footer">
|
||||||
<p>This is system mail, please do not reply</p>
|
<p>This is system mail, please do not reply</p>
|
||||||
<p>Please take good care of your information to avoid misappropriation</p>
|
<p>Please take good care of your information to avoid misappropriation</p>
|
||||||
<!-- <p>©Rk</p>-->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
Loading…
Reference in New Issue