更新一些逻辑

admin-hanhai-vue/src/views/customs/TbCustomsList.vue

@@ -159,11 +159,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'用户id',
-            align:"center",
-            dataIndex: 'userId'
-          },
           {
             title:'角色身份',
             align:"center",

admin-hanhai-vue/src/views/tbConf/TbConfList.vue

@@ -0,0 +1,177 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button type="primary" icon="download" @click="handleExportXls('tb_conf')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-conf-modal ref="modalForm" @ok="modalFormOk"></tb-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbConfModal from './modules/TbConfModal'
+
+  export default {
+    name: 'TbConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbConfModal
+    },
+    data () {
+      return {
+        description: 'tb_conf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+                    {
+                      title:'配置项',
+                      align:"center",
+                      dataIndex: 'info'
+                    },
+          {
+            title:'配置值',
+            align:"center",
+            dataIndex: 'value'
+          },
+
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/tbConf/tbConf/list",
+          delete: "/tbConf/tbConf/delete",
+          deleteBatch: "/tbConf/tbConf/deleteBatch",
+          exportXlsUrl: "/tbConf/tbConf/exportXls",
+          importExcelUrl: "tbConf/tbConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'value',text:'配置值',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'配置项',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

admin-hanhai-vue/src/views/tbConf/modules/TbConfForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="配置值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <a-input v-model="model.value" placeholder="请输入配置值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="配置项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-input v-model="model.info" placeholder="请输入配置项"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbConfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/tbConf/tbConf/add",
+          edit: "/tbConf/tbConf/edit",
+          queryById: "/tbConf/tbConf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-conf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

admin-hanhai-vue/src/views/tbConf/modules/TbConfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java

@@ -100,16 +100,16 @@ public class TbProduct implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/controller/TbConfController.java

@@ -0,0 +1,156 @@
+package org.jeecg.modules.tbConf.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.tbConf.entity.TbConf;
+import org.jeecg.modules.tbConf.service.ITbConfService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: tb_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+@Api(tags="tb_conf")
+@RestController
+@RequestMapping("/tbConf/tbConf")
+@Slf4j
+public class TbConfController extends JeecgController<TbConf, ITbConfService> {
+	@Autowired
+	private ITbConfService tbConfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param tbConf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "tb_conf-分页列表查询")
+	@ApiOperation(value="tb_conf-分页列表查询", notes="tb_conf-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<TbConf>> queryPageList(TbConf tbConf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<TbConf> queryWrapper = QueryGenerator.initQueryWrapper(tbConf, req.getParameterMap());
+		Page<TbConf> page = new Page<TbConf>(pageNo, pageSize);
+		IPage<TbConf> pageList = tbConfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param tbConf
+	 * @return
+	 */
+	@AutoLog(value = "tb_conf-添加")
+	@ApiOperation(value="tb_conf-添加", notes="tb_conf-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody TbConf tbConf) {
+		tbConfService.save(tbConf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param tbConf
+	 * @return
+	 */
+	@AutoLog(value = "tb_conf-编辑")
+	@ApiOperation(value="tb_conf-编辑", notes="tb_conf-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody TbConf tbConf) {
+		tbConfService.updateById(tbConf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "tb_conf-通过id删除")
+	@ApiOperation(value="tb_conf-通过id删除", notes="tb_conf-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		tbConfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "tb_conf-批量删除")
+	@ApiOperation(value="tb_conf-批量删除", notes="tb_conf-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.tbConfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "tb_conf-通过id查询")
+	@ApiOperation(value="tb_conf-通过id查询", notes="tb_conf-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<TbConf> queryById(@RequestParam(name="id",required=true) String id) {
+		TbConf tbConf = tbConfService.getById(id);
+		if(tbConf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(tbConf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param tbConf
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, TbConf tbConf) {
+        return super.exportXls(request, tbConf, TbConf.class, "tb_conf");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, TbConf.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/entity/TbConf.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.tbConf.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: tb_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("tb_conf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="tb_conf对象", description="tb_conf")
+public class TbConf implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**key*/
+	@Excel(name = "key", width = 15)
+    @ApiModelProperty(value = "key")
+    private java.lang.String name;
+	/**配置值*/
+	@Excel(name = "配置值", width = 15)
+    @ApiModelProperty(value = "配置值")
+    private java.lang.String value;
+	/**配置项*/
+	@Excel(name = "配置项", width = 15)
+    @ApiModelProperty(value = "配置项")
+    private java.lang.String info;
+	/**分组*/
+	@Excel(name = "分组", width = 15)
+    @ApiModelProperty(value = "分组")
+    private java.lang.String dictGroup;
+	/**分组说明*/
+	@Excel(name = "分组说明", width = 15)
+    @ApiModelProperty(value = "分组说明")
+    private java.lang.String dictGroupInfo;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/TbConfMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbConf.mapper;
+
+import org.jeecg.modules.tbConf.entity.TbConf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: tb_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+public interface TbConfMapper extends BaseMapper<TbConf> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/mapper/xml/TbConfMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.tbConf.mapper.TbConfMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/ITbConfService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.tbConf.service;
+
+import org.jeecg.modules.tbConf.entity.TbConf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: tb_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+public interface ITbConfService extends IService<TbConf> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/service/impl/TbConfServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.tbConf.service.impl;
+
+import org.jeecg.modules.tbConf.entity.TbConf;
+import org.jeecg.modules.tbConf.mapper.TbConfMapper;
+import org.jeecg.modules.tbConf.service.ITbConfService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: tb_conf
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+@Service
+public class TbConfServiceImpl extends ServiceImpl<TbConfMapper, TbConf> implements ITbConfService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/TbConfList.vue

@@ -0,0 +1,177 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('tb_conf')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <tb-conf-modal ref="modalForm" @ok="modalFormOk"></tb-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import TbConfModal from './modules/TbConfModal'
+
+  export default {
+    name: 'TbConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      TbConfModal
+    },
+    data () {
+      return {
+        description: 'tb_conf管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'配置值',
+            align:"center",
+            dataIndex: 'value'
+          },
+          {
+            title:'配置项',
+            align:"center",
+            dataIndex: 'info'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/tbConf/tbConf/list",
+          delete: "/tbConf/tbConf/delete",
+          deleteBatch: "/tbConf/tbConf/deleteBatch",
+          exportXlsUrl: "/tbConf/tbConf/exportXls",
+          importExcelUrl: "tbConf/tbConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'value',text:'配置值',dictCode:''})
+        fieldList.push({type:'string',value:'info',text:'配置项',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="配置值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="value">
+              <a-input v-model="model.value" placeholder="请输入配置值"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="配置项" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="info">
+              <a-input v-model="model.info" placeholder="请输入配置项"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'TbConfForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/tbConf/tbConf/add",
+          edit: "/tbConf/tbConf/edit",
+          queryById: "/tbConf/tbConf/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-conf-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue/modules/TbConfModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <tb-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import TbConfForm from './TbConfForm'
+  export default {
+    name: 'TbConfModal',
+    components: {
+      TbConfForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/tbConf/tbConf/list',
+  save='/tbConf/tbConf/add',
+  edit='/tbConf/tbConf/edit',
+  deleteOne = '/tbConf/tbConf/delete',
+  deleteBatch = '/tbConf/tbConf/deleteBatch',
+  importExcel = '/tbConf/tbConf/importExcel',
+  exportXls = '/tbConf/tbConf/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConf.data.ts

@@ -0,0 +1,33 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '配置值',
+    align:"center",
+    dataIndex: 'value'
+   },
+   {
+    title: '配置项',
+    align:"center",
+    dataIndex: 'info'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '配置值',
+    field: 'value',
+    component: 'Input',
+  },
+  {
+    label: '配置项',
+    field: 'info',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/TbConfList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <TbConfModal @register="registerModal" @success="handleSuccess"></TbConfModal>
+  </div>
+</template>
+
+<script lang="ts" name="tbConf-tbConf" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import TbConfModal from './components/TbConfModal.vue'
+  import {columns, searchFormSchema} from './tbConf.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './tbConf.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'tb_conf',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"tb_conf",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbConf/vue3/components/TbConfModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../tbConf.data';
+    import {saveOrUpdate} from '../tbConf.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java

@@ -131,8 +131,8 @@ public class ProductController extends JeecgController<TbProduct, ProductService
     @ApiOperation(value = "产品报价", notes = "产品报价")
     @PostMapping(value = "/addProduct")
     public Result<String> addProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) {
-        tbProductService.addProduct(productReq, token);
-        return Result.OK("添加成功！");
+
+        return tbProductService.addProduct(productReq, token);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/IndexServiceImpl.java

@@ -12,6 +12,8 @@ import org.jeecg.modules.banner.entity.WebBanner;
 import org.jeecg.modules.banner.service.IWebBannerService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.tbConf.entity.TbConf;
+import org.jeecg.modules.tbConf.service.ITbConfService;
 import org.jeecg.modules.userRole.entity.TbUserRole;
 import org.jeecg.modules.userRole.service.ITbUserRoleService;
 import org.jeecg.modules.utils.ValidateTool;
@@ -31,7 +33,7 @@ public class IndexServiceImpl implements IndexService {
     @Resource
     private IWebBannerService webBannerService;
     @Autowired
-    private IHanHaiMemberService iHanHaiMemberService;
+    private ITbConfService tbConfService;
     @Autowired
     private ShiroRealm shiroRealm;
     @Resource
@@ -44,8 +46,10 @@ public class IndexServiceImpl implements IndexService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         hanHaiMember.setPasswordSalt(null);
         JSONObject jsonObject = new JSONObject();
-        Object sys_phone = redisUtil.get("sys_phone");
-        jsonObject.put("phone", ValidateTool.isNull(sys_phone) ? "19198239116" : String.valueOf(sys_phone));
+        QueryWrapper<TbConf> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("name","sys_phone");
+        TbConf one = tbConfService.getOne(objectQueryWrapper);
+        jsonObject.put("phone", ValidateTool.isNull(one) ? "19198239116" : one.getValue());
         jsonObject.put("my", hanHaiMember);
 
         LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java

@@ -24,26 +24,11 @@ import java.util.Date;
 public class ProductReq implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**供应商名称*/
-	@Excel(name = "供应商名称", width = 15)
-    @ApiModelProperty(value = "供应商名称")
-    private String companyName;
-	/**客户姓名*/
-	@Excel(name = "客户姓名", width = 15)
-    @ApiModelProperty(value = "客户姓名")
-    private String userName;
-	/**客户电话*/
-	@Excel(name = "客户电话", width = 15)
-    @ApiModelProperty(value = "客户电话")
-    private String phone;
+
 	/**地址id*/
 	@Excel(name = "地址id", width = 15)
     @ApiModelProperty(value = "地址id")
     private String addressId;
-	/**报价照片*/
-	@Excel(name = "报价照片", width = 15)
-    @ApiModelProperty(value = "报价照片")
-    private String pic;
 	/**单价*/
 	@Excel(name = "单价", width = 15)
     @ApiModelProperty(value = "单价")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java

@@ -15,7 +15,7 @@ import org.jeecg.modules.product.entity.TbProduct;
  */
 public interface ProductService extends IService<TbProduct> {
 
-   void addProduct(ProductReq productReq,String token);
+   Result addProduct(ProductReq productReq,String token);
 
    Result addProductOrder(ProductOrderReq productReq, String token);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java

@@ -4,10 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.address.entity.TbAddress;
+import org.jeecg.modules.address.service.ITbAddressService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
-import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.postBean.ProductOrderReq;
 import org.jeecg.modules.postBean.UpdateOrderReq;
 import org.jeecg.modules.product.entity.ProductReq;
@@ -22,8 +25,6 @@ import org.jeecg.modules.userRole.service.ITbUserRoleService;
 import org.jeecg.modules.utils.ValidateTool;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -32,7 +33,7 @@ import java.math.BigDecimal;
 /**
  * @Description: 产品报价表
  * @Author: jeecg-boot
- * @Date:   2024-10-19
+ * @Date: 2024-10-19
  * @Version: V1.0
  */
 @Service
@@ -47,25 +48,39 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
     private TbProductMapper tbProductMapper;
     @Resource
     private ITbProductOrderService tbProductOrderService;
-
+    @Resource
+    private ITbAddressService addressService;
+    @Resource
+    private RedisUtil redisUtil;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void addProduct(ProductReq productReq,String token) {
-
+    public Result addProduct(ProductReq productReq, String token) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(TbUserRole::getUserId,hanHaiMember.getId()).
-                eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1);
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserId, hanHaiMember.getId()).
+                eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1);
         TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
+        if (ValidateTool.isNull(one1)) {
+            return Result.error("身份审核未通过");
+        }
+        TbAddress byId = addressService.getById(productReq.getAddressId());
+        if (ValidateTool.isNull(byId)) {
+            return Result.error("请选择地址");
+        }
+        Object productPic = redisUtil.get("productPic");
         TbProduct product = new TbProduct();
         BeanUtils.copyProperties(productReq, product);
         product.setUserId(hanHaiMember.getId());
         product.setCompanyName(one1.getCompanyName());
         product.setAuditStatus(0);
+        product.setAddress(byId.getAddress());
         product.setShowStatus(2);
+        //默认图片
+        product.setPic(ValidateTool.isNull(productPic) ? "https://dianpin-img.xzaiyp.top/upload/组467843x_1729332845907.png" : String.valueOf(productPic));
         product.setProductType(2);
         tbProductMapper.insert(product);
+        return Result.OK("添加成功！");
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -75,21 +90,21 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         QueryWrapper<TbProduct> productQueryWrapper = new QueryWrapper<>();
         productQueryWrapper.eq("id", productReq.getProductId());
         TbProduct product = tbProductService.getOne(productQueryWrapper);
-        if (ValidateTool.isNull(product)){
+        if (ValidateTool.isNull(product)) {
             return Result.error("订单信息错误");
         }
-        if (product.getAuditStatus()!=1 || product.getShowStatus()!=0){
+        if (product.getAuditStatus() != 1 || product.getShowStatus() != 0) {
             return Result.error("订单状态异常，请刷新");
         }
         QueryWrapper<TbUserRole> objectQueryWrapper = new QueryWrapper<>();
-        objectQueryWrapper.eq("user_id",hanHaiMember.getId()).eq("role",0);
+        objectQueryWrapper.eq("user_id", hanHaiMember.getId()).eq("role", 0);
         TbUserRole one2 = tbUserRoleService.getOne(objectQueryWrapper);
         TbProductOrder tbProductOrder = new TbProductOrder();
         BeanUtils.copyProperties(productReq, tbProductOrder);
-        if (ValidateTool.isNull(productReq.getNum())){
+        if (ValidateTool.isNull(productReq.getNum())) {
             return Result.error("请选择数量");
         }
-        if (productReq.getNum()>product.getNum()){
+        if (productReq.getNum() > product.getNum()) {
             return Result.error("产品数量不足");
         }
 //        总价
@@ -105,16 +120,16 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
         tbProductOrder.setPic(product.getPic());
         tbProductOrder.setPrice(product.getPrice());
         tbProductOrder.setTakeTime(productReq.getTakeTime());
-            LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        objectLambdaQueryWrapper.eq(TbUserRole::getUserId,product.getUserId()).
-                eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1);
+        LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        objectLambdaQueryWrapper.eq(TbUserRole::getUserId, product.getUserId()).
+                eq(TbUserRole::getRole, 1).eq(TbUserRole::getAuditStatus, 1);
         TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper);
         JSONObject jsonObject = new JSONObject();
         tbProductOrder.setCompanyName(one1.getCompanyName());
-        jsonObject.put("bankAccount",one1.getBankAccount());
-        jsonObject.put("companyName",one1.getCompanyName());
-        jsonObject.put("bankName",one1.getBankNama());
-        jsonObject.put("orderId",tbProductOrder.getId());
+        jsonObject.put("bankAccount", one1.getBankAccount());
+        jsonObject.put("companyName", one1.getCompanyName());
+        jsonObject.put("bankName", one1.getBankNama());
+        jsonObject.put("orderId", tbProductOrder.getId());
         tbProductOrderService.save(tbProductOrder);
         return Result.OK(jsonObject);
     }
@@ -123,13 +138,13 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
     @Override
     public Result updateOrder(UpdateOrderReq updateOrderReq, String token) {
         TbProductOrder order = tbProductOrderService.getById(updateOrderReq.getOrderId());
-        if (ValidateTool.isNull(order)){
+        if (ValidateTool.isNull(order)) {
             return Result.error("订单信息错误");
         }
-        if (updateOrderReq.getType()==0){
+        if (updateOrderReq.getType() == 0) {
             order.setOrderFlag(1);
         }
-        if (updateOrderReq.getType()==1){
+        if (updateOrderReq.getType() == 1) {
             order.setOrderFlag(2);
         }
         tbProductOrderService.updateById(order);