Переглянути джерело

优化:
知识条目搜索栏,“问题”“创建”支持模糊搜索;
产品条目搜索栏,“创建”支持模糊搜索;
新增产品时“价格”修改为非必选;
增大知识库下发弹窗ui;
知识库隐藏上方删除按钮。

范志成 4 місяців тому
батько
коміт
1fb257e479

+ 9 - 9
smsb-modules/smsb-device/src/main/java/com/inspur/device/domain/bo/SmsbDifyDatasetsProductBo.java

@@ -24,31 +24,31 @@ public class SmsbDifyDatasetsProductBo extends BaseEntity {
     /**
      * 主键ID
      */
-    //    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
     private Long id;
 
     /**
      * 名称
      */
-    // @NotBlank(message = "名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "名称不能为空", groups = {AddGroup.class, EditGroup.class})
     private String name;
 
     /**
      * 简介
      */
-    // @NotBlank(message = "简介不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "简介不能为空", groups = {AddGroup.class, EditGroup.class})
     private String note;
 
     /**
      * 序号
      */
-    // @NotNull(message = "序号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "序号不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long sort;
 
     /**
      * 产品图片
      */
-    // @NotBlank(message = "产品图片不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "产品图片不能为空", groups = {AddGroup.class, EditGroup.class})
     private String imgUrl;
 
     /**
@@ -60,24 +60,24 @@ public class SmsbDifyDatasetsProductBo extends BaseEntity {
     /**
      * 关键词
      */
-    // @NotBlank(message = "关键词不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "关键词不能为空", groups = {AddGroup.class, EditGroup.class})
     private String keyword;
 
     /**
      * 关键词
      */
-    // @NotBlank(message = "属性不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "属性不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer property;
 
     /**
      * 关键词
      */
-    // @NotBlank(message = "价格不能为空", groups = {AddGroup.class, EditGroup.class})
+    // @NotNull(message = "价格不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer price;
 
     /**
      * 关键词
      */
-//    @NotBlank(message = "视频不能为空", groups = {AddGroup.class, EditGroup.class})
+    // @NotBlank(message = "视频不能为空", groups = {AddGroup.class, EditGroup.class})
     private String videoUrl;
 }

+ 1 - 1
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDifyDatasetsProductServiceImpl.java

@@ -104,7 +104,7 @@ public class SmsbDifyDatasetsProductServiceImpl implements ISmsbDifyDatasetsProd
         lqw.eq(StringUtils.isNotBlank(bo.getNote()), SmsbDifyDatasetsProduct::getNote, bo.getNote());
         lqw.eq(bo.getSort() != null, SmsbDifyDatasetsProduct::getSort, bo.getSort());
         lqw.eq(StringUtils.isNotBlank(bo.getImgUrl()), SmsbDifyDatasetsProduct::getImgUrl, bo.getImgUrl());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreateUser()), SmsbDifyDatasetsProduct::getCreateUser, bo.getCreateUser());
+        lqw.like(StringUtils.isNotBlank(bo.getCreateUser()), SmsbDifyDatasetsProduct::getCreateUser, bo.getCreateUser());
         return lqw;
     }
 

+ 2 - 2
smsb-modules/smsb-device/src/main/java/com/inspur/device/service/impl/SmsbDifyDatasetsQuestionServiceImpl.java

@@ -77,10 +77,10 @@ public class SmsbDifyDatasetsQuestionServiceImpl implements ISmsbDifyDatasetsQue
     private LambdaQueryWrapper<SmsbDifyDatasetsQuestion> buildQueryWrapper(SmsbDifyDatasetsQuestionBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<SmsbDifyDatasetsQuestion> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getQuestion()), SmsbDifyDatasetsQuestion::getQuestion, bo.getQuestion());
+        lqw.like(StringUtils.isNotBlank(bo.getQuestion()), SmsbDifyDatasetsQuestion::getQuestion, bo.getQuestion());
         lqw.eq(StringUtils.isNotBlank(bo.getAnswer()), SmsbDifyDatasetsQuestion::getAnswer, bo.getAnswer());
         lqw.eq(bo.getSort() != null, SmsbDifyDatasetsQuestion::getSort, bo.getSort());
-        lqw.eq(StringUtils.isNotBlank(bo.getCreateUser()), SmsbDifyDatasetsQuestion::getCreateUser, bo.getCreateUser());
+        lqw.like(StringUtils.isNotBlank(bo.getCreateUser()), SmsbDifyDatasetsQuestion::getCreateUser, bo.getCreateUser());
         lqw.orderByAsc(SmsbDifyDatasetsQuestion::getSort);
         return lqw;
     }

+ 12 - 5
smsb-plus-ui/src/views/smsb/datasets/question.vue

@@ -14,9 +14,9 @@
               <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['device:datasets:add']">
                 新增
               </el-button>
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-                         v-hasPermi="['device:datasets:remove']">删除
-              </el-button>
+<!--              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"-->
+<!--                         v-hasPermi="['device:datasets:remove']">删除-->
+<!--              </el-button>-->
 <!--              <el-button type="warning" plain icon="Refresh" @click="handleSync()"
                          v-hasPermi="['device:datasets:add']">同步
               </el-button>-->
@@ -96,8 +96,8 @@
     </el-dialog>
 
     <!-- 知识条目下发 -->
-    <el-dialog :title="pushDialog.title" v-model="pushDialog.visible" width="900px" append-to-body>
-      <div>
+    <el-dialog :title="pushDialog.title" v-model="pushDialog.visible" width="1200px" append-to-body>
+      <div class="edit_dev">
         <el-transfer
           v-model="selectedEntry"
           filterable
@@ -108,6 +108,7 @@
           :titles="['可选条目', '已选条目']"
           :button-texts="['移除', '添加']"
         />
+        <!--          style="height: 600px"-->
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -372,3 +373,9 @@ onMounted(() => {
   getList();
 });
 </script>
+
+<style scoped>
+.edit_dev >>> .el-transfer-panel {
+  width:40%;
+}
+</style>

+ 1 - 1
smsb-plus-ui/src/views/smsb/difyDatasetsProduct/index.vue

@@ -224,7 +224,7 @@ const data = reactive<PageData<DifyDatasetsProductForm, DifyDatasetsProductQuery
       {required: true, message: "产品属性不能为空", trigger: "blur"}
     ],
     price: [
-      {required: true, message: "产品价格不能为空", trigger: "blur"}
+      {required: false, message: "产品价格不能为空", trigger: "blur"}
     ],
     videoUrl: [
       {required: false, message: "产品视频不能为空", trigger: "blur"}