Yaxin
/
fu-hsi-service
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

Browse Source
topo_dev
xueqingkun 10 months ago
parent ee75cb48d4 c99dcf02dd
commit 62cd31804a
9 changed files with 111 additions and 97 deletions
Show Stats Download Patch File Download Diff File

21
src/main/java/com/supervision/common/domain/R.java
Unescape Escape View File

@ -21,10 +21,14 @@ public class R<T> implements Serializable {
public static final String TOTAL_COUNT = "total"; public static final String TOTAL_COUNT = "total";
public static final String RESULT_LIST = "result"; public static final String RESULT_LIST = "result";
/** 成功 */ /**
* 成功
*/
public static final int SUCCESS = Constants.SUCCESS; public static final int SUCCESS = Constants.SUCCESS;
/** 失败 */ /**
* 失败
*/
public static final int FAIL = Constants.FAIL; public static final int FAIL = Constants.FAIL;
private int code; private int code;
@ -37,6 +41,14 @@ public class R<T> implements Serializable {
return restResult(null, SUCCESS, null); return restResult(null, SUCCESS, null);
} }
public static <T> R<T> judgeResult(Boolean bo, String successMessage, String failMessage) {
if (bo) {
return restResult(null, SUCCESS, successMessage);
} else {
return restResult(null, FAIL, failMessage);
}
}
public static <T> R<T> okMsg(String msg) { public static <T> R<T> okMsg(String msg) {
return restResult(null, SUCCESS, msg); return restResult(null, SUCCESS, msg);
} }
@ -69,7 +81,9 @@ public class R<T> implements Serializable {
return restResult(resultStatusEnum); return restResult(resultStatusEnum);
} }
public static <T> R<T> fail(ResultStatusEnum resultStatusEnum, T data) {return restResult(resultStatusEnum,data);} public static <T> R<T> fail(ResultStatusEnum resultStatusEnum, T data) {
return restResult(resultStatusEnum, data);
}
private static <T> R<T> restResult(ResultStatusEnum resultStatusEnum, T data) { private static <T> R<T> restResult(ResultStatusEnum resultStatusEnum, T data) {
R<T> apiResult = new R<>(); R<T> apiResult = new R<>();
@ -96,7 +110,6 @@ public class R<T> implements Serializable {
} }
public static Map<String, Object> buildDataMap(List list) { public static Map<String, Object> buildDataMap(List list) {
Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();
if (list == null) { if (list == null) {

3
src/main/java/com/supervision/neo4j/controller/Neo4jController.java
Unescape Escape View File

@ -65,7 +65,8 @@ public class Neo4jController {
@PostMapping("/saveRelation") @PostMapping("/saveRelation")
public R<?> saveRelation(@RequestBody Rel rel) { public R<?> saveRelation(@RequestBody Rel rel) {
return neo4jService.saveRelation(rel); Boolean result = neo4jService.saveRelation(rel);
return R.judgeResult(result, null, "保存失败");
} }
/*************************************************************************************/ /*************************************************************************************/

2
src/main/java/com/supervision/neo4j/service/Neo4jService.java
Unescape Escape View File

@ -23,7 +23,7 @@ public interface Neo4jService {
Rel findRelation(Rel rel); Rel findRelation(Rel rel);
R<?> saveRelation(Rel rel); Boolean saveRelation(Rel rel);
R<?> getNode(String picType, String caseId); R<?> getNode(String picType, String caseId);

8
src/main/java/com/supervision/neo4j/service/impl/Neo4jServiceImpl.java
Unescape Escape View File

@ -198,7 +198,7 @@ public class Neo4jServiceImpl implements Neo4jService {
} }
@Override @Override
public R<?> saveRelation(Rel rel) { public Boolean saveRelation(Rel rel) {
Rel res = null; Rel res = null;
try { try {
Session session = driver.session(); Session session = driver.session();
@ -214,11 +214,7 @@ public class Neo4jServiceImpl implements Neo4jService {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if (rel != null) { return rel != null;
return R.ok(rel);
} else {
return R.fail("保存失败");
}
} }
@Override @Override

58
src/main/java/com/supervision/police/controller/RecordController.java
Unescape Escape View File

@ -1,12 +1,16 @@
package com.supervision.police.controller; package com.supervision.police.controller;
import com.supervision.common.domain.R; import com.supervision.common.domain.R;
import com.supervision.police.domain.ModelRecordType;
import com.supervision.police.domain.NotePrompt; import com.supervision.police.domain.NotePrompt;
import com.supervision.police.domain.NoteRecords; import com.supervision.police.domain.NoteRecords;
import com.supervision.police.domain.TripleInfo;
import com.supervision.police.dto.ListDTO; import com.supervision.police.dto.ListDTO;
import com.supervision.police.service.ModelRecordTypeService; import com.supervision.police.service.ModelRecordTypeService;
import com.supervision.police.service.RecordService; import com.supervision.police.service.RecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -14,31 +18,32 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map;
@RestController @RestController
@Slf4j @Slf4j
@RequestMapping("record") @RequestMapping("record")
@ApiOperation(value = "笔录接口") @ApiOperation(value = "笔录接口")
@RequiredArgsConstructor
public class RecordController { public class RecordController {
@Autowired public final ModelRecordTypeService modelRecordTypeService;
public ModelRecordTypeService modelRecordTypeService;
@Autowired public final RecordService recordService;
public RecordService recordService;
/** /**
* 查询笔录类型 * 查询笔录类型
*
* @param name * @param name
* @param page * @param page
* @param size * @param size
* @return * @return
*/ */
@GetMapping("queryType") @GetMapping("queryType")
public R<?> queryType(@RequestParam(required = false) String name, public R<List<ModelRecordType>> queryType(@RequestParam(required = false) String name,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "20") Integer size) { @RequestParam(required = false, defaultValue = "20") Integer size) {
return modelRecordTypeService.queryType(name, page, size); return R.ok(modelRecordTypeService.queryType(name, page, size));
} }
// @PostMapping("saveType") // @PostMapping("saveType")
@ -48,6 +53,7 @@ public class RecordController {
/** /**
* 保存提示词 * 保存提示词
*
* @param prompt * @param prompt
* @return * @return
*/ */
@ -58,6 +64,7 @@ public class RecordController {
/** /**
* 删除提示词 * 删除提示词
*
* @param prompt * @param prompt
* @return * @return
*/ */
@ -68,56 +75,63 @@ public class RecordController {
/** /**
* 获取案件三元组信息 * 获取案件三元组信息
*
* @param caseId * @param caseId
* @param name * @param name
* @param recordId * @param recordId
* @return * @return
*/ */
@GetMapping("/getThreeInfo") @GetMapping("/getThreeInfo")
public R<?> getThreeInfo(@RequestParam String caseId, @ApiOperation("获取笔录的三元组信息")
@RequestParam String name, public R<List<TripleInfo>> getThreeInfo(@RequestParam String caseId,
@RequestParam(required = false) String recordId) { @RequestParam String name,
return modelRecordTypeService.getThreeInfo(caseId, name, recordId); @RequestParam(required = false) String recordId) {
return R.ok(modelRecordTypeService.getThreeInfo(caseId, name, recordId));
} }
@ApiOperation("将三元组信息保存到知识图谱")
@PostMapping("/addNeo4j") @PostMapping("/addNeo4j")
public R<?> addNeo4j(@RequestBody ListDTO list) { public R<String> addNeo4j(@RequestBody ListDTO list) {
return modelRecordTypeService.addNeo4j(list.getIds()); return R.ok(modelRecordTypeService.addNeo4j(list.getIds()));
} }
/** /**
* 上传笔录， 修改 * 上传笔录， 修改
*
* @param records * @param records
* @return * @return
*/ */
@PostMapping("/addOrUpdRecords") @PostMapping("/addOrUpdRecords")
public R<?> uploadRecords(NoteRecords records, public R<String> uploadRecords(NoteRecords records,
@RequestPart("file") List<MultipartFile> fileList) throws IOException { @RequestPart("file") List<MultipartFile> fileList) throws IOException {
return recordService.uploadRecords(records, fileList); return R.ok(recordService.uploadRecords(records, fileList));
} }
/** /**
* 查询笔录，按姓名为父目录 * 查询笔录，按姓名为父目录
*
* @param noteRecords * @param noteRecords
* @param page * @param page
* @param size * @param size
* @return * @return
*/ */
@PostMapping("/queryRecords") @PostMapping("/queryRecords")
public R<?> queryRecords(@RequestBody NoteRecords noteRecords, public R<Map<String, Object>> queryRecords(@RequestBody NoteRecords noteRecords,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "20") Integer size) { @RequestParam(required = false, defaultValue = "20") Integer size) {
return recordService.queryRecords(noteRecords, page, size); return R.ok(recordService.queryRecords(noteRecords, page, size));
} }
/** /**
* 删除 * 删除
*
* @param id * @param id
* @return * @return
*/ */
@PostMapping("/delRecords") @PostMapping("/delRecords")
public R<?> delRecords(@RequestParam String id) { public R<?> delRecords(@RequestParam String id) {
return recordService.delRecords(id); recordService.delRecords(id);
return R.ok();
} }

7
src/main/java/com/supervision/police/service/ModelRecordTypeService.java
Unescape Escape View File

@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.supervision.common.domain.R; import com.supervision.common.domain.R;
import com.supervision.police.domain.ModelRecordType; import com.supervision.police.domain.ModelRecordType;
import com.supervision.police.domain.NotePrompt; import com.supervision.police.domain.NotePrompt;
import com.supervision.police.domain.TripleInfo;
import java.util.List; import java.util.List;
public interface ModelRecordTypeService extends IService<ModelRecordType> { public interface ModelRecordTypeService extends IService<ModelRecordType> {
R<?> queryType(String name, Integer page, Integer size); List<ModelRecordType> queryType(String name, Integer page, Integer size);
ModelRecordType queryByName(String content); ModelRecordType queryByName(String content);
@ -19,7 +20,7 @@ public interface ModelRecordTypeService extends IService<ModelRecordType> {
R<?> delPrompt(NotePrompt prompt); R<?> delPrompt(NotePrompt prompt);
R<?> getThreeInfo(String caseId, String name, String recordId); List<TripleInfo> getThreeInfo(String caseId, String name, String recordId);
R<?> addNeo4j(List<String> ids); String addNeo4j(List<String> ids);
} }

7
src/main/java/com/supervision/police/service/RecordService.java
Unescape Escape View File

@ -8,13 +8,14 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map;
public interface RecordService extends IService<NoteRecord> { public interface RecordService extends IService<NoteRecord> {
R<?> uploadRecords(NoteRecords records, List<MultipartFile> fileList) throws IOException; String uploadRecords(NoteRecords records, List<MultipartFile> fileList) throws IOException;
R<?> queryRecords(NoteRecords noteRecords, Integer page, Integer size); Map<String, Object> queryRecords(NoteRecords noteRecords, Integer page, Integer size);
R<?> delRecords(String id); void delRecords(String id);
} }

65
src/main/java/com/supervision/police/service/impl/ModelRecordTypeServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.supervision.police.service.impl; package com.supervision.police.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.druid.util.StringUtils; import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -17,6 +18,7 @@ import com.supervision.police.mapper.NoteRecordMapper;
import com.supervision.police.mapper.NotePromptMapper; import com.supervision.police.mapper.NotePromptMapper;
import com.supervision.police.mapper.TripleInfoMapper; import com.supervision.police.mapper.TripleInfoMapper;
import com.supervision.police.service.ModelRecordTypeService; import com.supervision.police.service.ModelRecordTypeService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
@ -24,6 +26,7 @@ import org.springframework.ai.chat.ChatResponse;
import org.springframework.ai.chat.Generation; import org.springframework.ai.chat.Generation;
import org.springframework.ai.chat.messages.Message; import org.springframework.ai.chat.messages.Message;
import org.springframework.ai.chat.messages.SystemMessage; import org.springframework.ai.chat.messages.SystemMessage;
import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.ollama.OllamaChatClient; import org.springframework.ai.ollama.OllamaChatClient;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -37,31 +40,23 @@ import java.util.List;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor
public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMapper, ModelRecordType> implements ModelRecordTypeService { public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMapper, ModelRecordType> implements ModelRecordTypeService {
@Autowired private final ModelRecordTypeMapper modelRecordTypeMapper;
private ModelRecordTypeMapper modelRecordTypeMapper;
@Autowired private final NoteRecordMapper noteRecordMapper;
private NoteRecordMapper noteRecordMapper;
@Autowired private final NotePromptMapper notePromptMapper;
private NotePromptMapper notePromptMapper;
private final OllamaChatClient chatClient; private final TripleInfoMapper tripleInfoMapper;
@Autowired
public ModelRecordTypeServiceImpl(OllamaChatClient chatClient) {
this.chatClient = chatClient;
}
@Autowired private final Neo4jService neo4jService;
private TripleInfoMapper tripleInfoMapper;
@Autowired private final OllamaChatClient chatClient;
private Neo4jService neo4jService;
@Override @Override
public R<?> queryType(String name, Integer page, Integer size) { public List<ModelRecordType> queryType(String name, Integer page, Integer size) {
// IPage<ModelRecordType> iPage = new Page<>(page, size); // IPage<ModelRecordType> iPage = new Page<>(page, size);
// iPage = modelRecordTypeMapper.selectByName(iPage, name); // iPage = modelRecordTypeMapper.selectByName(iPage, name);
// return R.ok(IPages.buildDataMap(iPage)); // return R.ok(IPages.buildDataMap(iPage));
@ -75,7 +70,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
List<NotePrompt> prompts = notePromptMapper.queryPrompt(modelRecordType.getId()); List<NotePrompt> prompts = notePromptMapper.queryPrompt(modelRecordType.getId());
modelRecordType.setPrompts(prompts); modelRecordType.setPrompts(prompts);
} }
return R.ok(list); return list;
// return R.ok(IPages.buildDataMap(iPage)); // return R.ok(IPages.buildDataMap(iPage));
} }
@ -128,8 +123,7 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
} }
} }
@Override private List<TripleInfo> extractTripleInfo(String caseId, String name, String recordId) {
public R<?> getThreeInfo(String caseId, String name, String recordId) {
List<NoteRecord> records = noteRecordMapper.selectRecord(caseId, name, recordId); List<NoteRecord> records = noteRecordMapper.selectRecord(caseId, name, recordId);
List<TripleInfo> tripleInfos = new ArrayList<>(); List<TripleInfo> tripleInfos = new ArrayList<>();
for (NoteRecord record : records) { for (NoteRecord record : records) {
@ -139,17 +133,15 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
continue; continue;
} }
try { try {
// 分析三元组
List<Message> messages = new ArrayList<>(List.of(new SystemMessage(prompt.getPrompt() + record.getQuestion() + record.getAnswer())));
Prompt ask = new Prompt(messages);
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
// 分析三元组
Prompt ask = new Prompt(new UserMessage(prompt.getPrompt() + record.getQuestion() + record.getAnswer()));
stopWatch.start(); stopWatch.start();
log.info("开始分析:"); log.info("开始分析:");
ChatResponse call = chatClient.call(ask); ChatResponse call = chatClient.call(ask);
stopWatch.stop(); stopWatch.stop();
log.info("耗时:{}", stopWatch.getTotalTimeSeconds()); log.info("耗时:{}", stopWatch.getTotalTimeSeconds());
Generation result = call.getResult(); String content = call.getResult().getOutput().getContent();
String content = result.getOutput().getContent();
log.info("分析的结果是:{}", content); log.info("分析的结果是:{}", content);
JSONObject jsonObject = new JSONObject(content); JSONObject jsonObject = new JSONObject(content);
JSONArray threeInfo = jsonObject.getJSONArray("result"); JSONArray threeInfo = jsonObject.getJSONArray("result");
@ -160,9 +152,8 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
String endNodeType = object.getString("endNodeType"); String endNodeType = object.getString("endNodeType");
String property = object.getString("property"); String property = object.getString("property");
String value = object.getString("value"); String value = object.getString("value");
//去空 // 去空,如果存在任何的空值,则忽略
if (StringUtils.isEmpty(startNodeType) || StringUtils.isEmpty(entity) || StringUtils.isEmpty(endNodeType) if (StrUtil.hasEmpty(startNodeType, entity, endNodeType, property, value)) {
|| StringUtils.isEmpty(property) || StringUtils.isEmpty(value)) {
continue; continue;
} }
TripleInfo tripleInfo = new TripleInfo(entity, property, value, record.getId(), LocalDateTime.now(), startNodeType, endNodeType); TripleInfo tripleInfo = new TripleInfo(entity, property, value, record.getId(), LocalDateTime.now(), startNodeType, endNodeType);
@ -170,21 +161,28 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
tripleInfos.add(tripleInfo); tripleInfos.add(tripleInfo);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage(), e);
} }
} }
} }
return R.ok(tripleInfos); return tripleInfos;
}
@Override
public List<TripleInfo> getThreeInfo(String caseId, String name, String recordId) {
// TODO 这里应该改成异步的形式,通过异步的形式来进行提取三元组信息,不能每次点击就跑一遍
return extractTripleInfo(caseId, name, recordId);
} }
@Override @Override
public R<?> addNeo4j(List<String> ids) { public String addNeo4j(List<String> ids) {
List<TripleInfo> tripleInfos = tripleInfoMapper.selectByIds(ids); List<TripleInfo> tripleInfos = tripleInfoMapper.selectByIds(ids);
int i = 0; int i = 0;
for (TripleInfo tripleInfo : tripleInfos) { for (TripleInfo tripleInfo : tripleInfos) {
try { try {
//开始节点 //开始节点
String start = tripleInfo.getStartNode(); String start = tripleInfo.getStartNode();
// 首先看是否已经存在了,如果已经存在了,就不添加了
CaseNode startNode = neo4jService.findOneByName(tripleInfo.getCaseId(), tripleInfo.getNoteRecordsId(), tripleInfo.getStartNodeType(), start, "1"); CaseNode startNode = neo4jService.findOneByName(tripleInfo.getCaseId(), tripleInfo.getNoteRecordsId(), tripleInfo.getStartNodeType(), start, "1");
if (startNode == null) { if (startNode == null) {
startNode = new CaseNode(start, tripleInfo.getStartNodeType(), tripleInfo.getNoteRecordId(), tripleInfo.getNoteRecordsId(), tripleInfo.getCaseId(), "1"); startNode = new CaseNode(start, tripleInfo.getStartNodeType(), tripleInfo.getNoteRecordId(), tripleInfo.getNoteRecordsId(), tripleInfo.getCaseId(), "1");
@ -203,17 +201,18 @@ public class ModelRecordTypeServiceImpl extends ServiceImpl<ModelRecordTypeMappe
Rel rel = new Rel(startNode.getId(), tripleInfo.getRelation(), endNode.getId()); Rel rel = new Rel(startNode.getId(), tripleInfo.getRelation(), endNode.getId());
Rel relation = neo4jService.findRelation(rel); Rel relation = neo4jService.findRelation(rel);
if (relation == null) { if (relation == null) {
R<?> r = neo4jService.saveRelation(rel); neo4jService.saveRelation(rel);
} }
tripleInfo.setAddNeo4j("1"); tripleInfo.setAddNeo4j("1");
int j = tripleInfoMapper.updateById(tripleInfo); int j = tripleInfoMapper.updateById(tripleInfo);
if (j > 0) { if (j > 0) {
i++; i++;
} }
// TODO 重复添加的OK了,删除的呢?
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage(), e);
} }
} }
return R.ok("成功插入" + i + "条信息"); return ("成功插入" + i + "条信息");
} }
} }

37
src/main/java/com/supervision/police/service/impl/RecordServiceImpl.java
Unescape Escape View File

@ -24,6 +24,7 @@ import com.supervision.police.service.RecordService;
import com.supervision.springaidemo.dto.QARecordNodeDTO; import com.supervision.springaidemo.dto.QARecordNodeDTO;
import com.supervision.springaidemo.util.RecordRegexUtil; import com.supervision.springaidemo.util.RecordRegexUtil;
import com.supervision.springaidemo.util.WordReadUtil; import com.supervision.springaidemo.util.WordReadUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.ai.chat.ChatResponse; import org.springframework.ai.chat.ChatResponse;
@ -46,36 +47,25 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@Service @Service
@RequiredArgsConstructor
public class RecordServiceImpl extends ServiceImpl<NoteRecordMapper, NoteRecord> implements RecordService { public class RecordServiceImpl extends ServiceImpl<NoteRecordMapper, NoteRecord> implements RecordService {
@Autowired private final NoteRecordMapper noteRecordMapper;
private NoteRecordMapper noteRecordMapper;
@Autowired private final NoteRecordsMapper noteRecordsMapper;
private NoteRecordsMapper noteRecordsMapper;
@Autowired private final MinioService minioService;
private MinioService minioService;
@Autowired private final ModelCaseMapper modelCaseMapper;
private ModelCaseMapper modelCaseMapper;
@Autowired private final MinioFileMapper minioFileMapper;
private MinioFileMapper minioFileMapper;
private final OllamaChatClient chatClient; private final OllamaChatClient chatClient;
@Autowired
public RecordServiceImpl(OllamaChatClient chatClient) {
this.chatClient = chatClient;
}
@Autowired
private ModelRecordTypeMapper modelRecordTypeMapper; private ModelRecordTypeMapper modelRecordTypeMapper;
@Override @Override
// @Transactional(rollbackFor = Exception.class) // @Transactional(rollbackFor = Exception.class)
public R<?> uploadRecords(NoteRecords records, List<MultipartFile> fileList) throws IOException { public String uploadRecords(NoteRecords records, List<MultipartFile> fileList) throws IOException {
//上传文件，获取文件ids //上传文件，获取文件ids
List<String> fileIds = new ArrayList<>(); List<String> fileIds = new ArrayList<>();
for (MultipartFile file : fileList) { for (MultipartFile file : fileList) {
@ -181,14 +171,14 @@ public class RecordServiceImpl extends ServiceImpl<NoteRecordMapper, NoteRecord>
// } // }
} }
} }
return R.okMsg("保存成功"); return "保存成功";
} else { } else {
return R.fail("保存笔录失败"); return "保存笔录失败";
} }
} }
@Override @Override
public R<?> queryRecords(NoteRecords noteRecords, Integer page, Integer size) { public Map<String, Object> queryRecords(NoteRecords noteRecords, Integer page, Integer size) {
LambdaQueryWrapper<NoteRecords> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<NoteRecords> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotEmpty(noteRecords.getName()), NoteRecords::getName, noteRecords.getName()) wrapper.like(StringUtils.isNotEmpty(noteRecords.getName()), NoteRecords::getName, noteRecords.getName())
.eq(NoteRecords::getCaseId, noteRecords.getCaseId()) .eq(NoteRecords::getCaseId, noteRecords.getCaseId())
@ -213,11 +203,11 @@ public class RecordServiceImpl extends ServiceImpl<NoteRecordMapper, NoteRecord>
} }
} }
} }
return R.ok(IPages.buildDataMap(pager, res.size())); return IPages.buildDataMap(pager, res.size());
} }
@Override @Override
public R<?> delRecords(String id) { public void delRecords(String id) {
NoteRecords noteRecords = noteRecordsMapper.selectById(id); NoteRecords noteRecords = noteRecordsMapper.selectById(id);
noteRecords.setDataStatus(StringUtils.getUUID()); noteRecords.setDataStatus(StringUtils.getUUID());
noteRecordsMapper.updateById(noteRecords); noteRecordsMapper.updateById(noteRecords);
@ -231,7 +221,6 @@ public class RecordServiceImpl extends ServiceImpl<NoteRecordMapper, NoteRecord>
minioService.delFile(fileId); minioService.delFile(fileId);
} }
} }
return R.ok();
} }
} }

Write Preview
Loading…
Cancel
Save