hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-10 11:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/baseservers

Browse Source
This commit is contained in:
dongruihua
2022-11-23 21:09:03 +08:00
parent 2bec07c8d2 6dc0bbada1
commit 1ed365cf5b
255 changed files with 25308 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java
View File

@@ -394,9 +394,9 @@ public class CourseManageApi extends ApiBaseController{
}
//此判断用于本地测试
if(!isLocalDevelopment()) {
if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
return badRequest("HRBP审核信息人员错误");
}
// if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
// return badRequest("HRBP审核信息人员错误");
// }
if(StringUtils.isBlank(dto.getAuditUser().getCode())) {
return badRequest("HRBP审核信息人员错误");
@@ -444,16 +444,24 @@ public class CourseManageApi extends ApiBaseController{
return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
}
if(!isLocalDevelopment()) {
//转化用户id
User u = userService.getByUserNo(dto.getAuditUser().getCode());
if(u==null) { //本地没有，需要同步
//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid());
Account a =userService.syncAccountUser(fwUser);
dto.getAuditUser().setAid(a.getId());
if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
return badRequest("HRBP审核信息人员错误");
}
//转化用户id
User u = userService.getByUserNo(dto.getAuditUser().getCode());
if(u==null) { //本地没有，需要同步
//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid());
Account a =userService.syncAccountUser(fwUser);
dto.getAuditUser().setAid(a.getId());
}else {
dto.getAuditUser().setAid(u.getId());
}
}else {
dto.getAuditUser().setAid(u.getId());
log.info("已获取过hrbp审核人id【"+dto.getAuditUser().getAid()+"】,不需要再转化");
}
}else {
//弄成固定值，用于测试
dto.getAuditUser().setAid(getCurrent().getAccountId());
@@ -531,9 +539,9 @@ public class CourseManageApi extends ApiBaseController{
return badRequest("未关联HRBP审核人员");
}
if(StringUtils.isBlank(ukid)){
return badRequest("未关联HRBP审核人员");
}
// if(StringUtils.isBlank(ukid)){
// return badRequest("未关联HRBP审核人员");
// }
Course course = courseService.get(audit.getCourseId());
if(StringUtils.isBlank(course.getOrgId())) {
@@ -551,19 +559,24 @@ public class CourseManageApi extends ApiBaseController{
}
if(!isLocalDevelopment()) {
//转化用户id
User u = userService.getByUserNo(ucode);
if(u==null) { //本地没有，需要同步
//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
UserVo fwUser = fwUserService.getById(ukid);
Account a =userService.syncAccountUser(fwUser);
audit.setAid(a.getId());
}else {
audit.setAid(u.getId());
}
if(StringUtils.isBlank(audit.getAid())) {
return badRequest("查询组织HRBP审核人员失败");
if(StringUtils.isBlank(ukid)){
return badRequest("未关联HRBP审核人员");
}
//转化用户id
User u = userService.getByUserNo(ucode);
if(u==null) { //本地没有，需要同步
//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
UserVo fwUser = fwUserService.getById(ukid);
Account a =userService.syncAccountUser(fwUser);
audit.setAid(a.getId());
}else {
audit.setAid(u.getId());
}
}else {
log.info("已获取过hrbp审核人id【"+audit.getAid()+"】,不需要再转化");
}
}else {
//弄成固定值，用于测试
audit.setAid(getCurrent().getAccountId());

2
servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseCrowd.java
View File

@@ -32,7 +32,7 @@ public class CourseCrowd extends IdBaseEntity{
/**
* 群组，受众id
*/
@Column(name = "group_id",nullable=false,length=20)
@Column(name = "group_id",nullable=false,length=36)
private String groupId;
/**

1
servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java
View File

@@ -417,6 +417,7 @@ public class CourseServiceImpl implements ICourseService {
query.setPageSize(num);
query.addFields("new Course(id,type,name,coverImg,score,studys,comments,shares,praises,favorites,forUsers,value,summary,publishTime,isTop,sysType1,sysType2,sysType3)");
List<Course> courseList = courseDao.findList(query.builder());
courseList.addAll(courses);
return courseList;
}

28
servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamExtendApi.java
View File

@@ -9,12 +9,10 @@ import com.xboe.module.exam.entity.AloneExam;
import com.xboe.module.exam.entity.AloneExamAnswer;
import com.xboe.module.exam.service.IAloneExamService;
import com.xboe.module.exam.vo.AloneExamQuery;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* 对于与第三方对接的扩展接口
@@ -31,16 +29,16 @@ public class AloneExamExtendApi extends ApiBaseController {
* */
@PostMapping("/save")
public JsonResponse<AloneExam> save(@RequestBody AloneExam aloneExam){
if(StringUtil.isNotBlank(aloneExam.getAid())){
if(StringUtil.isBlank(aloneExam.getAid())){
return badRequest("缺少用户参数");
}
if(StringUtil.isNotBlank(aloneExam.getTestId())){
if(StringUtil.isBlank(aloneExam.getTestId())){
return badRequest("缺少考试信息");
}
if(StringUtil.isNotBlank(aloneExam.getRefId())){
if(StringUtil.isBlank(aloneExam.getRefId())){
return badRequest("缺少关联信息");
}
if(StringUtil.isNotBlank(aloneExam.getRefType())){
if(StringUtil.isBlank(aloneExam.getRefType())){
return badRequest("缺少关联类型");
}
try {
@@ -68,7 +66,7 @@ public class AloneExamExtendApi extends ApiBaseController {
/**
* 根据考试id，refType,refId 用户id 查询用户答卷信息
* */
@PostMapping("/anser-page")
@PostMapping("/answer-page")
public JsonResponse<PageList<AloneExamAnswer>> answerpage(Pagination pager,AloneExamQuery aloneExamQuery){
try {
PageList<AloneExamAnswer> pageList = aloneExamService.answerPage(pager.getPageIndex(), pager.getPageSize(), aloneExamQuery);
@@ -78,6 +76,18 @@ public class AloneExamExtendApi extends ApiBaseController {
}
}
/**
* 根据考试任务id查询答卷
* */
@GetMapping("/answer")
public JsonResponse<List<AloneExamAnswer>> answer(String aloneId){
if(StringUtil.isBlank(aloneId)){
return badRequest("参数异常");
}
List<AloneExamAnswer> answer = aloneExamService.findAnswer(aloneId);
return success(answer);
}
}

24
servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/AloneExamAnswer.java
View File

@@ -201,4 +201,28 @@ public class AloneExamAnswer extends IdBaseEntity {
this.useSecond=useSecond;
}
public AloneExamAnswer(String id, String aid, String name, String testId, String testName, Integer arrange,
Integer passLine, Integer status, LocalDateTime startTime, LocalDateTime endTime,
LocalDateTime lastTime, String clientId,String ucode,Float score,
Float totalScore,Float realScore,Integer useSecond,String aloneId) {
this.setId(id);
this.aid = aid;
this.name = name;
this.testId = testId;
this.testName = testName;
this.arrange = arrange;
this.passLine = passLine;
this.status = status;
this.startTime = startTime;
this.endTime = endTime;
this.lastTime = lastTime;
this.clientIp = clientId;
this.ucode=ucode;
this.score=score;
this.totalScore=totalScore;
this.realScore=realScore;
this.useSecond=useSecond;
this.aloneId=aloneId;
}
}

5
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/IAloneExamService.java
View File

@@ -132,5 +132,10 @@ public interface IAloneExamService {
* 保存考试任务
* */
void save(AloneExam aloneExam);
/**
* 根据考试任务id 返回答卷信息
* */
List<AloneExamAnswer> findAnswer(String aloneId);
}

16
servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java
View File

@@ -156,10 +156,21 @@ public class AloneExamServiceImpl implements IAloneExamService{
}
@Override
@Transactional
public void save(AloneExam aloneExam) {
aeDao.save(aloneExam);
}
@Override
public List<AloneExamAnswer> findAnswer(String aloneId) {
QueryBuilder builder = QueryBuilder.from(AloneExamAnswer.class);
builder.addFilter(FieldFilters.eq("aloneId",aloneId));
builder.addOrder(OrderCondition.desc("sysCreateTime"));
builder.addField("new AloneExamAnswer(id,aid,name,testId,testName,arrange,passLine,status,startTime,endTime,lastTime,clientIp,ucode,score,totalScore,realScore,useSecond,aloneId)");
List<AloneExamAnswer> list = dao.findList(builder.builder());
return list;
}
@Override
public AloneExamAnswer get(String id) {
return dao.get(id);
@@ -248,6 +259,9 @@ public class AloneExamServiceImpl implements IAloneExamService{
if(StringUtil.isNotBlank(examQuery.getRefType())){
builder.addFilter(FieldFilters.eq("a.refType",examQuery.getRefType()));
}
if(StringUtil.isNotBlank(examQuery.getAid())){
builder.addFilter(FieldFilters.eq("a.aid",examQuery.getAid()));
}
}
PageList<AloneExam> page = aeDao.findPage(builder.builder());
@@ -257,7 +271,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
@Override
public PageList<AloneExamAnswer> answerPage(int pageIndex, int pageSize, AloneExamQuery aloneExamQuery) {
QueryBuilder builder=QueryBuilder.from(AloneExam.class.getSimpleName()+" a,"+AloneExamAnswer.class.getSimpleName()+" aa");
builder.addField("new AloneExamAnswer(aa.id,aa.aid,aa.name,aa.testId,aa.testName,aa.arrange,aa.passLine,aa.status,aa.startTime,aa.endTime,aa.lastTime,aa.clientIp,aa.ucode,aa.score,aa.totalScore,aa.realScore,aa.useSecond)");
builder.addField("new AloneExamAnswer(aa.id,aa.aid,aa.name,aa.testId,aa.testName,aa.arrange,aa.passLine,aa.status,aa.startTime,aa.endTime,aa.lastTime,aa.clientIp,aa.ucode,aa.score,aa.totalScore,aa.realScore,aa.useSecond,aa.aloneId)");
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFilter(FieldFilters.eqField("a.id","aa.aloneId"));

41
servers/boe-server-all/src/main/java/com/xboe/module/interaction/api/CommentsApi.java
View File

@@ -169,6 +169,47 @@ public class CommentsApi extends ApiBaseController{
return error("查询@我的数据失败",e.getMessage());
}
}
/**
* 查询@我的
* @param pager
* @param type 类型，课程 ，文章，问题
* @param send
* @param isread 是否已读，对应已回答的
* @return
*/
@RequestMapping(value="/tome/mobilepage",method= {RequestMethod.GET,RequestMethod.POST})
public JsonResponse<PageList<CommentsDto>> tomeMobilePage(Pagination pager,String send,Boolean isread){
String aid=getCurrent().getAccountId();
PageList<CommentsDto> all = service.findMobileAll(pager.getPageIndex(), pager.getPageSize(), aid, send);
return success(all);
// try {
// if(type==1) {
// PageList<CommentsDto> list=service.findCourseTome(pager.getPageIndex(),pager.getPageSize(), type, aid, send,isread);
// //查询二级回复内容
// return success(list);
// }
// if(type==2){
// PageList<CommentsDto> list=service.findArticleTome(pager.getPageIndex(),pager.getPageSize(), type, aid, send,isread);
// //查询二级回复内容
// return success(list);
// }
// if(type==3){
// PageList<CommentsDto> casesTome = service.findCasesTome(pager.getPageIndex(), pager.getPageSize(), type, aid, send, isread);
// return success(casesTome);
// }
// if(type==4){
// PageList<CommentsDto> list = service.findQaTome(pager.getPageIndex(), pager.getPageSize(), type, aid, send, isread);
// return success(list);
// }
// else {
// return success(new PageList<CommentsDto>());
// }
// }catch(Exception e) {
// return error("查询@我的数据失败",e.getMessage());
// }
}
@PostMapping("/add")
@AutoLog(module = "评论",action = "添加评论",info = "添加评论内容")

6
servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/ICommentsService.java
View File

@@ -136,6 +136,12 @@ public interface ICommentsService {
* */
PageList<CommentsDto> findAll(int pageIndex, int pageSize, String toaid, String uname);
/**
* 查询@我的全部 去掉案例和笔记
* 问答和其他三个结构不一样
* */
PageList<CommentsDto> findMobileAll(int pageIndex, int pageSize, String toaid, String uname);
/**
*

82
servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java
View File

@@ -296,6 +296,88 @@ public class CommentsServiceImpl implements ICommentsService{
}
@Override
public PageList<CommentsDto> findMobileAll(int pageIndex, int pageSize, String toaid, String uname) {
PageList<CommentsDto> list = new PageList<>();
list.setList(new ArrayList<CommentsDto>());
QueryBuilder builder = QueryBuilder.from(CommentQa.class);
// builder.addFilter(FieldFilters.eq("deleted",false));
// builder.addFilter(FieldFilters.ne("objType",4));
if(StringUtil.isNotBlank(toaid)){
builder.addFilter(FieldFilters.eq("toAid",toaid));
}
if(StringUtil.isNotBlank(uname)){
builder.addFilter(FieldFilters.eq("sysCreateBy",uname));
}
builder.addOrder(OrderCondition.desc("sysCreateTime"));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
//查出所有@我的数据
PageList<CommentQa> page = commentQaDao.findPage(builder.builder());
//问答
List<String> qaStrings = new ArrayList<>();
//文章
List<String> articleStrings = new ArrayList<>();
for (CommentQa c:page.getList()) {
if(c.getRefType()!=3) {
CommentsDto commentsDto = new CommentsDto();
commentsDto.setCommentId(c.getId());
commentsDto.setObjId(c.getRefId());
commentsDto.setObjType(c.getRefType());
commentsDto.setToAid(c.getToAid());
commentsDto.setToAname(c.getToName());
commentsDto.setContent(c.getContent());
commentsDto.setSysCreateAid(c.getSysCreateAid());
commentsDto.setSysCreateBy(c.getSysCreateBy());
commentsDto.setSysCreateTime(c.getSysCreateTime());
list.getList().add(commentsDto);
if (c.getRefType() == 4) {
qaStrings.add(c.getRefId());
}
if (c.getRefType() == 2) {
articleStrings.add(c.getRefId());
}
}
}
if(qaStrings!=null && !qaStrings.isEmpty()){
QueryBuilder builder1 = QueryBuilder.from(Question.class);
builder1.addFilter(FieldFilters.in("id",qaStrings));
builder1.addFields("new Question(id,title)");
List<Question> qaList = questionDao.findList(builder1.builder());
if(qaList!=null && !qaList.isEmpty()){
for (Question q:qaList) {
for (CommentsDto c:list.getList()) {
if(q.getId().equals(c.getObjId())){
c.setTitle(q.getTitle());
}
}
}
}
}
if(articleStrings!=null && !articleStrings.isEmpty()){
QueryBuilder builder1 = QueryBuilder.from(Article.class);
builder1.addFilter(FieldFilters.in("id",articleStrings));
builder1.addFields("new Article(id,title)");
List<Article> articleList = articleDao.findList(builder1.builder());
if(articleList!=null && !articleList.isEmpty()){
for (Article a:articleList) {
for (CommentsDto c:list.getList()) {
if(a.getId().equals(c.getObjId())){
c.setTitle(a.getTitle());
}
}
}
}
}
list.setCount(page.getCount());
list.setPageSize(pageSize);
return list;
}
@Override
public List<Comments> list(Integer objType, String objId) {
List<Comments> list = dao.findList(FieldFilters.eq("objType", objType), FieldFilters.eq("objId", objId));

14
servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/FavoritesServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
builder.addFilter(FieldFilters.eq("sysCreateAid",aid));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("id"));
builder.addOrder(OrderCondition.desc("sysCreateTime"));
if(StringUtils.isNotBlank(keyWord)){
builder.addFilter(FieldFilters.like("title", LikeMatchMode.ANYWHERE,keyWord));
}
@@ -407,7 +407,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder query=QueryBuilder.from(Favorites.class);
query.setPageIndex(pageIndex);
query.setPageSize(pageSize);
query.addOrder(OrderCondition.desc("id"));
query.addOrder(OrderCondition.desc("sysCreateTime"));
if(favorite.getObjType()!=null) {
query.addFilter(FieldFilters.eq("objType", favorite.getObjType()));
}
@@ -442,7 +442,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
query.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","f.objType","c.score");
query.setPageIndex(pageIndex);
query.setPageSize(pageSize);
query.addOrder(OrderCondition.desc("f.id"));
query.addOrder(OrderCondition.desc("f.sysCreateTime"));
query.addFilter(FieldFilters.eqField("f.objId","c.id"));
query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Course.value()));
//查询用户自己的课程收藏，
@@ -511,7 +511,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder query=QueryBuilder.from(from);
query.setPageIndex(pageIndex);
query.setPageSize(pageSize);
query.addOrder(OrderCondition.desc("f.id"));
query.addOrder(OrderCondition.desc("f.sysCreateTime"));
query.addFilter(FieldFilters.eqField("f.objId","q.id"));
query.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.QA.value()));
//查询用户自己的问答收藏，
@@ -589,7 +589,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder=QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.id"));
builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("f.objId","a.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Answer.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));
@@ -640,7 +640,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.id"));
builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("f.objId","c.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Case.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));
@@ -685,7 +685,7 @@ public class FavoritesServiceImpl implements IFavoritesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("f.id"));
builder.addOrder(OrderCondition.desc("f.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("f.objId","a.id"));
builder.addFilter(FieldFilters.eq("f.objType",BoedxResourceType.Article.value()));
builder.addFilter(FieldFilters.eq("f.sysCreateAid",aid));

22
servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/SharesServiceImpl.java
View File

@@ -114,7 +114,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(Shares.class);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("id"));
builder.addOrder(OrderCondition.desc("sysCreateTime"));
if(shares.getObjType()!=null){
builder.addFilter(FieldFilters.eq("objType",shares.getObjType()));
}
@@ -163,7 +163,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","q.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.QA.value()));
builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid));
@@ -211,7 +211,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","c.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Case.value()));
builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid));
@@ -264,7 +264,7 @@ public class SharesServiceImpl implements ISharesService{
builder.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites,s.isRead");
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","c.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Course.value()));
builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid));
@@ -324,7 +324,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","a.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Article.value()));
builder.addFilter(FieldFilters.eq("s.sysCreateAid",aid));
@@ -382,7 +382,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","q.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.QA.value()));
builder.addFilter(FieldFilters.eq("s.toAid",aid));
@@ -434,7 +434,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","c.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Case.value()));
builder.addFilter(FieldFilters.eq("s.toAid",aid));
@@ -487,7 +487,7 @@ public class SharesServiceImpl implements ISharesService{
builder.addFields("c.deadTime","c.views","c.comments","c.praises","c.shares","c.favorites","s.isRead");
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","c.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Course.value()));
builder.addFilter(FieldFilters.eq("s.toAid",aid));
@@ -547,7 +547,7 @@ public class SharesServiceImpl implements ISharesService{
QueryBuilder builder = QueryBuilder.from(from);
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("s.id"));
builder.addOrder(OrderCondition.desc("s.sysCreateTime"));
builder.addFilter(FieldFilters.eqField("s.objId","a.id"));
builder.addFilter(FieldFilters.eq("s.objType",BoedxResourceType.Article.value()));
builder.addFilter(FieldFilters.eq("s.toAid",aid));
@@ -623,7 +623,7 @@ public class SharesServiceImpl implements ISharesService{
builder.addFilter(FieldFilters.eq("sysCreateAid",aid));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("id"));
builder.addOrder(OrderCondition.desc("sysCreateTime"));
//关键字查询
if(StringUtils.isNotBlank(keyword)){
builder.addFilter(FieldFilters.or(FieldFilters.like("content",LikeMatchMode.ANYWHERE,keyword),
@@ -787,7 +787,7 @@ public class SharesServiceImpl implements ISharesService{
builder.addFilter(FieldFilters.eq("toAid",aid));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addOrder(OrderCondition.desc("id"));
builder.addOrder(OrderCondition.desc("sysCreateTime"));
//关键字查询
if(StringUtils.isNotBlank(keyword)){
builder.addFilter(FieldFilters.or(FieldFilters.like("content",LikeMatchMode.ANYWHERE,keyword),

2
servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java
View File

@@ -309,7 +309,7 @@ public class QuestionServiceImpl implements IQuestionService {
builder.addFilter(FieldFilters.eq("q.status",1));
builder.addFilter(FieldFilters.eq("a.sysCreateAid",aid));
builder.addFilter(FieldFilters.eqField("a.qid","q.id"));
builder.addOrder(OrderCondition.desc("a.id"));
builder.addOrder(OrderCondition.desc("a.sysCreateTime"));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFields("q.id","q.title","q.content","a.id","a.qid","a.content","q.sysCreateTime","a.sysCreateTime",

22
servers/boe-server-all/src/main/java/com/xboe/module/tools/api/RedisCommandApi.java
View File

@@ -2,8 +2,11 @@ package com.xboe.module.tools.api;
import com.xboe.common.utils.StringUtil;
import com.xboe.constants.CacheName;
import com.xboe.core.JsonResponse;
import com.xboe.core.api.ApiBaseController;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Caching;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,4 +29,23 @@ public class RedisCommandApi extends ApiBaseController {
Boolean delete = redisTemplate.delete(key);
return success(delete);
}
@GetMapping("/remove-usercache")
public JsonResponse<Boolean> removeUserCache(String id){
if(StringUtil.isBlank(id)){
return badRequest("参数异常");
}
String accountId="user::account:"+id;
String userId="user::user:"+id;
try {
redisTemplate.delete(accountId);
redisTemplate.delete(userId);
return success(true);
} catch (Exception e) {
return error("清楚失败",e.getMessage());
}
}
}

11
servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java
View File

@@ -45,6 +45,13 @@ public class MessageApi extends ApiBaseController {
PageList<Message> list = service.query(pager.getPageIndex(), pager.getPageSize(), aid, isRead);
return success(list);
}
@PostMapping("/mobilelist")
public JsonResponse<PageList<Message>> mobileList(Pagination pager,Boolean isRead){
String aid = this.getCurrent().getAccountId();
PageList<Message> list = service.queryMobile(pager.getPageIndex(), pager.getPageSize(), aid, isRead);
return success(list);
}
/**
* 删除消息
* @param ids 所勾选的id集合
@@ -210,6 +217,10 @@ public class MessageApi extends ApiBaseController {
return success(messages);
}
/**
*
* */
}

5
servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java
View File

@@ -16,6 +16,11 @@ public interface IMessageService {
* */
PageList<Message> query(int pageIndex,int pageSize,String aid,Boolean isRead);
/**
* 查看消息
* */
PageList<Message> queryMobile(int pageIndex,int pageSize,String aid,Boolean isRead);
/**
* 删除消息
* */

18
servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.annotation.Resource;
import com.xboe.common.OrderCondition;
import com.xboe.core.orm.FilterCheckValue;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,23 @@ public class MessageServiceImpl implements IMessageService {
return list;
}
@Override
public PageList<Message> queryMobile(int pageIndex, int pageSize, String aid, Boolean isRead) {
QueryBuilder builder = QueryBuilder.from(Message.class);
builder.addOrder(OrderCondition.desc("id"));
builder.setPageIndex(pageIndex);
builder.setPageSize(pageSize);
builder.addFilter(FieldFilters.eq("acceptId",aid));
builder.addFilter(FieldFilters.ne("refType","3"));
builder.addFilter(FieldFilters.ne("refType","6"));
// builder.addFilter(FieldFilters.ne("refType","3", FilterCheckValue.NONE));
if(isRead!=null){
builder.addFilter(FieldFilters.eq("isRead",isRead));
}
PageList<Message> list = dao.findPage(builder.builder());
return list;
}
@Override
public void delete(List<String> ids) {
dao.deleteByFilter(FieldFilters.in("id",ids));

16
servers/boe-server-case/pom.xml
View File

@@ -23,11 +23,6 @@
<artifactId>xboe-core</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.xboe</groupId>
<artifactId>xboe-redis</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.xboe</groupId>
<artifactId>xboe-module-event</artifactId>
@@ -70,20 +65,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.session</groupId>
<artifactId>spring-session-data-redis</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.27</version>

16
servers/boe-server-case/src/main/java/com/xboe/casetask/CaseDataSyncRunner.java
View File

@@ -27,6 +27,7 @@ import com.xboe.casetask.entity.CaseSyncCustomize;
import com.xboe.casetask.entity.CaseSyncLog;
import com.xboe.casetask.entity.CaseSyncRecord;
import com.xboe.casetask.entity.DictItem;
import com.xboe.casetask.entity.User;
import com.xboe.casetask.service.ICaseSyncLogService;
import com.xboe.casetask.service.ICaseSyncService;
import com.xboe.common.utils.StringUtil;
@@ -317,7 +318,7 @@ public class CaseDataSyncRunner {
}
//用户的转化处理,各处异常处理
//用户的转化处理,各种异常处理
String owner =csr.getCaseOwner();
if(StringUtils.isNotBlank(owner)) {
int leftIdx=owner.indexOf("<");
@@ -336,8 +337,17 @@ public class CaseDataSyncRunner {
}
}else {
csr.setStatus(1);
csr.setErrorInfo(csr.getErrorInfo()+",caseOwner数据格式错误【"+owner+"】");
//这种情况把它当成单独的工号处理
User u= syncService.getByUserNo(owner);
if(u==null) {
csr.setStatus(1);
csr.setErrorInfo(csr.getErrorInfo()+",关联用户失败【"+csr.getCaseOwner()+"】");
}else {
csr.setAuthorId(u.getId());
csr.setAuthorName(u.getName());
}
// csr.setStatus(1);
// csr.setErrorInfo(csr.getErrorInfo()+",caseOwner数据格式错误【"+owner+"】");
}
}else {
csr.setStatus(1);

2
servers/boe-server-case/src/main/java/com/xboe/casetask/entity/CasesMajorType.java
View File

@@ -15,7 +15,7 @@ import java.util.Set;
* */
@Data
@Entity
@Entity
@EqualsAndHashCode(callSuper = false)
@Table(name = SysConstant.TABLE_PRE+"cases_major_type")
public class CasesMajorType extends IdEntity{

8
servers/boe-server-case/src/main/java/com/xboe/casetask/service/ICaseSyncService.java
View File

@@ -7,6 +7,7 @@ import com.xboe.casetask.entity.CaseSyncCustomize;
import com.xboe.casetask.entity.CaseSyncRecord;
import com.xboe.casetask.entity.Cases;
import com.xboe.casetask.entity.DictItem;
import com.xboe.casetask.entity.User;
import com.xboe.common.PageList;
public interface ICaseSyncService {
@@ -18,6 +19,13 @@ public interface ICaseSyncService {
*/
String getIdByUserNo(String userNo);
/**
* 根据工号，查询用户信息
* @param userNo
* @return
*/
User getByUserNo(String userNo);
/**
* 获得所有的组织领域
* @return

11
servers/boe-server-case/src/main/java/com/xboe/casetask/service/impl/CaseSyncServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.xboe.casetask.entity.CaseSyncRecord;
import com.xboe.casetask.entity.Cases;
import com.xboe.casetask.entity.CasesMajorType;
import com.xboe.casetask.entity.DictItem;
import com.xboe.casetask.entity.User;
import com.xboe.casetask.service.ICaseSyncService;
import com.xboe.common.OrderCondition;
import com.xboe.common.PageList;
@@ -314,6 +315,10 @@ public class CaseSyncServiceImpl implements ICaseSyncService{
if(record.getStatus()!=null) {
query.addFilter(FieldFilters.eq("status", record.getStatus()));
}
//特定的需求过滤
if(StringUtils.isNotBlank(record.getErrorInfo())) {
query.addFilter(FieldFilters.ne("errorInfo", record.getErrorInfo()));
}
}
return recordDao.findPage(query.builder());
@@ -347,4 +352,10 @@ public class CaseSyncServiceImpl implements ICaseSyncService{
return recordDao.findDictItemByName(name1, name2);
}
@Override
public User getByUserNo(String userNo) {
User user=userDao.findOne(FieldFilters.eq("userNo", userNo));
return user;
}
}

18
servers/boe-server-case/src/main/resources/application-dev.properties
View File

@@ -1,32 +1,18 @@
## redis
spring.redis.database=2
spring.redis.host=127.0.0.1
spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
spring.redis.port=6379
## datasource config
spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base3?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boeu_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=root
spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
## xboe config
xboe.api.cross_filter=true
## 上传相磁的路径配置
xboe.upload.file.temp_path=E:/Projects/BOE/java/static/temp
xboe.upload.file.save_path=E:/Projects/BOE/java/static/upload
xboe.upload.file.http_path=http://localhost:9090/cdn/upload
## 外部接口调用地址 旧系统机构及用户数据接口
xboe.externalinterface.url.system=http://localhost:9091
## 案例接口配置,init 是否需要初始化
xboe.case.sync.init=true

15
servers/boe-server-case/src/main/resources/application-pre.properties
View File

@@ -1,9 +1,3 @@
## redis
spring.redis.database=2
spring.redis.host=127.0.0.1
spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
spring.redis.port=6379
## datasource config
spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
@@ -14,19 +8,10 @@ spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
logging.level.org.hibernate.SQL=ERROR
# logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
## xboe config
xboe.api.cross_filter=true
## 上传相磁的路径配置
xboe.upload.file.temp_path=E:/Projects/BOE/java/static/temp
xboe.upload.file.save_path=E:/Projects/BOE/java/static/upload
xboe.upload.file.http_path=http://localhost:9090/cdn/upload
## 外部接口调用地址 旧系统机构及用户数据接口
xboe.externalinterface.url.system=http://localhost:9091
## 案例接口配置
## 案例接口配置,init 是否需要初始化

17
servers/boe-server-case/src/main/resources/application-pro.properties
View File

@@ -1,10 +1,6 @@
## redis
spring.redis.database=2
spring.redis.host=127.0.0.1
spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
spring.redis.port=6379
## datasource config
spring.jpa.show-sql = false
spring.jpa.hibernate.ddl-auto=none
spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
@@ -14,19 +10,10 @@ spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
logging.level.org.hibernate.SQL=ERROR
# logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
## xboe config
xboe.api.cross_filter=true
## 上传相磁的路径配置
xboe.upload.file.temp_path=E:/Projects/BOE/java/static/temp
xboe.upload.file.save_path=E:/Projects/BOE/java/static/upload
xboe.upload.file.http_path=http://localhost:9090/cdn/upload
## 外部接口调用地址 旧系统机构及用户数据接口
xboe.externalinterface.url.system=http://localhost:9091
## 案例接口配置
## 案例接口配置,init 是否需要初始化

17
servers/boe-server-case/src/main/resources/application-test.properties
View File

@@ -1,30 +1,17 @@
## redis
spring.redis.database=2
spring.redis.host=127.0.0.1
spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
spring.redis.port=6379
## datasource config
spring.jpa.show-sql = false
spring.jpa.hibernate.ddl-auto=none
spring.datasource.driverClassName=com.mysql.jdbc.Driver
# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
spring.datasource.username=boe_base
spring.datasource.password=ENC(MaC28GJw2JcbH8Lil0CrqSDTYxX49FJ0rxcmHH2pX0k=)
logging.level.org.hibernate.SQL=DEBUG
logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
## xboe config
xboe.api.cross_filter=true
## 上传相磁的路径配置
xboe.upload.file.temp_path=/www/wwwroot/file/temp
xboe.upload.file.save_path=/www/wwwroot/file/upload
xboe.upload.file.http_path=http://114.115.162.187/file/upload
## 外部接口调用地址 旧系统机构及用户数据接口
xboe.externalinterface.url.system=http://127.0.0.1:9091
## 案例接口配置
## 案例接口配置,init 是否需要初始化

8
servers/boe-server-case/src/main/resources/application.properties
View File

@@ -31,10 +31,6 @@ spring.servlet.multipart.max-request-size=1024MB
## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
spring.mvc.static-path-pattern=/cdn/**
spring.redis.database=2
spring.redis.host=127.0.0.1
spring.redis.password=1Qaz2wsx
spring.redis.port=6379
spring.redis.lettuce.pool.max-active=8
spring.redis.lettuce.pool.min-idle=0
@@ -47,10 +43,10 @@ spring.redis.lettuce.shutdown-timeout=100ms
# jpa config
spring.jpa.database = MYSQL
spring.jpa.show-sql = true
spring.jpa.show-sql = false
# spring.jpa.properties.hibernate.cache.use_second_level_cache=true
# spring.jpa.properties.hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory
spring.jpa.hibernate.ddl-auto=update
spring.jpa.hibernate.ddl-auto=none
spring.jpa.properties.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect