修改排序
This commit is contained in:
parent
45682cac23
commit
dfce0a6b31
@ -49,7 +49,7 @@ public class getClinicalDoctorSearchPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(doctorName)) {
|
if (StringUtils.hasText(doctorName)) {
|
||||||
map.put("b.doctor_name", doctorName);
|
map.put("CONVERT(b.doctor_name USING gbk)", doctorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(articleNum)) {
|
if (StringUtils.hasText(articleNum)) {
|
||||||
|
|||||||
@ -50,7 +50,7 @@ public class getClinicalHospitalSearchPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(hospitalName)) {
|
if (StringUtils.hasText(hospitalName)) {
|
||||||
map.put("b.hospital_name", hospitalName);
|
map.put("CONVERT(b.hospital_name USING gbk)", hospitalName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(articleNum)) {
|
if (StringUtils.hasText(articleNum)) {
|
||||||
|
|||||||
@ -49,7 +49,7 @@ public class getClinicalLabelSearchPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(labelName)) {
|
if (StringUtils.hasText(labelName)) {
|
||||||
map.put("a.label_name", labelName);
|
map.put("CONVERT(a.label_name USING gbk)", labelName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StringUtils.hasText(articleNum)) {
|
if (StringUtils.hasText(articleNum)) {
|
||||||
|
|||||||
@ -593,130 +593,166 @@ public class CaseClinicalVideoService {
|
|||||||
Video.checkSign(request,"26e8675f44565b1ed4eaaa0fcf3531d7",r,objectMapper);
|
Video.checkSign(request,"26e8675f44565b1ed4eaaa0fcf3531d7",r,objectMapper);
|
||||||
|
|
||||||
|
|
||||||
// // 获取视频数据
|
// 获取视频数据
|
||||||
// LambdaQueryWrapper<CaseClinicalVideoModel> videoQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<CaseClinicalVideoModel> videoQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
// videoQueryWrapper.eq(CaseClinicalVideoModel::getVideoNo, r.getVideoNo());
|
videoQueryWrapper.eq(CaseClinicalVideoModel::getVideoNo, r.getVideoNo());
|
||||||
// CaseClinicalVideoModel caseClinicalVideo = caseClinicalVideoDao.selectOne(videoQueryWrapper);
|
CaseClinicalVideoModel caseClinicalVideo = caseClinicalVideoDao.selectOne(videoQueryWrapper);
|
||||||
//
|
|
||||||
// // 修改
|
// 修改
|
||||||
// if (Objects.equals(r.getAction(), "update")){
|
if (Objects.equals(r.getAction(), "update")){
|
||||||
// if (caseClinicalVideo == null){
|
if (caseClinicalVideo == null){
|
||||||
// r.setAction("add");
|
r.setAction("add");
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 新增
|
// 新增
|
||||||
// if (Objects.equals(r.getAction(), "add")){
|
if (Objects.equals(r.getAction(), "add")){
|
||||||
// if (caseClinicalVideo != null){
|
if (caseClinicalVideo != null){
|
||||||
// // 已存在该视频
|
// 已存在该视频
|
||||||
// return true;
|
return true;
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 新增视频
|
// 新增视频
|
||||||
// caseClinicalVideo = new CaseClinicalVideoModel();
|
caseClinicalVideo = new CaseClinicalVideoModel();
|
||||||
// caseClinicalVideo.setVideoTitle(r.getVideoTitle());
|
caseClinicalVideo.setVideoTitle(r.getVideoTitle());
|
||||||
// caseClinicalVideo.setVideoNo(r.getVideoNo());
|
caseClinicalVideo.setVideoNo(r.getVideoNo());
|
||||||
// caseClinicalVideo.setPushDate(LocalDateTime.parse(r.getPushDate()));
|
caseClinicalVideo.setPushDate(LocalDateTime.parse(r.getPushDate()));
|
||||||
// caseClinicalVideo.setIsLink(r.getIsLink());
|
caseClinicalVideo.setIsLink(r.getIsLink());
|
||||||
// caseClinicalVideo.setIsLinkUrl(r.getIsLinkUrl());
|
caseClinicalVideo.setIsLinkUrl(r.getIsLinkUrl());
|
||||||
// int res = caseClinicalVideoDao.insert(caseClinicalVideo);
|
int res = caseClinicalVideoDao.insert(caseClinicalVideo);
|
||||||
// if (res <= 0){
|
if (res <= 0){
|
||||||
// throw new BusinessException("-1", "内部错误，添加视频失败");
|
throw new BusinessException("-1", "内部错误，添加视频失败");
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 新增标签
|
// 新增标签
|
||||||
// for (addClinicalVideoApp.Label label : r.getLabel()){
|
for (addClinicalVideoApp.Label label : r.getLabel()){
|
||||||
// CaseClinicalVideoLabelModel caseClinicalVideoLabel = new CaseClinicalVideoLabelModel();
|
CaseClinicalVideoLabelModel caseClinicalVideoLabel = new CaseClinicalVideoLabelModel();
|
||||||
// caseClinicalVideoLabel.setVideoId(caseClinicalVideo.getVideoId());
|
caseClinicalVideoLabel.setVideoId(caseClinicalVideo.getVideoId());
|
||||||
// caseClinicalVideoLabel.setAppIden(label.getAppIden());
|
caseClinicalVideoLabel.setAppIden(label.getAppIden());
|
||||||
// caseClinicalVideoLabel.setLabelName(label.getLabelName());
|
caseClinicalVideoLabel.setLabelName(label.getLabelName());
|
||||||
// res = caseClinicalVideoLabelDao.insert(caseClinicalVideoLabel);
|
res = caseClinicalVideoLabelDao.insert(caseClinicalVideoLabel);
|
||||||
// if (res <= 0){
|
if (res <= 0){
|
||||||
// throw new BusinessException("-1", "内部错误，添加视频标签失败");
|
throw new BusinessException("-1", "内部错误，添加视频标签失败");
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 新增标签统计
|
// 新增标签统计
|
||||||
// caseClinicalService.AddStatsCaseClinicalLabel(label.getAppIden(),label.getLabelName());
|
caseClinicalService.AddStatsCaseClinicalLabel(label.getAppIden(),label.getLabelName());
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// // 新增作者
|
// 新增作者
|
||||||
// for (addClinicalVideoApp.Author author : r.getAuthor()){
|
if (!r.getAuthor().isEmpty()){
|
||||||
// // 获取app用户数据
|
for (addClinicalVideoApp.Author author : r.getAuthor()){
|
||||||
// GetUserInfoResponse result = userInfo.getUserInfoByUuid(author.getDoctorIden());
|
// 获取app用户数据
|
||||||
// CaseClinicalDoctorModel caseClinicalDoctor = userService.GetCaseClinicalDoctor(result);
|
GetUserInfoResponse result = userInfo.getUserInfoByUuid(author.getDoctorIden());
|
||||||
//
|
CaseClinicalDoctorModel caseClinicalDoctor = userService.GetCaseClinicalDoctor(result);
|
||||||
// CaseClinicalVideoAuthorModel caseClinicalVideoAuthor = new CaseClinicalVideoAuthorModel();
|
|
||||||
// caseClinicalVideoAuthor.setVideoId(caseClinicalVideo.getVideoId());
|
CaseClinicalVideoAuthorModel caseClinicalVideoAuthor = new CaseClinicalVideoAuthorModel();
|
||||||
// caseClinicalVideoAuthor.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
caseClinicalVideoAuthor.setVideoId(caseClinicalVideo.getVideoId());
|
||||||
// caseClinicalVideoAuthorDao.insert(caseClinicalVideoAuthor);
|
caseClinicalVideoAuthor.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
||||||
//
|
caseClinicalVideoAuthorDao.insert(caseClinicalVideoAuthor);
|
||||||
// // 新增作者统计
|
|
||||||
// caseClinicalService.AddStatsCaseClinicalDoctor(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
// 新增作者统计
|
||||||
//
|
caseClinicalService.AddStatsCaseClinicalDoctor(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
||||||
// // 新增医院统计
|
|
||||||
// caseClinicalService.AddStatsCaseClinicalHospital(String.valueOf(caseClinicalDoctor.getHospitalId()));
|
// 新增医院统计
|
||||||
// }
|
caseClinicalService.AddStatsCaseClinicalHospital(String.valueOf(caseClinicalDoctor.getHospitalId()));
|
||||||
//
|
}
|
||||||
// // 新增统计
|
}
|
||||||
// IncClinicalVideoStats(String.valueOf(caseClinicalVideo.getVideoId()),4);
|
|
||||||
// }
|
// 新增统计
|
||||||
//
|
IncClinicalVideoStats(String.valueOf(caseClinicalVideo.getVideoId()),4);
|
||||||
// // 修改
|
}
|
||||||
// if (Objects.equals(r.getAction(), "update")){
|
|
||||||
// if (caseClinicalVideo == null){
|
// 修改
|
||||||
// throw new BusinessException("-1", "无法完成此操作");
|
if (Objects.equals(r.getAction(), "update")){
|
||||||
// }
|
if (caseClinicalVideo == null){
|
||||||
//
|
throw new BusinessException("-1", "无法完成此操作");
|
||||||
// // 文章主体
|
}
|
||||||
// if (!Objects.equals(caseClinicalVideo.getVideoNo(), r.getVideoNo())){
|
|
||||||
// caseClinicalVideo.setVideoNo(r.getVideoNo());
|
// 文章主体
|
||||||
// }
|
if (!Objects.equals(caseClinicalVideo.getVideoNo(), r.getVideoNo())){
|
||||||
//
|
caseClinicalVideo.setVideoNo(r.getVideoNo());
|
||||||
// if (!Objects.equals(caseClinicalVideo.getIsLink(), r.getIsLink())){
|
}
|
||||||
// caseClinicalVideo.setIsLink(r.getIsLink());
|
|
||||||
//
|
if (!Objects.equals(caseClinicalVideo.getIsLink(), r.getIsLink())){
|
||||||
// if (!Objects.equals(caseClinicalVideo.getIsLinkUrl(), r.getIsLinkUrl())){
|
caseClinicalVideo.setIsLink(r.getIsLink());
|
||||||
// caseClinicalVideo.setIsLinkUrl(r.getIsLinkUrl());
|
|
||||||
// }
|
if (!Objects.equals(caseClinicalVideo.getIsLinkUrl(), r.getIsLinkUrl())){
|
||||||
// }
|
caseClinicalVideo.setIsLinkUrl(r.getIsLinkUrl());
|
||||||
//
|
}
|
||||||
// caseClinicalVideoDao.updateById(caseClinicalVideo);
|
}
|
||||||
//
|
|
||||||
// // 作者
|
caseClinicalVideoDao.updateById(caseClinicalVideo);
|
||||||
// // 获取全部作者
|
|
||||||
// LambdaQueryWrapper<CaseClinicalVideoAuthorModel> authorQueryWrapper = new LambdaQueryWrapper<>();
|
// 获取全部作者
|
||||||
// authorQueryWrapper.eq(CaseClinicalVideoAuthorModel::getVideoId, caseClinicalVideo.getVideoId());
|
List<String> aList = new ArrayList<>();
|
||||||
// List<CaseClinicalVideoAuthorModel> caseClinicalVideoAuthors = caseClinicalVideoAuthorDao.selectList(authorQueryWrapper);
|
List<String> bList = new ArrayList<>();
|
||||||
//
|
|
||||||
// List<addClinicalVideoApp.Author> addList = new ArrayList<>();
|
LambdaQueryWrapper<CaseClinicalVideoAuthorModel> authorQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
// List<CaseClinicalVideoAuthorModel> deleteList = new ArrayList<>();
|
authorQueryWrapper.eq(CaseClinicalVideoAuthorModel::getVideoId, caseClinicalVideo.getVideoId());
|
||||||
//
|
List<CaseClinicalVideoAuthorModel> caseClinicalVideoAuthors = caseClinicalVideoAuthorDao.selectList(authorQueryWrapper);
|
||||||
// // 新增的
|
for (CaseClinicalVideoAuthorModel author : caseClinicalVideoAuthors){
|
||||||
// for (addClinicalVideoApp.Author a : r.getAuthor()){
|
// 获取医生数据
|
||||||
// for (CaseClinicalVideoAuthorModel b: caseClinicalVideoAuthors){
|
LambdaQueryWrapper<CaseClinicalDoctorModel> doctorQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
//
|
doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorId, author.getDoctorId());
|
||||||
// }
|
CaseClinicalDoctorModel caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper);
|
||||||
// }
|
if (caseClinicalDoctor == null) {
|
||||||
//
|
throw new BusinessException("-1", "无法完成此操作");
|
||||||
// // 删除的
|
}
|
||||||
//
|
|
||||||
//
|
aList.add(caseClinicalDoctor.getDoctorIden());
|
||||||
//// // 获取医生数据
|
}
|
||||||
//// LambdaQueryWrapper<CaseClinicalDoctorModel> doctorQueryWrapper = new LambdaQueryWrapper<>();
|
|
||||||
//// doctorQueryWrapper.eq(CaseClinicalDoctorModel::getDoctorId, a.getDoctorId());
|
for (addClinicalVideoApp.Author author : r.getAuthor()){
|
||||||
//// CaseClinicalDoctorModel caseClinicalDoctor = caseClinicalDoctorDao.selectOne(doctorQueryWrapper);
|
bList.add(author.getDoctorIden());
|
||||||
//// if (caseClinicalDoctor == null) {
|
}
|
||||||
//// throw new BusinessException("-1", "无法完成此操作");
|
|
||||||
//// }
|
// 1. 删除的：a 中有，b 中没有
|
||||||
//
|
List<String> deleted = new ArrayList<>();
|
||||||
// System.out.println(addList);
|
for (String s : aList) {
|
||||||
// System.out.println(deleteList);
|
if (!bList.contains(s)) {
|
||||||
// }
|
deleted.add(s);
|
||||||
//
|
}
|
||||||
// // 删除
|
}
|
||||||
// if (Objects.equals(r.getAction(), "delete")){
|
|
||||||
//
|
// 2. 新增的：b 中有，a 中没有
|
||||||
// }
|
List<String> added = new ArrayList<>();
|
||||||
|
for (String s : bList) {
|
||||||
|
if (!aList.contains(s)) {
|
||||||
|
added.add(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除
|
||||||
|
if (!deleted.isEmpty()) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// 新增
|
||||||
|
if (!added.isEmpty()) {
|
||||||
|
for (String appIden : added){
|
||||||
|
// 获取app用户数据
|
||||||
|
GetUserInfoResponse result = userInfo.getUserInfoByUuid(appIden);
|
||||||
|
CaseClinicalDoctorModel caseClinicalDoctor = userService.GetCaseClinicalDoctor(result);
|
||||||
|
|
||||||
|
CaseClinicalVideoAuthorModel caseClinicalVideoAuthor = new CaseClinicalVideoAuthorModel();
|
||||||
|
caseClinicalVideoAuthor.setVideoId(caseClinicalVideo.getVideoId());
|
||||||
|
caseClinicalVideoAuthor.setDoctorId(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
||||||
|
caseClinicalVideoAuthorDao.insert(caseClinicalVideoAuthor);
|
||||||
|
|
||||||
|
// 新增作者统计
|
||||||
|
caseClinicalService.AddStatsCaseClinicalDoctor(String.valueOf(caseClinicalDoctor.getDoctorId()));
|
||||||
|
|
||||||
|
// 新增医院统计
|
||||||
|
caseClinicalService.AddStatsCaseClinicalHospital(String.valueOf(caseClinicalDoctor.getHospitalId()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除
|
||||||
|
if (Objects.equals(r.getAction(), "delete")){
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
throw new BusinessException("-1", "错误");
|
throw new BusinessException("-1", "错误");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user