feature: 配置修改

src/main/java/cn/breeze/elleai/application/service/AppChatCompletionService.java

@@ -217,16 +217,8 @@ public class AppChatCompletionService {
         Page<UserChatCompletionResponseModel> page = chatCompletionService.userQaPaginQuery(requestModel);
 
         PageResult<UserChatCompletionDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
-
         if(CollectionUtil.isNotEmpty(page.getRecords())) {
-            List<UserChatCompletionDto> dtoList = page.getRecords().stream().map(v -> {
-                UserChatCompletionDto dto = BeanUtil.copyProperties(v, UserChatCompletionDto.class);
-
-                //TODO 员工名称，提问信息
-
-                return dto;
-            }).collect(Collectors.toList());
-
+            List<UserChatCompletionDto> dtoList = page.getRecords().stream().map(v -> BeanUtil.copyProperties(v, UserChatCompletionDto.class)).collect(Collectors.toList());
             pageResult.setItems(dtoList);
         }
         return pageResult;

src/main/java/cn/breeze/elleai/application/service/AppExamineService.java

@@ -240,7 +240,6 @@ public class AppExamineService {
      * @param dto
      */
     public void saveExamineScene(ExamineSceneSaveDto dto) {
-
         ExamineSceneSaveModel model = BeanUtil.copyProperties(dto, ExamineSceneSaveModel.class);
         examineService.saveScene(model);
     }
@@ -368,12 +367,9 @@ public class AppExamineService {
      * @param dto
      */
     public void saveExamineQa(ExamineQaSaveDto dto) {
-
         Assert.notNull(dto.getCategoryId(), "分类ID不能为空");
-
         ExamineSceneCategoryResponseModel category = examineService.sceneCategoryDetail(dto.getCategoryId());
         Assert.notNull(category, "分类信息获取异常");
-
         ExamineQaSaveModel model = BeanUtil.copyProperties(dto, ExamineQaSaveModel.class);
         examineService.saveExamineQa(model);
     }
@@ -748,15 +744,8 @@ public class AppExamineService {
      * @return
      */
     public PageResult<ExamineRecordDto> examineRecordPaginQuery(ExamineRecordRequestDto request) {
-
         ExamineRecordRequestModel requestModel = BeanUtil.copyProperties(request, ExamineRecordRequestModel.class);
-
-        ExamineRequestModel rm = new ExamineRequestModel();
-        rm.setName(request.getUserName());
-        examineService.examineList(rm);
-
         Page<ExamineRecordResponseModel> page = examineService.examineRecordPaginQuery(requestModel);
-
         PageResult<ExamineRecordDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
 
         if(CollectionUtil.isNotEmpty(page.getRecords())) {

src/main/java/cn/breeze/elleai/domain/sparring/model/request/UserQaRequestModel.java

@@ -18,6 +18,8 @@ public class UserQaRequestModel implements Serializable {
 
     private String userName;
 
+    private String shopName;
+
     private String sessionId;
 
     private Date startTime;

src/main/java/cn/breeze/elleai/domain/sparring/service/ChatCompletionServiceImpl.java

@@ -43,13 +43,12 @@ public class ChatCompletionServiceImpl implements ChatCompletionService{
     public Page<UserChatCompletionResponseModel> userQaPaginQuery(UserQaRequestModel request) {
         Integer pageNo = ObjectUtil.defaultIfNull(request.getPageNo(), 1);
         Integer pageSize = ObjectUtil.defaultIfNull(request.getPageSize(), 10);
-
         QueryWrapper queryWrapper = QueryWrapper.create();
-        if(StrUtil.isNotEmpty(request.getUserId())) {
-            queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.USER_ID.eq(request.getUserId()));
-        }
         if(StrUtil.isNotEmpty(request.getUserName())) {
-            queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.USER_NAME.like("%"+request.getUserName()+"%"));
+            queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.USER_NAME.eq(request.getUserName()));
+        }
+        if(StrUtil.isNotEmpty(request.getShopName())) {
+            queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.SHOP_NAME.like("%"+request.getShopName()+"%"));
         }
         if(Objects.nonNull(request.getStartTime())) {
             queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.CREATE_TIME.ge(request.getStartTime()));
@@ -58,10 +57,7 @@ public class ChatCompletionServiceImpl implements ChatCompletionService{
             queryWrapper.where(USER_CHAT_COMPLETION_ENTITY.CREATE_TIME.le(request.getEndTime()));
         }
         queryWrapper.orderBy(USER_CHAT_COMPLETION_ENTITY.CREATE_TIME, false);
-
-        Page<UserChatCompletionResponseModel> page = chatCompletionMapper.paginateAs(pageNo, pageSize, queryWrapper, UserChatCompletionResponseModel.class);
-
-        return page;
+        return  chatCompletionMapper.paginateAs(pageNo, pageSize, queryWrapper, UserChatCompletionResponseModel.class);
     }
 
     @Override

src/main/java/cn/breeze/elleai/domain/sparring/service/CommonServiceImpl.java

@@ -104,7 +104,6 @@ public class CommonServiceImpl implements CommonService{
         ProperNounEntity entity = BeanUtil.toBean(dto, ProperNounEntity.class);
         entity.setUpdateTime(new Date());
         if(Objects.isNull(entity.getId())) {
-            entity.setStatus(0);
             entity.setDeleted(0);
         }
         properNounMapper.insertOrUpdateSelective(entity);

src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineServiceImpl.java

@@ -17,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.ArrayList;
 import java.util.List;
@@ -182,8 +183,10 @@ public class ExamineServiceImpl implements ExamineService {
         if(Objects.isNull(entity.getId())) {
             entity.setStatus(0);
             entity.setDeleted(0);
+            entity.setCreateTime(new Date());
+            sceneMapper.insert(entity);
         }
-        sceneMapper.insertOrUpdateSelective(entity);
+        sceneMapper.insertOrUpdate(entity, false);
     }
 
     @Override
@@ -282,12 +285,11 @@ public class ExamineServiceImpl implements ExamineService {
 
     @Override
     public void saveExamineQa(ExamineQaSaveModel dto) {
-
         ExamineQaEntity entity = BeanUtil.toBean(dto, ExamineQaEntity.class);
         entity.setUpdateTime(new Date());
         if(Objects.isNull(entity.getId())) {
-            entity.setStatus(0);
             entity.setDeleted(0);
+            entity.setCreateTime(new Date());
         }
         qaMapper.insertOrUpdateSelective(entity);
     }