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

Merge branch 'zcwy-master' into zcwy0912

Browse Source
This commit is contained in:
joshen@zcwytd.com
2023-10-26 10:39:22 +08:00
parent 6a1b42d2cd eaaa96dd2b
commit 32da545d24
4 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java
View File

@@ -249,14 +249,15 @@ public class Cases extends BaseEntity {
private String caseValue; private String caseValue;
// 种类字段1 // 种类字段1
@Column(name = "sys_type1") // 暂不上线
private String sysType1; // @Column(name = "sys_type1")
// private String sysType1;
//种类字段2 //种类字段2
@Column(name = "sys_type2") // @Column(name = "sys_type2")
private String sysType2; // private String sysType2;
//种类字段3 //种类字段3
@Column(name = "sys_type3") // @Column(name = "sys_type3")
private String sysType3; // private String sysType3;
/** /**
* 最佳案例标识 * 最佳案例标识

34
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendPushRecord.java
View File

@@ -79,23 +79,23 @@ public class CasesRecommendPushRecord extends BaseEntity {
@Column(name = "read_start_time") @Column(name = "read_start_time")
private Date readStartTime; private Date readStartTime;
/** // /**
* sysType1 // * sysType1
*/ // */
@Column(name = "sys_type1") // @Column(name = "sys_type1")
private String sysType1; // private String sysType1;
//
/** // /**
* sysType2 // * sysType2
*/ // */
@Column(name = "sys_type2") // @Column(name = "sys_type2")
private String sysType2; // private String sysType2;
//
/** // /**
* sysType3 // * sysType3
*/ // */
@Column(name = "sys_type3") // @Column(name = "sys_type3")
private String sysType3; // private String sysType3;

31
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
View File

@@ -228,22 +228,23 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
@Override @Override
public boolean update(Cases cases) { public boolean update(Cases cases) {
String sysType1 = ""; // String sysType1 = "";
String sysType2 = ""; // String sysType2 = "";
String sysType3 = ""; // String sysType3 = "";
if(StringUtils.isNotEmpty(cases.getSysType1())){ // if(StringUtils.isNotEmpty(cases.getSysType1())){
sysType1 = cases.getSysType1(); // sysType1 = cases.getSysType1();
} // }
if(StringUtils.isNotEmpty(cases.getSysType2())){ // if(StringUtils.isNotEmpty(cases.getSysType2())){
sysType2 = cases.getSysType2(); // sysType2 = cases.getSysType2();
} // }
if(StringUtils.isNotEmpty(cases.getSysType3())){ // if(StringUtils.isNotEmpty(cases.getSysType3())){
sysType3 = cases.getSysType3(); // sysType3 = cases.getSysType3();
} // }
// .addUpdateField("sys_type1",sysType1)
// .addUpdateField("sys_type2",sysType2)
// .addUpdateField("sys_type3",sysType3)
return casesRecommendPushRecordDao.update(UpdateBuilder.from(CasesRecommendPushRecord.class) 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() .addFilter(FieldFilters.eq("id",cases.getId())).builder()
) > 0; ) > 0;
} }

74
servers/boe-server-all/src/test/java/com/xboe/module/boecase/dao/CasesRecordDaoTest.java
View File

@@ -1,36 +1,66 @@
package com.xboe.module.boecase.dao; package com.xboe.module.boecase.dao;
import com.fasterxml.jackson.core.JsonProcessingException; import com.xboe.module.boecase.service.ICasesService;
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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; 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 org.springframework.test.context.ActiveProfiles;
import static org.junit.jupiter.api.Assertions.*;
@SpringBootTest @SpringBootTest
@ActiveProfiles("dev") @ActiveProfiles("dev")
class CasesRecordDaoTest { class CasesRecordDaoTest {
@Autowired @Autowired
private CasesRecordDao casesRecordDao; private ICasesService casesService;
// @Autowired
// private CasesApi casesApi;
// @Test // @Test
void queryList() throws JsonProcessingException { // void queryList() throws JsonProcessingException {
PageRequest of = PageRequest.of(0, 10); // 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]}"; // 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(); // ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false); // mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false);
CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class); // CasePageVo pageVo = mapper.readValue(jsonStr, CasePageVo.class);
pageVo.setUserId("965341999643234304"); // pageVo.setUserId("965341999643234304");
Page<Cases> cases = casesRecordDao.queryList(of, pageVo); // Page<Cases> cases = casesRecordDao.queryList(of, pageVo);
System.out.println(cases); // 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<Cases> casesPageList = casesService.queryRecommendPageCasesV2(pageVo);
//// PageList<Cases> casesPageList = casesService.queryPageCasesV2(pageVo);
//// JsonResponse<PageList<Cases>> 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<String> objects = new ArrayList<>();
// objects.add("27737267694995164");
// cases.setMajorIds(objects);
// casesService.save(cases);
// }
} }