diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 7847757c..f0e1d177 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -11,12 +11,14 @@ import com.xboe.core.orm.FieldFilters; import com.xboe.module.boecase.dao.CasesMajorTypeDao; import com.xboe.module.boecase.dto.*; import com.xboe.module.boecase.entity.CasesMajorType; +import com.xboe.module.boecase.service.ICasesRecommendPushRecordService; import com.xboe.module.boecase.vo.CaseExportVo; import com.xboe.module.dict.entity.DictItem; import com.xboe.module.excel.ExportsExcelSenderUtil; import com.xboe.system.user.dao.UserDao; import com.xboe.system.user.entity.User; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -63,6 +65,9 @@ public class CasesApi extends ApiBaseController { @Resource private UserDao userDao; + @Autowired + private ICasesRecommendPushRecordService casesRecommendPushRecordService; + /** * 用于后台管理 * @param pager @@ -123,9 +128,8 @@ public class CasesApi extends ApiBaseController { return success(views); } -// @PostMapping("/queryListV2") -// public JsonResponse> queryCaseBreV2(@Validated @RequestBody CasePageVo req){ - public JsonResponse> queryCaseBreV2(CasePageVo req){ + @PostMapping("/queryListV2") + public JsonResponse> queryCaseBreV2(@Validated @RequestBody CasePageVo req){ String type = req.getType(); PageList views; req.setUserId(getCurrent().getAccountId()); @@ -524,14 +528,21 @@ public class CasesApi extends ApiBaseController { if(StringUtil.isBlank(cases.getAuthorId())){ return badRequest("请选择作者"); } +// if(StringUtils.isBlank(cases.getType())){ +// return badRequest("type参数不能为空"); +// } if(cases.getExcellent()==null){ cases.setExcellent(false); } if(StringUtils.isBlank(cases.getConfidentialityLevel())) { cases.setConfidentialityLevel("内部"); } + String type = cases.getType(); try { casesService.update(cases); + if(type.equals("recommend")){ + casesRecommendPushRecordService.update(cases); + } return success(true); } catch (Exception e) { log.error("更新案例错误",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java index a9242915..c9c54960 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java @@ -257,6 +257,18 @@ public class Cases extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime excellentTime; + /** + * type 种类 + * 区分 案例/推荐案例 + */ + @Transient + private String type; + + /** + * id + */ + + @Transient private List majorIds; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java index d3e73305..e32729c6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java @@ -79,6 +79,26 @@ public class CasesRecommendPushRecord extends BaseEntity { @Column(name = "read_start_time") private Date readStartTime; + /** + * sysType1 + */ + @Column(name = "sys_type1") + private String sysType1; + + /** + * sysType2 + */ + @Column(name = "sys_type2") + private String sysType2; + + /** + * sysType3 + */ + @Column(name = "sys_type3") + private String sysType3; + + + // /** // * 最后查看时间 // */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java index 30fe719b..e507e9c9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendPushRecordService.java @@ -1,6 +1,7 @@ package com.xboe.module.boecase.service; import com.xboe.core.CurrentUser; +import com.xboe.module.boecase.entity.Cases; import com.xboe.module.boecase.entity.CasesRecommend; import com.xboe.module.boecase.entity.CasesRecommendPushRecord; import com.xboe.module.boecase.vo.CasesRecommendLaunchVo; @@ -45,10 +46,17 @@ public interface ICasesRecommendPushRecordService { */ boolean startRead(String caseRecommendId); + boolean update(Cases cases); + // /** // * 结束读 // * @param caseRecommendId // * @return // */ // boolean endRead(String caseRecommendId); + + /** + * 推荐案例修改 + */ + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index ab989a6d..dd8c777c 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -22,6 +22,7 @@ import com.xboe.module.boecase.service.ICasesRecommendPushRecordService; import com.xboe.module.boecase.vo.CasesRecommendLaunchVo; import com.xboe.system.user.dao.UserDao; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -225,6 +226,28 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR .builder()) > 0; } + @Override + public boolean update(Cases cases) { + String sysType1 = ""; + String sysType2 = ""; + String sysType3 = ""; + if(StringUtils.isNotEmpty(cases.getSysType1())){ + sysType1 = cases.getSysType1(); + } + if(StringUtils.isNotEmpty(cases.getSysType2())){ + sysType2 = cases.getSysType2(); + } + if(StringUtils.isNotEmpty(cases.getSysType3())){ + sysType3 = cases.getSysType3(); + } + return casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class) + .addUpdateField("sys_type1",sysType1) + .addUpdateField("sys_type2",sysType2) + .addUpdateField("sys_type3",sysType3) + .addFilter(FieldFilters.eq("id",cases.getId())).builder() + ) > 0; + } + // @Override // public boolean endRead(String caseRecommendId) { // CasesRecommendPushRecord casesRecommendPushRecord = casesRecommendPushRecordDao.get(caseRecommendId);