From 4f1a71f740a5859fb2dfe6a5640e86f05c2a15ee Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 11 Oct 2023 17:20:53 +0800 Subject: [PATCH 01/36] =?UTF-8?q?tree-list=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/type/api/TypeApi.java | 4 ++++ .../src/main/java/com/xboe/module/type/vo/TypeVo.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java index 397794d9..e137ab13 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java @@ -68,6 +68,8 @@ public class TypeApi extends ApiBaseController { if (StringUtil.equals(item.getParentId(), BaseConstant.TREEDATA_ROOT_PARENT_ID)) { TypeVo vo = new TypeVo(); BeanUtils.copyProperties(item, vo); + vo.setCode(item.getId()); + vo.setValue(item.getId()); ResDataManager rdm = resDataManagerMap.get(vo.getId()); if (rdm != null) { User user = userService.get(rdm.getAid()); @@ -98,6 +100,8 @@ public class TypeApi extends ApiBaseController { TypeVo vo = new TypeVo(); BeanUtils.copyProperties(item, vo); vo.setParentName(typeVo.getName()); + vo.setCode(item.getId()); + vo.setValue(item.getId()); ResDataManager rdm = resDataManagerMap.get(vo.getId()); if (rdm != null) { User user = userService.get(rdm.getAid()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java index 8da8beca..fbcfa757 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java @@ -31,4 +31,7 @@ public class TypeVo extends Type { * 资源数据管理人员 */ private ResDataManager resDataManager; + + private String code; + private String value; } From b5f4ee43f8ac311e464f545b017f163821a72175 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 11 Oct 2023 17:27:53 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boe-server-all/src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index d591c3cb..7dccb218 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -1,5 +1,5 @@ -spring.profiles.active= test -#@profileActive@ +spring.profiles.active= @profileActive@ + spring.application.name=boe-server-all server.port=9090 server.servlet.session.timeout=30m From 14f25dcc6bc64117e59fead575362faf8bbfa2a3 Mon Sep 17 00:00:00 2001 From: lu Date: Mon, 16 Oct 2023 18:11:22 +0800 Subject: [PATCH 03/36] =?UTF-8?q?add=20=E6=A1=88=E4=BE=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=89=E7=BA=A7=E7=A7=8D=E7=B1=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/boecase/api/CasesApi.java | 5 +++-- .../java/com/xboe/module/boecase/dao/CasesRecordDao.java | 8 +++++--- .../main/java/com/xboe/module/boecase/dto/CasePageVo.java | 7 +++++++ 3 files changed, 15 insertions(+), 5 deletions(-) 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 c48b771e..7847757c 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 @@ -123,8 +123,9 @@ public class CasesApi extends ApiBaseController { return success(views); } - @PostMapping("/queryListV2") - public JsonResponse> queryCaseBreV2(@Validated @RequestBody CasePageVo req){ +// @PostMapping("/queryListV2") +// public JsonResponse> queryCaseBreV2(@Validated @RequestBody CasePageVo req){ + public JsonResponse> queryCaseBreV2(CasePageVo req){ String type = req.getType(); PageList views; req.setUserId(getCurrent().getAccountId()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java index deecfd10..486948f8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -21,9 +21,8 @@ import java.util.List; */ @Repository public interface CasesRecordDao extends JpaRepository, JpaSpecificationExecutor { - @Query(nativeQuery = true, value = "select c.* from ( select b.*" + - " from boe_cases_recommend_push_record a INNER JOIN boe_cases b on a.case_id = b.id" + + " from boe_cases_recommend_push_record a left JOIN boe_cases b on a.case_id = b.id" + " where b.deleted=0 and a.push_status = 3 and a.deleted=0 and a.push_user_id= :#{#condition.userId}" + " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" + @@ -40,9 +39,12 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi " or if(:#{#condition.org2Empty}, 1=2, b.org_domain_parent2 in (:#{#condition.org2}))" + " or if(:#{#condition.org3Empty}, 1=2, b.org_domain_parent3 in (:#{#condition.org3}))" + ")" + + " and if(:#{#condition.isSysType1Empty} , 1=1, b.sys_type1 = :#{#condition.sysType1} )"+ + " and if(:#{#condition.isSysType2Empty} , 1=1, b.sys_type2 = :#{#condition.sysType2} )"+ + " and if(:#{#condition.isSysType3Empty} , 1=1, b.sys_type3 = :#{#condition.sysType3} )"+ " order by a.sys_create_time DESC, a.read_flag ASC) as c group by c.id", countQuery = "select count(*) FROM (select c.* from ( select b.*" + - " from boe_cases_recommend_push_record a INNER JOIN boe_cases b on a.case_id = b.id " + + " from boe_cases_recommend_push_record a left JOIN boe_cases b on a.case_id = b.id " + " where b.deleted=0 and a.push_status = 3 and a.deleted=0 and a.push_user_id= :#{#condition.userId}" + " and if(IFNULL(:#{#condition.keyWord},'')!='',b.title like CONCAT('%',:#{#condition.keyWord},'%')" + " or b.author_name like CONCAT('%',:#{#condition.keyWord},'%')" + diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java index 619bc489..5ccb6e48 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java @@ -1,6 +1,7 @@ package com.xboe.module.boecase.dto; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import lombok.Data; import java.util.List; @@ -98,4 +99,10 @@ public class CasePageVo extends PageDto { return this.isOrg1Empty() && this.isOrg2Empty() && this.isOrg3Empty(); } + public boolean isSysType1Empty(){ return StrUtil.isEmpty(this.sysType1); } + + public boolean isSysType2Empty(){ return StrUtil.isEmpty(this.sysType2); } + + public boolean isSysType3Empty(){ return StrUtil.isEmpty(this.sysType3); } + } From af12ca604ff9d5e34ec5a213d661b55c9da935a4 Mon Sep 17 00:00:00 2001 From: lu Date: Mon, 16 Oct 2023 18:24:03 +0800 Subject: [PATCH 04/36] =?UTF-8?q?add=20cases=E5=AD=97=E6=AE=B5=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/entity/Cases.java | 2 ++ 1 file changed, 2 insertions(+) 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 8fdc68f2..a9242915 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 @@ -296,6 +296,8 @@ public class Cases extends BaseEntity { public Long getRecommends1() { return recommends1; } + + @Transient public void setRecommends1(Long recommends1) { this.recommends1 = recommends1; From fcc77f08d8b01fcc12f3310446e2396337fb9418 Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 10:12:08 +0800 Subject: [PATCH 05/36] =?UTF-8?q?add=20=E6=A1=88=E4=BE=8B=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/api/CasesApi.java | 17 +++++++++++--- .../com/xboe/module/boecase/entity/Cases.java | 12 ++++++++++ .../entity/CasesRecommendPushRecord.java | 20 ++++++++++++++++ .../ICasesRecommendPushRecordService.java | 8 +++++++ .../CasesRecommendPushRecordServiceImpl.java | 23 +++++++++++++++++++ 5 files changed, 77 insertions(+), 3 deletions(-) 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); From 0b24f65cee247626a20530386f3234d995150ae6 Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 10:12:58 +0800 Subject: [PATCH 06/36] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=9C=AA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/entity/Cases.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) 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 c9c54960..67df4b7c 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 @@ -1,17 +1,18 @@ package com.xboe.module.boecase.entity; -import java.time.LocalDateTime; -import java.util.List; - -import javax.persistence.*; - import com.fasterxml.jackson.annotation.JsonFormat; import com.xboe.core.SysConstant; import com.xboe.core.orm.BaseEntity; - import lombok.Data; import lombok.EqualsAndHashCode; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.time.LocalDateTime; +import java.util.List; + /** * 案例表 * */ @@ -243,6 +244,15 @@ public class Cases extends BaseEntity { @Column(name = "case_value") private String caseValue; + // 种类字段1 + @Column(name = "sys_type1") + private String sysType1; + //种类字段2 + @Column(name = "sys_type2") + private String sysType2; + //种类字段3 + @Column(name = "sys_type3") + private String sysType3; /** * 最佳案例标识 From d0f2e0ab640255cd1fab3a957cf09272eaa9a47f Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 10:13:29 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/boecase/dao/CasesRecordDao.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java index 486948f8..65ce714a 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecordDao.java @@ -61,6 +61,9 @@ public interface CasesRecordDao extends JpaRepository, JpaSpecifi " or if(:#{#condition.org2Empty}, 1=1, b.org_domain_parent2 in (:#{#condition.org2}))" + " or if(:#{#condition.org3Empty}, 1=1, b.org_domain_parent3 in (:#{#condition.org3}))" + ")" + + " and if(:#{#condition.isSysType1Empty} , 1=1, b.sys_type1 = :#{#condition.sysType1} )"+ + " and if(:#{#condition.isSysType2Empty} , 1=1, b.sys_type2 = :#{#condition.sysType2} )"+ + " and if(:#{#condition.isSysType3Empty} , 1=1, b.sys_type3 = :#{#condition.sysType3} )"+ " order by a.sys_create_time DESC, a.read_flag ASC ) as c group by c.id) as d") Page queryList(Pageable pageable, @Param("condition") CasePageVo casePage); From 68dd9897ab4d87832226d87b86a24cb538ab3a8c Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 10:14:23 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E6=9C=AA=E6=8F=90=E4=BA=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/boecase/service/impl/CasesServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 55bf8d0c..9a1c9709 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -276,6 +276,17 @@ public class CasesServiceImpl implements ICasesService { if (StringUtils.isNotBlank(caseVo.getCaseType())) { filters.add(FieldFilters.eq("caseType", caseVo.getCaseType())); } + // 新增sysTepe1,sysTepe2,sysTepe3 字段 + if(StringUtils.isNotBlank(caseVo.getSysType1())){ + filters.add(FieldFilters.eq("sys_type1", caseVo.getSysType1())); + } + if(StringUtils.isNotBlank(caseVo.getSysType2())){ + filters.add(FieldFilters.eq("sys_type2", caseVo.getSysType2())); + } + if(StringUtils.isNotBlank(caseVo.getSysType3())){ + filters.add(FieldFilters.eq("sys_type3", caseVo.getSysType3())); + } + if (caseVo.getIsTop() != null && caseVo.getIsTop()) { query.addOrder(OrderCondition.desc("isTop")); query.addOrder(OrderCondition.desc("topTime")); From b46d903d383d3b0ac75f53c2cdf346703563d195 Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 10:42:37 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/api/CasesApi.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 f0e1d177..9c8175be 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 @@ -537,10 +537,11 @@ public class CasesApi extends ApiBaseController { if(StringUtils.isBlank(cases.getConfidentialityLevel())) { cases.setConfidentialityLevel("内部"); } - String type = cases.getType(); + try { casesService.update(cases); - if(type.equals("recommend")){ + // 修改案例表 可能用不到 + if(StringUtils.isNotBlank(cases.getType()) && cases.getType().equals("recommend")){ casesRecommendPushRecordService.update(cases); } return success(true); From 5d46f864399121fd60f224c22098fc2f77ef8300 Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 11:33:29 +0800 Subject: [PATCH 10/36] =?UTF-8?q?upd=20=E5=9F=8B=E7=82=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index b2b2042c..e69a33ec 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.transaction.Transactional; +import com.xboe.school.study.entity.StudyCourse; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -216,6 +217,18 @@ public class StudyServiceImpl implements IStudyService{ @Override @Transactional public void updateLastTime(String studyContentId, int lastStudyTime,String aid) { + // 获取时长 + StudyCourseItem sci = scItemDao.findOne(FieldFilters.eq("id", studyContentId),FieldFilters.eq("aid", aid)); + Integer endTime = sci.getLastStudyTime(); + // 间隔时长 + int abs = 0; + if(lastStudyTime - endTime < 0){ + //从头开始 + abs = lastStudyTime; + }else{ + // 获取时长 + abs = lastStudyTime - endTime; + } // 更新最后的学习时间点 LocalDateTime now=LocalDateTime.now(); UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class); @@ -226,6 +239,14 @@ public class StudyServiceImpl implements IStudyService{ update.addUpdateField("lastTime", now); scItemDao.update(update.builder()); //增加用户的学习时长,在api中调用 + + // 添加学习时长 + String contentId = sci.getContentId(); + UpdateBuilder updSc=UpdateBuilder.from(StudyCourse.class); + + // 追加总时长 + String sql="Update boe_study_course set total_duration=total_duration+"+abs+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; + scDao.sqlUpdate(sql,contentId); } @Override From d9687bd6f5b693218fb77e7205b1c38bec097d6a Mon Sep 17 00:00:00 2001 From: lu Date: Tue, 17 Oct 2023 19:55:48 +0800 Subject: [PATCH 11/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/dto/CasePageVo.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java index 5ccb6e48..b4d1ba62 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasePageVo.java @@ -79,6 +79,10 @@ public class CasePageVo extends PageDto { private List org2; private List org3; + private String sysType1; + private String sysType2; + private String sysType3; + public boolean isYearsEmpty() { return CollUtil.isEmpty(this.years); } From a4c67fc52e04d53e5bfc46dea92e0828fa71bee5 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Tue, 17 Oct 2023 20:44:10 +0800 Subject: [PATCH 12/36] 10/17 --- .../src/main/java/com/xboe/api/ThirdApi.java | 28 ++++++++++++++++++- .../main/java/com/xboe/api/vo/DictResult.java | 16 +++++++++++ .../module/course/api/CourseFullTextApi.java | 27 ++++++++++++++++-- .../module/course/api/CoursePortalApi.java | 2 +- .../module/course/dto/CourseQueryDto.java | 5 ++++ .../service/impl/PublishCourseUtil.java | 5 ++-- 6 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/api/vo/DictResult.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index dafe7c8c..71d7ebfb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -5,14 +5,20 @@ import cn.hutool.core.lang.Opt; import cn.hutool.http.HttpRequest; import cn.hutool.json.JSONUtil; import com.xboe.api.vo.*; +import com.xboe.module.dict.entity.DictDto; +import com.xboe.system.user.dao.UserDao; +import com.xboe.system.user.entity.User; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.concurrent.ForkJoinPool; +import java.util.stream.Collectors; import java.util.stream.IntStream; @Service @@ -24,7 +30,6 @@ public class ThirdApi { @Value("${orgTree.orgChildTreeList}") private String orgChildTreeListUrl; - @Value("${audience.usersByAudienceList}") private String usersByAudienceList; @@ -34,6 +39,27 @@ public class ThirdApi { @Value("${statApi.userdynamicList}") private String userdynamicListUrl; + @Autowired + UserDao userDao; + + @Value("${infrasApi.dict}") + private String infarasApiUrl; + + + + //获取例外人员的id + public List getUserId(){ + log.info("正在获取例外人员工号"); +// String s ="{\"show\":false,\"version\":\"1.1.0\",\"code\":200,\"msg\":\"请求成功！\",\"data\":{\"records\":[{\"id\":129,\"deleted\":null,\"createTime\":\"2023-10-16T10:03:25\",\"createId\":0,\"createName\":\"管理员\",\"updateTime\":\"2023-10-16T10:03:25\",\"updateId\":0,\"updateName\":\"管理员\",\"name\":\"李玉冰\",\"pid\":128,\"code\":\"00004409\",\"description\":null,\"value\":\"00004409\",\"img\":null,\"type\":1,\"level\":0,\"status\":0,\"sort\":0,\"children\":[]}],\"total\":0,\"size\":10,\"current\":1,\"orders\":[],\"id\":null,\"pid\":128,\"type\":1,\"status\":null,\"code\":null,\"name\":null,\"searchCount\":true,\"pages\":0},\"success\":true}"; + String s = Optional.ofNullable(HttpRequest.get("localhost:53323/dict/getCourseException").execute() //"current",1,"type",1,"pid",128) + .body()).orElseThrow(() -> new RuntimeException("token校验失败")); + List dictDtos = Opt.ofBlankAble(s).map(t -> JSONUtil.toBean(t, DictResult.class)).map(DictResult::getData).orElseThrow(); + ListuserNo=new ArrayList<>(); + for (DictDto dictDto : dictDtos) { + userNo.add(dictDto.getValue()); + } + return userDao.getListByUserNos(userNo).stream().map(User::getId).collect(Collectors.toList()); + } public List getAllUserList(UserListParam userListParam, String token) { log.info("获取用户:url:{}|params:{}|token:{}", searchUserListUrl, JSONUtil.toJsonStr(userListParam), token); diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/DictResult.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/DictResult.java new file mode 100644 index 00000000..96a2febd --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/DictResult.java @@ -0,0 +1,16 @@ +package com.xboe.api.vo; + +import com.xboe.module.dict.entity.DictDto; +import lombok.Data; + +import java.util.List; + +@Data +public class DictResult { + private Boolean show; + private String version; + private String code; + private String msg; + private List data; + private String success; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java index 33de5947..3390e9c0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseFullTextApi.java @@ -3,7 +3,17 @@ package com.xboe.module.course.api; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import com.xboe.api.ThirdApi; +import com.xboe.common.utils.StringUtil; +import com.xboe.module.boecase.dao.CasesRecordDao; +import com.xboe.old.dto.OrganizationDto; +import com.xboe.system.organization.api.OrganizationApi; +import com.xboe.system.organization.entity.Organization; +import com.xboe.system.organization.service.IOrganizationService; +import com.xboe.system.organization.service.impl.OrganizationServiceImpl; +import com.xboe.system.user.dao.UserDao; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -29,6 +39,8 @@ import com.xboe.module.course.service.ICourseTeacherService; import lombok.extern.slf4j.Slf4j; +import javax.annotation.Resource; + @Slf4j @RestController @RequestMapping(value="/xboe/m/course/fulltext") @@ -45,6 +57,11 @@ public class CourseFullTextApi extends ApiBaseController{ @Autowired(required = false) ICourseFullTextSearch fullTextSearch; + @Resource + IOrganizationService organizationService; + + @Autowired + ThirdApi thirdApi; /** * 课程的初始化 @@ -67,6 +84,8 @@ public class CourseFullTextApi extends ApiBaseController{ for(Course c:clist) { CourseFullText cft=CourseToCourseFullText.convert(c); try { + //添加创建人Id + cft.setSysCreateAid(c.getSysCreateAid()); //计算课程时长 int duration=ccourseService.sumDurationByCourseId(c.getId()); cft.setDuration(duration); @@ -193,7 +212,9 @@ public class CourseFullTextApi extends ApiBaseController{ */ @PostMapping("/search") public JsonResponse> search(Pagination pager,CourseQueryDto dto,Integer minDuration,Integer maxDuration){ - + //获取例外人员id + List userId = thirdApi.getUserId(); + String userIds = String.join(",", userId); //只是查询已发布的 dto.setPublish(true); if(this.fullTextSearch==null) { @@ -214,10 +235,12 @@ public class CourseFullTextApi extends ApiBaseController{ paras.setTypes(dto.getTypes());//多个分类的情况 //用户的companyId paras.setCompanyId(dto.getCompanyId()); - //paras.setAudience(dto.getAudiences()); if(StringUtils.isNotBlank(dto.getAudiences())) { paras.setAudiences(dto.getAudiences().split(",")); } + if(StringUtils.isNotBlank(userIds)) { + paras.setSysCreateAids(userIds.split(",")); + } paras.setOpenCourse(dto.getOpenCourse()); if(StringUtils.isNotBlank(dto.getOrderField())) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java index 4a7c940c..fbf593ae 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java @@ -305,7 +305,7 @@ public class CoursePortalApi extends ApiBaseController{ } rs.put("isCrowd",pass); - rs.put("contents",cclist); + rs.put("contents", cclist); rs.put("sections",sectionlist); rs.put("teachers",teachers); //查询课程 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java index bfb5b470..abef7f5d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java @@ -114,4 +114,9 @@ public class CourseQueryDto { private String refId; private String refType; + + /** + * 创建人id + */ + private String sysCreateAids; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/PublishCourseUtil.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/PublishCourseUtil.java index 117b013e..bed3b979 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/PublishCourseUtil.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/PublishCourseUtil.java @@ -96,8 +96,9 @@ public class PublishCourseUtil { }else { cft.setIsSetAudience(0);//无受众 } - - //String fullTextId="";//全文检索返回的id，用于移除时处理 +// 添加课程创建人Id + cft.setSysCreateAid(c.getSysCreateAid()); + String fullTextId="";//全文检索返回的id，用于移除时处理 String newFullId=fullTextSearch.republish(ICourseFullTextSearch.DEFAULT_INDEX_NAME, cft, c.getFullTextId()); if(StringUtils.isNotBlank(c.getFullTextId())) { if(StringUtils.isNotBlank(newFullId) && !c.getFullTextId().equals(newFullId)) { From 367b0d05eae2d54ca254cb2774e1342896372ef6 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 18 Oct 2023 11:39:28 +0800 Subject: [PATCH 13/36] =?UTF-8?q?10/18=20=20=E6=B7=BB=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E5=8F=B7=E9=85=8D=E7=BD=AE=20=E5=8F=97=E4=BC=97=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/dto/CourseFullText.java | 15 +++++++++++++++ .../elasticsearc/CourseElasticsearchImpl.java | 19 ++++++++++++------- .../src/main/java/com/xboe/api/ThirdApi.java | 2 +- .../src/main/resources/application.properties | 9 +++++++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/modules/boe-module-course/src/main/java/com/xboe/module/course/dto/CourseFullText.java b/modules/boe-module-course/src/main/java/com/xboe/module/course/dto/CourseFullText.java index d375102f..efe63344 100644 --- a/modules/boe-module-course/src/main/java/com/xboe/module/course/dto/CourseFullText.java +++ b/modules/boe-module-course/src/main/java/com/xboe/module/course/dto/CourseFullText.java @@ -126,4 +126,19 @@ public class CourseFullText { */ private List keywordsList; + + /** + * 课程创建人id + */ + private String sysCreateAid; + + /** + * 课程创建人id + */ + private String[] sysCreateAids; + + /** + * 受众 + */ + private String audience; } diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index c6534d49..0d371060 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -354,31 +354,31 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ } - /* 2023-08-08 不管是否是此课程受众 ，都可以搜索到 但点进课程详情提示无权限 + /* 2023-08-08 不管是否是此课程受众 ，都可以搜索到 但点进课程详情提示无权限*/ //加上Source判断，是为了应对后台查询，后台查询时，不需要权限，但是需要指定数据来源 if(params.getSource()==null || params.getSource()==0 ) { //受众权限条件,必须是有受众的课程并且受众条件不为空 if(params.getAudiences()!=null && params.getAudiences().length>0) { //if(StringUtils.isNotBlank(params.getAudience())) { BoolQueryBuilder audience= QueryBuilders.boolQuery(); - audience.should(QueryBuilders.termQuery("isSetAudience",0)); - +// audience.should(QueryBuilders.termQuery("isSetAudience",0)); + BoolQueryBuilder has= QueryBuilders.boolQuery(); //String[] ids=params.getAudience().split(","); has.must(QueryBuilders.termQuery("isSetAudience",1)); //has.must(QueryBuilders.termsQuery("audience", ids)); has.must(QueryBuilders.termsQuery("audiences", params.getAudiences())); audience.should(has); - + audience.minimumShouldMatch(1); - + boolQuery.filter(audience); //log.error("audience="+audience.toString()); }else { //如果当前用户无受众，只能查询未设置受众的课程 - boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); +// boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); } - }*/ + } //在哪端显示 if(params.getDevice()!=null) { @@ -611,6 +611,11 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(boolQuery.hasClauses()) { sourceBuilder.query(boolQuery); } +// 查出例外人员 + BoolQueryBuilder builder= QueryBuilders.boolQuery(); + builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids())); + sourceBuilder.query(builder); + //排序 if(StringUtils.isBlank(paras.getKeywords()) && paras.getOrderType()!=3) { diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index 71d7ebfb..d7265579 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -51,7 +51,7 @@ public class ThirdApi { public List getUserId(){ log.info("正在获取例外人员工号"); // String s ="{\"show\":false,\"version\":\"1.1.0\",\"code\":200,\"msg\":\"请求成功！\",\"data\":{\"records\":[{\"id\":129,\"deleted\":null,\"createTime\":\"2023-10-16T10:03:25\",\"createId\":0,\"createName\":\"管理员\",\"updateTime\":\"2023-10-16T10:03:25\",\"updateId\":0,\"updateName\":\"管理员\",\"name\":\"李玉冰\",\"pid\":128,\"code\":\"00004409\",\"description\":null,\"value\":\"00004409\",\"img\":null,\"type\":1,\"level\":0,\"status\":0,\"sort\":0,\"children\":[]}],\"total\":0,\"size\":10,\"current\":1,\"orders\":[],\"id\":null,\"pid\":128,\"type\":1,\"status\":null,\"code\":null,\"name\":null,\"searchCount\":true,\"pages\":0},\"success\":true}"; - String s = Optional.ofNullable(HttpRequest.get("localhost:53323/dict/getCourseException").execute() //"current",1,"type",1,"pid",128) + String s = Optional.ofNullable(HttpRequest.get(infarasApiUrl).execute() //"current",1,"type",1,"pid",128) .body()).orElseThrow(() -> new RuntimeException("token校验失败")); List dictDtos = Opt.ofBlankAble(s).map(t -> JSONUtil.toBean(t, DictResult.class)).map(DictResult::getData).orElseThrow(); ListuserNo=new ArrayList<>(); diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index aad1ebfe..b77f36b3 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -1,4 +1,5 @@ -spring.profiles.active=@profileActive@ +spring.profiles.active= test +#@profileActive@ spring.application.name=boe-server-all server.port=9090 server.servlet.session.timeout=30m @@ -63,4 +64,8 @@ orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs userBasic.searchUserList=${boe.domain}/userbasic/user/list audience.usersByAudienceList=${boe.domain}/userbasic/audience/memberList #获取用户学习课程数据 -statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list \ No newline at end of file +statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list +#用户中心根据组织id查询用户信息接口（递归子组织） +audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers +#获取工号 +infrasApi.dict=${boe.domain}/infrasApi/dict/getCourseException \ No newline at end of file From b3ebc9376961922ab706ff351c34b6a41c8b7b62 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 18 Oct 2023 13:22:34 +0800 Subject: [PATCH 14/36] =?UTF-8?q?10/17=20=E6=B7=BB=E5=8A=A0=E6=9C=AA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/dict/entity/DictDto.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/dict/entity/DictDto.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/dict/entity/DictDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/dict/entity/DictDto.java new file mode 100644 index 00000000..ca8489ae --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/dict/entity/DictDto.java @@ -0,0 +1,27 @@ +package com.xboe.module.dict.entity; + + +import com.xboe.core.SysConstant; +import com.xboe.core.orm.IdEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.util.List; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@Table(name = "dict") +public class DictDto extends IdEntity { + + private Long pid; + private String value; + +} From f40005d2aa95b4841151eff0d7684ba1db0b3f54 Mon Sep 17 00:00:00 2001 From: lu Date: Wed, 18 Oct 2023 16:19:29 +0800 Subject: [PATCH 15/36] =?UTF-8?q?upd=20=E6=A1=88=E4=BE=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/entity/Cases.java | 4 ++++ .../xboe/module/boecase/service/impl/CasesServiceImpl.java | 1 + 2 files changed, 5 insertions(+) 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 67df4b7c..0eef36f7 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 @@ -103,7 +103,11 @@ public class Cases extends BaseEntity { @Column(name = "favorites", nullable = false) private Integer favorites; + @Column(name = "recommends", nullable = false) + private Long recommends; + // 推荐量 + @Column(name = "recommends1", nullable = false) private Long recommends1; // 引用量 diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 9a1c9709..f1e4f87e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -868,6 +868,7 @@ public class CasesServiceImpl implements ICasesService { cases.setShares(0); cases.setFavorites(0); cases.setCites(0); + cases.setRecommends(0L); cases.setRecommends1(0L); StringBuffer stringBuffer = new StringBuffer(); List majorIds = cases.getMajorIds(); From 27c3de568cd7e53181bdbfafb9b1fdf49fe9e476 Mon Sep 17 00:00:00 2001 From: lu Date: Wed, 18 Oct 2023 17:22:04 +0800 Subject: [PATCH 16/36] =?UTF-8?q?upd=20=E4=B8=8A=E8=AF=BE=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E8=AE=B0=E5=BD=95=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index e69a33ec..0f033d20 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -214,38 +214,40 @@ public class StudyServiceImpl implements IStudyService{ } + // 更新 前端传输已学习时长 @Override @Transactional public void updateLastTime(String studyContentId, int lastStudyTime,String aid) { // 获取时长 StudyCourseItem sci = scItemDao.findOne(FieldFilters.eq("id", studyContentId),FieldFilters.eq("aid", aid)); - Integer endTime = sci.getLastStudyTime(); - // 间隔时长 - int abs = 0; - if(lastStudyTime - endTime < 0){ - //从头开始 - abs = lastStudyTime; - }else{ - // 获取时长 - abs = lastStudyTime - endTime; - } +// Integer endTime = sci.getLastStudyTime(); +// // 间隔时长 +// int abs = 0; +// if(lastStudyTime - endTime < 0){ +// //从头开始 +// abs = lastStudyTime; +// }else{ +// // 获取时长 +// abs = lastStudyTime - endTime; +// } // 更新最后的学习时间点 LocalDateTime now=LocalDateTime.now(); UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class); update.addFilter(FieldFilters.eq("id",studyContentId)); //只记录时间长的时候的处理 - update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime)); - update.addUpdateField("lastStudyTime", lastStudyTime); +// update.addFilter(FieldFilters.lt("lastStudyTime", sci.getLastStudyTime())); + update.addUpdateField("lastStudyTime", sci.getLastStudyTime()+lastStudyTime); update.addUpdateField("lastTime", now); scItemDao.update(update.builder()); //增加用户的学习时长,在api中调用 // 添加学习时长 String contentId = sci.getContentId(); - UpdateBuilder updSc=UpdateBuilder.from(StudyCourse.class); // 追加总时长 - String sql="Update boe_study_course set total_duration=total_duration+"+abs+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; +// String sql="Update boe_study_course set total_duration=total_duration+"+abs+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; + String sql="Update boe_study_course set total_duration=total_duration+"+lastStudyTime+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; + scDao.sqlUpdate(sql,contentId); } From 38cc5e162556e0b4246fd278b5a8b3f92255a87f Mon Sep 17 00:00:00 2001 From: lu Date: Wed, 18 Oct 2023 19:08:18 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../study/service/impl/StudyServiceImpl.java | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java index 0f033d20..8ff90b57 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java @@ -218,37 +218,16 @@ public class StudyServiceImpl implements IStudyService{ @Override @Transactional public void updateLastTime(String studyContentId, int lastStudyTime,String aid) { - // 获取时长 - StudyCourseItem sci = scItemDao.findOne(FieldFilters.eq("id", studyContentId),FieldFilters.eq("aid", aid)); -// Integer endTime = sci.getLastStudyTime(); -// // 间隔时长 -// int abs = 0; -// if(lastStudyTime - endTime < 0){ -// //从头开始 -// abs = lastStudyTime; -// }else{ -// // 获取时长 -// abs = lastStudyTime - endTime; -// } // 更新最后的学习时间点 LocalDateTime now=LocalDateTime.now(); UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class); update.addFilter(FieldFilters.eq("id",studyContentId)); //只记录时间长的时候的处理 -// update.addFilter(FieldFilters.lt("lastStudyTime", sci.getLastStudyTime())); - update.addUpdateField("lastStudyTime", sci.getLastStudyTime()+lastStudyTime); + update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime)); + update.addUpdateField("lastStudyTime", lastStudyTime); update.addUpdateField("lastTime", now); scItemDao.update(update.builder()); //增加用户的学习时长,在api中调用 - - // 添加学习时长 - String contentId = sci.getContentId(); - - // 追加总时长 -// String sql="Update boe_study_course set total_duration=total_duration+"+abs+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; - String sql="Update boe_study_course set total_duration=total_duration+"+lastStudyTime+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end) where id=?1"; - - scDao.sqlUpdate(sql,contentId); } @Override From 596f7a3e25292fdf31c93416ffc69482082c11df Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 18 Oct 2023 19:32:51 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E4=BE=8B=E5=A4=96?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/elasticsearc/CourseElasticsearchImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 0d371060..86b789a3 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -612,9 +612,12 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ sourceBuilder.query(boolQuery); } // 查出例外人员 - BoolQueryBuilder builder= QueryBuilders.boolQuery(); - builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids())); - sourceBuilder.query(builder); + if(paras.getSysCreateAids()!=null&¶s.getSysCreateAids().length>0){ + BoolQueryBuilder builder= QueryBuilders.boolQuery(); + builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids())); + sourceBuilder.query(builder); + } + //排序 From 9d056889b36c508d8608dd54d599a2a50033f396 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 14:55:36 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearc/CourseElasticsearchImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 86b789a3..91e08fe5 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -361,22 +361,25 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(params.getAudiences()!=null && params.getAudiences().length>0) { //if(StringUtils.isNotBlank(params.getAudience())) { BoolQueryBuilder audience= QueryBuilders.boolQuery(); -// audience.should(QueryBuilders.termQuery("isSetAudience",0)); + audience.should(QueryBuilders.termQuery("isSetAudience",0)); BoolQueryBuilder has= QueryBuilders.boolQuery(); //String[] ids=params.getAudience().split(","); has.must(QueryBuilders.termQuery("isSetAudience",1)); //has.must(QueryBuilders.termsQuery("audience", ids)); has.must(QueryBuilders.termsQuery("audiences", params.getAudiences())); + //查询出例外人员创建的课程 + BoolQueryBuilder exception =QueryBuilders.boolQuery(); + exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + audience.should(exception); audience.should(has); - audience.minimumShouldMatch(1); boolQuery.filter(audience); //log.error("audience="+audience.toString()); }else { //如果当前用户无受众，只能查询未设置受众的课程 -// boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); + boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); } } @@ -611,12 +614,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(boolQuery.hasClauses()) { sourceBuilder.query(boolQuery); } -// 查出例外人员 - if(paras.getSysCreateAids()!=null&¶s.getSysCreateAids().length>0){ - BoolQueryBuilder builder= QueryBuilders.boolQuery(); - builder.should(QueryBuilders.termsQuery("sysCreateAid",paras.getSysCreateAids())); - sourceBuilder.query(builder); - } + From acccac4d6e2d67ce5c17cbdae9ea43bfb8bf16c1 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 16:05:12 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearc/CourseElasticsearchImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 91e08fe5..473e6951 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -369,17 +369,22 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //has.must(QueryBuilders.termsQuery("audience", ids)); has.must(QueryBuilders.termsQuery("audiences", params.getAudiences())); //查询出例外人员创建的课程 - BoolQueryBuilder exception =QueryBuilders.boolQuery(); - exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); - audience.should(exception); + if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { + BoolQueryBuilder exception =QueryBuilders.boolQuery(); + exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + audience.should(exception); + } audience.should(has); audience.minimumShouldMatch(1); - boolQuery.filter(audience); //log.error("audience="+audience.toString()); }else { //如果当前用户无受众，只能查询未设置受众的课程 - boolQuery.must(QueryBuilders.termQuery("isSetAudience",0)); + boolQuery.should(QueryBuilders.termQuery("isSetAudience",0)); + if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { + boolQuery.should(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + + } } } From a918f612c553f25df12ec6717f6ef8846914bc55 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 23:15:15 +0800 Subject: [PATCH 21/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E4=BE=8B=E5=A4=96=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elasticsearc/CourseElasticsearchImpl.java | 7 ++-- servers/boe-server-all/pom.xml | 34 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 473e6951..a73e0f8e 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -371,7 +371,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //查询出例外人员创建的课程 if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { BoolQueryBuilder exception =QueryBuilders.boolQuery(); - exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + exception.must(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); audience.should(exception); } audience.should(has); @@ -382,9 +382,10 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //如果当前用户无受众，只能查询未设置受众的课程 boolQuery.should(QueryBuilders.termQuery("isSetAudience",0)); if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { - boolQuery.should(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); - + boolQuery.should(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); } + + } } diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index e0406c88..37247eb9 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - 2.2.0 + - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - ${spring-cloud-alibaba.version} - - - com.alibaba.nacos - nacos-client - - - - - com.alibaba.nacos - nacos-client - ${nacos-client.version} - + + + + + + + + + + + + + + + + org.apache.poi From 2cc74026bf7d00a1f404ea8ed5f3eb13bbb77afa Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Thu, 19 Oct 2023 23:24:14 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E4=BE=8B=E5=A4=96=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/elasticsearc/CourseElasticsearchImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index 473e6951..e99aa8e1 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -371,7 +371,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //查询出例外人员创建的课程 if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { BoolQueryBuilder exception =QueryBuilders.boolQuery(); - exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + exception.must(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); audience.should(exception); } audience.should(has); @@ -382,9 +382,9 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //如果当前用户无受众，只能查询未设置受众的课程 boolQuery.should(QueryBuilders.termQuery("isSetAudience",0)); if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { - boolQuery.should(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); - + boolQuery.should(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); } + boolQuery.minimumShouldMatch(1); } } From 54df004ce572353bc18595047a6a2dc3eee87b53 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Fri, 20 Oct 2023 09:14:50 +0800 Subject: [PATCH 23/36] =?UTF-8?q?Revert=20"=E8=A7=A3=E5=86=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=B8=8D=E5=87=BA=E4=BE=8B=E5=A4=96=E4=BA=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2cc74026bf7d00a1f404ea8ed5f3eb13bbb77afa. # Conflicts: # modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java --- .../com/xboe/module/elasticsearc/CourseElasticsearchImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index a73e0f8e..e99aa8e1 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -384,8 +384,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { boolQuery.should(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); } - - + boolQuery.minimumShouldMatch(1); } } From 2b5b8836512ac6438912de70fda56f2bb2699385 Mon Sep 17 00:00:00 2001 From: "joshen@zcwytd.com" <12345678A> Date: Fri, 20 Oct 2023 09:21:00 +0800 Subject: [PATCH 24/36] pom --- servers/boe-server-all/pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 37247eb9..e0406c88 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - + 2.2.0 - - - - - - - - - - - - - - - - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + org.apache.poi From 69e9f1c40349b8e02eba2734dc43268864955889 Mon Sep 17 00:00:00 2001 From: "joshen@zcwytd.com" <12345678A> Date: Fri, 20 Oct 2023 10:49:47 +0800 Subject: [PATCH 25/36] termsQuery --- .../com/xboe/module/elasticsearc/CourseElasticsearchImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index cdcf7c78..e99aa8e1 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -371,7 +371,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ //查询出例外人员创建的课程 if(params.getSysCreateAids()!=null && params.getSysCreateAids().length>0) { BoolQueryBuilder exception =QueryBuilders.boolQuery(); - exception.must(QueryBuilders.termQuery("sysCreateAid",params.getSysCreateAids())); + exception.must(QueryBuilders.termsQuery("sysCreateAid",params.getSysCreateAids())); audience.should(exception); } audience.should(has); From 77b07dd0953d2296bffbc989678bb7f4fe1527df Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 16:53:21 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 36 +++++++++---------- .../com/xboe/system/user/api/UserApi.java | 4 +++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index e0406c88..1b805548 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - 2.2.0 + - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - ${spring-cloud-alibaba.version} - - - com.alibaba.nacos - nacos-client - - - - - com.alibaba.nacos - nacos-client - ${nacos-client.version} - + + + + + + + + + + + + + + + + + org.apache.poi diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 4181413b..3ae8e1d7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -176,7 +177,10 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); + user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 + account.setEmail(DesensitizedUtil.email(account.getEmail())); + account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From 653f3bc80393fb5c79252c5791b18d3223fb6e01 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:16:32 +0800 Subject: [PATCH 27/36] =?UTF-8?q?Revert=20"=E4=BF=A1=E6=81=AF=E8=84=B1?= =?UTF-8?q?=E6=95=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/system/user/api/UserApi.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 3ae8e1d7..4181413b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.annotation.Resource; -import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -177,10 +176,7 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); - user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 - account.setEmail(DesensitizedUtil.email(account.getEmail())); - account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From 72f2ea6164c5f4aef9473190984aae1d797b7a91 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:19:31 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/system/user/api/UserApi.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index 4181413b..3ae8e1d7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,6 +7,7 @@ import java.util.Map; import javax.annotation.Resource; +import cn.hutool.core.util.DesensitizedUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; @@ -176,7 +177,10 @@ public class UserApi extends ApiBaseController { User u = service.get(account.getId()); user = new UserVo(); BeanUtils.copyProperties(u, user); + user.setMobileNo(DesensitizedUtil.mobilePhone(user.getMobileNo())); user.setIdNumber("");//去掉返回的用户身份证号信息 + account.setEmail(DesensitizedUtil.email(account.getEmail())); + account.setMobile(DesensitizedUtil.mobilePhone(account.getMobile())); user.setAccount(account); user.setSign(u.getSign()); user.setDynamic(u.getDynamic()); From cc6251d479e64eb46c4431b04e2b51acb892e7a3 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Wed, 25 Oct 2023 17:24:28 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=84=B1=E6=95=8F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 37247eb9..e0406c88 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,26 +17,26 @@ 1.8 2021.0.5 2021.0.5.0 - + 2.2.0 - - - - - - - - - - - - - - - - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + ${spring-cloud-alibaba.version} + + + com.alibaba.nacos + nacos-client + + + + + com.alibaba.nacos + nacos-client + ${nacos-client.version} + org.apache.poi From 85c87d4c3df0728adf72ad62ba3a28ad130a3660 Mon Sep 17 00:00:00 2001 From: lu Date: Thu, 26 Oct 2023 09:48:16 +0800 Subject: [PATCH 30/36] =?UTF-8?q?upd=20=E6=A1=88=E4=BE=8B=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=B1=E6=95=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/service/impl/CasesServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index f1e4f87e..c546e399 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -858,8 +858,8 @@ public class CasesServiceImpl implements ICasesService { } @Override + @Transactional public void save(Cases cases) { - cases.setId(IDGenerator.generate()); cases.setIsTop(false); cases.setComments(0); @@ -887,6 +887,7 @@ public class CasesServiceImpl implements ICasesService { } @Override + @Transactional public void update(Cases cases) { List majorIds = cases.getMajorIds(); List caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", cases.getId())); From 63a07b6b2623748adcaf179e52d235108c75dc00 Mon Sep 17 00:00:00 2001 From: lu Date: Thu, 26 Oct 2023 10:08:50 +0800 Subject: [PATCH 31/36] =?UTF-8?q?upd=20=E5=8F=96=E6=B6=88=E7=A7=8D?= =?UTF-8?q?=E7=B1=BB=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9A=82=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/boecase/entity/Cases.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 0eef36f7..7e933ba8 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 @@ -249,14 +249,15 @@ public class Cases extends BaseEntity { private String caseValue; // 种类字段1 - @Column(name = "sys_type1") - private String sysType1; + // 暂不上线 +// @Column(name = "sys_type1") +// private String sysType1; //种类字段2 - @Column(name = "sys_type2") - private String sysType2; +// @Column(name = "sys_type2") +// private String sysType2; //种类字段3 - @Column(name = "sys_type3") - private String sysType3; +// @Column(name = "sys_type3") +// private String sysType3; /** * 最佳案例标识 From 2c0b1e73e0024f57b297428f6142ce67df4e4c3f Mon Sep 17 00:00:00 2001 From: lu Date: Thu, 26 Oct 2023 10:17:15 +0800 Subject: [PATCH 32/36] =?UTF-8?q?upd=20=E6=9C=AA=E4=B8=8A=E7=BA=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CasesRecommendPushRecordServiceImpl.java | 31 ++++---- .../boecase/dao/CasesRecordDaoTest.java | 74 +++++++++++++------ 2 files changed, 68 insertions(+), 37 deletions(-) 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 dd8c777c..80180d2b 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 @@ -228,22 +228,23 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR @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(); - } +// 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(); +// } + +// .addUpdateField("sys_type1",sysType1) +// .addUpdateField("sys_type2",sysType2) +// .addUpdateField("sys_type3",sysType3) 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; } diff --git a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/dao/CasesRecordDaoTest.java b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/dao/CasesRecordDaoTest.java index e6ef8fde..bf2128d5 100644 --- a/servers/boe-server-all/src/test/java/com/xboe/module/boecase/dao/CasesRecordDaoTest.java +++ b/servers/boe-server-all/src/test/java/com/xboe/module/boecase/dao/CasesRecordDaoTest.java @@ -1,36 +1,66 @@ package com.xboe.module.boecase.dao; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xboe.module.boecase.dto.CasePageVo; -import com.xboe.module.boecase.entity.Cases; -import org.junit.jupiter.api.Test; +import com.xboe.module.boecase.service.ICasesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.test.context.ActiveProfiles; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest @ActiveProfiles("dev") class CasesRecordDaoTest { @Autowired - private CasesRecordDao casesRecordDao; + private ICasesService casesService; + +// @Autowired +// private CasesApi casesApi; + // @Test - void queryList() throws JsonProcessingException { - PageRequest of = PageRequest.of(0, 10); - String jsonStr = "{\"pageIndex\":1,\"pageSize\":10,\"orderField\":\"excellent\",\"majorType\":\"\",\"orgDomainDtos\":[],\"orderAsc\":false,\"excellent\":true,\"breCommend\":true,\"caseType\":\"\",\"authorName\":\"\",\"notInIds\":[],\"type\":\"recommend\",\"userId\":\"\",\"parent\":\"\",\"children\":[],\"name\":\"\",\"years\":[2023,2022,2020,2021]}"; - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); - CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); - pageVo.setUserId("965341999643234304"); - Page cases = casesRecordDao.queryList(of, pageVo); - System.out.println(cases); - } +// void queryList() throws JsonProcessingException { +// PageRequest of = PageRequest.of(0, 10); +// String jsonStr = "{\"pageIndex\":1,\"pageSize\":10,\"orderField\":\"excellent\",\"majorType\":\"\",\"orgDomainDtos\":[],\"orderAsc\":false,\"excellent\":true,\"breCommend\":true,\"caseType\":\"\",\"authorName\":\"\",\"notInIds\":[],\"type\":\"recommend\",\"userId\":\"\",\"parent\":\"\",\"children\":[],\"name\":\"\",\"years\":[2023,2022,2020,2021]}"; +// ObjectMapper mapper = new ObjectMapper(); +// mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); +// CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); +// pageVo.setUserId("965341999643234304"); +// Page cases = casesRecordDao.queryList(of, pageVo); +// System.out.println(cases); +// } + +// @Test +// void queryListV2() throws JsonProcessingException { +// PageRequest of = PageRequest.of(0, 10); +//// String jsonStr = "{\"pageIndex\":1,\"pageSize\":10,\"orderField\":\"excellent\",\"majorType\":\"\",\"orgDomainDtos\":[],\"orderAsc\":false,\"excellent\":true,\"breCommend\":true,\"caseType\":\"\",\"authorName\":\"\",\"notInIds\":[],\"type\":\"recommend\",\"userId\":\"\",\"parent\":\"\",\"children\":[],\"name\":\"\",\"years\":[2023,2022,2020,2021]}"; +//// ObjectMapper mapper = new ObjectMapper(); +//// mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); +//// CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); +// CasePageVo pageVo = new CasePageVo(); +// pageVo.setPageIndex(1); +// pageVo.setPageSize(5); +// pageVo.setUserId("965342027497607168"); +// pageVo.setSysType1("1"); +//// PageList casesPageList = casesService.queryRecommendPageCasesV2(pageVo); +//// PageList casesPageList = casesService.queryPageCasesV2(pageVo); +//// JsonResponse> casesPageList = casesApi.queryCaseBreV2(pageVo); +//// System.out.println(casesPageList); +// } + +// @Test +// public void saveTest(){ +// Cases cases = new Cases(); +// cases.setTitle("测试案例分类"); +// cases.setAuthorName("李玉冰"); +// cases.setAuthorId("965342027497607168"); +// cases.setOrgDomainParent("b1c1"); +// cases.setOrgDomainParent2("a2b2"); +// cases.setOrgDomainParent3("b1c"); +// cases.setSysType1("966458733088919552"); +// cases.setSysType2("966459079181914112"); +// cases.setSysType3("1060578229055287296"); +// ArrayList objects = new ArrayList<>(); +// objects.add("27737267694995164"); +// cases.setMajorIds(objects); +// casesService.save(cases); +// } } \ No newline at end of file From eaaa96dd2b88d0b786ae69fa9bbd9805195281ba Mon Sep 17 00:00:00 2001 From: lu Date: Thu, 26 Oct 2023 10:22:54 +0800 Subject: [PATCH 33/36] =?UTF-8?q?upd=20=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CasesRecommendPushRecord.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) 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 e32729c6..107a2dca 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,23 +79,23 @@ 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; +// /** +// * sysType1 +// */ +// @Column(name = "sys_type1") +// private String sysType1; +// +// /** +// * sysType2 +// */ +// @Column(name = "sys_type2") +// private String sysType2; +// +// /** +// * sysType3 +// */ +// @Column(name = "sys_type3") +// private String sysType3; From e38a9bc2c9f502ad7261b1a2ea8c0d3403eae029 Mon Sep 17 00:00:00 2001 From: xiaozhequ <792962424@qq.com> Date: Mon, 30 Oct 2023 10:19:41 +0800 Subject: [PATCH 34/36] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/ICourseFullTextSearch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java b/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java index 15acbac8..a512fb1e 100644 --- a/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java +++ b/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java @@ -14,8 +14,8 @@ public interface ICourseFullTextSearch { /** * 默认索引名称 */ - public static final String DEFAULT_INDEX_NAME="new_resource_list"; - +// public static final String DEFAULT_INDEX_NAME="new_resource_list"; + public static final String DEFAULT_INDEX_NAME="my_resource_list"; /** * 发布课程 * @param indexName From 669f59c7d30eb953332c5dacfdcf8a4ceb6d49a1 Mon Sep 17 00:00:00 2001 From: "joshen@zcwytd.com" <12345678A> Date: Mon, 30 Oct 2023 19:09:43 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=97=E4=BC=97?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9A=82=E6=97=B6=E4=B8=8D=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/elasticsearc/CourseElasticsearchImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java index e99aa8e1..f8425791 100644 --- a/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java +++ b/modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/CourseElasticsearchImpl.java @@ -356,7 +356,8 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ /* 2023-08-08 不管是否是此课程受众 ，都可以搜索到 但点进课程详情提示无权限*/ //加上Source判断，是为了应对后台查询，后台查询时，不需要权限，但是需要指定数据来源 - if(params.getSource()==null || params.getSource()==0 ) { + /* 20231030 暂时不上线， + if(params.getSource()==null || params.getSource()==0 ) { //受众权限条件,必须是有受众的课程并且受众条件不为空 if(params.getAudiences()!=null && params.getAudiences().length>0) { //if(StringUtils.isNotBlank(params.getAudience())) { @@ -386,7 +387,7 @@ public class CourseElasticsearchImpl implements ICourseFullTextSearch{ } boolQuery.minimumShouldMatch(1); } - } + }*/ //在哪端显示 if(params.getDevice()!=null) { From 6c030c72fb65ffcf3e4db3e74fd0396318705f30 Mon Sep 17 00:00:00 2001 From: "joshen@zcwytd.com" <12345678A> Date: Mon, 30 Oct 2023 19:24:12 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=97=E4=BC=97?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9A=82=E6=97=B6=E4=B8=8D=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/course/service/ICourseFullTextSearch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java b/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java index a512fb1e..cde858ba 100644 --- a/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java +++ b/modules/boe-module-course/src/main/java/com/xboe/module/course/service/ICourseFullTextSearch.java @@ -14,8 +14,8 @@ public interface ICourseFullTextSearch { /** * 默认索引名称 */ -// public static final String DEFAULT_INDEX_NAME="new_resource_list"; - public static final String DEFAULT_INDEX_NAME="my_resource_list"; + public static final String DEFAULT_INDEX_NAME="new_resource_list"; +// public static final String DEFAULT_INDEX_NAME="my_resource_list"; /** * 发布课程 * @param indexName