修复

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/controller/CitiyShopAuthenticationController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商铺实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Api(tags="商铺实名")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/entity/CitiyShopAuthentication.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商铺实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Data
@@ -47,8 +47,24 @@ public class CitiyShopAuthentication implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**名称*/
-	@Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "名称")
+	/**店铺名称*/
+	@Excel(name = "店铺名称", width = 15)
+    @ApiModelProperty(value = "店铺名称")
     private java.lang.String name;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String address;
+	/**营业执照*/
+	@Excel(name = "营业执照", width = 15)
+    @ApiModelProperty(value = "营业执照")
+    private java.lang.String image;
+	/**电话*/
+	@Excel(name = "电话", width = 15)
+    @ApiModelProperty(value = "电话")
+    private java.lang.String phone;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/mapper/CitiyShopAuthenticationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商铺实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface CitiyShopAuthenticationMapper extends BaseMapper<CitiyShopAuthentication> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/service/ICitiyShopAuthenticationService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商铺实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface ICitiyShopAuthenticationService extends IService<CitiyShopAuthentication> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/service/impl/CitiyShopAuthenticationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商铺实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/vue/CitiyShopAuthenticationList.vue

@@ -122,10 +122,31 @@
             }
           },
           {
-            title:'名称',
+            title:'店铺名称',
             align:"center",
             dataIndex: 'name'
           },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'营业执照',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -160,7 +181,11 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'店铺名称',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'营业执照',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/vue/modules/CitiyShopAuthenticationForm.vue

@@ -4,8 +4,28 @@
       <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="name">
-              <a-input v-model="model.name" placeholder="请输入名称"  ></a-input>
+            <a-form-model-item label="店铺名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入店铺名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyShopAuthentication/vue3/CitiyShopAuthentication.data.ts

@@ -5,10 +5,31 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '名称',
+    title: '店铺名称',
     align:"center",
     dataIndex: 'name'
    },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '营业执照',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -16,8 +37,30 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '名称',
+    label: '店铺名称',
     field: 'name',
     component: 'Input',
   },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '营业执照',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyUserAuthentication/controller/CitiyUserAuthenticationController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 个人实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Api(tags="个人实名")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyUserAuthentication/entity/CitiyUserAuthentication.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 个人实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyUserAuthentication/mapper/CitiyUserAuthenticationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 个人实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface CitiyUserAuthenticationMapper extends BaseMapper<CitiyUserAuthentication> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyUserAuthentication/service/ICitiyUserAuthenticationService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 个人实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface ICitiyUserAuthenticationService extends IService<CitiyUserAuthentication> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citiyUserAuthentication/service/impl/CitiyUserAuthenticationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 个人实名
  * @Author: jeecg-boot
- * @Date:   2024-10-14
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/controller/CityConfController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityConf.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.cityConf.entity.CityConf;
+import org.jeecg.modules.cityConf.service.ICityConfService;
+
+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.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 配置列表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-26
+ * @Version: V1.0
+ */
+@Api(tags="配置列表")
+@RestController
+@RequestMapping("/cityConf/cityConf")
+@Slf4j
+public class CityConfController extends JeecgController<CityConf, ICityConfService> {
+	@Autowired
+	private ICityConfService cityConfService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityConf
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "配置列表-分页列表查询")
+	@ApiOperation(value="配置列表-分页列表查询", notes="配置列表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityConf>> queryPageList(CityConf cityConf,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityConf> queryWrapper = QueryGenerator.initQueryWrapper(cityConf, req.getParameterMap());
+		Page<CityConf> page = new Page<CityConf>(pageNo, pageSize);
+		IPage<CityConf> pageList = cityConfService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityConf
+	 * @return
+	 */
+	@AutoLog(value = "配置列表-添加")
+	@ApiOperation(value="配置列表-添加", notes="配置列表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityConf cityConf) {
+		cityConfService.save(cityConf);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityConf
+	 * @return
+	 */
+	@AutoLog(value = "配置列表-编辑")
+	@ApiOperation(value="配置列表-编辑", notes="配置列表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityConf cityConf) {
+		cityConfService.updateById(cityConf);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "配置列表-通过id删除")
+	@ApiOperation(value="配置列表-通过id删除", notes="配置列表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityConfService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "配置列表-批量删除")
+	@ApiOperation(value="配置列表-批量删除", notes="配置列表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityConfService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "配置列表-通过id查询")
+	@ApiOperation(value="配置列表-通过id查询", notes="配置列表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CityConf> queryById(@RequestParam(name="id",required=true) String id) {
+		CityConf cityConf = cityConfService.getById(id);
+		if(cityConf==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityConf);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityConf
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityConf cityConf) {
+        return super.exportXls(request, cityConf, CityConf.class, "配置列表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CityConf.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/entity/CityConf.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.cityConf.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: 配置列表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_conf")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_conf对象", description="配置列表")
+public class CityConf implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String keyName;
+	/**标签*/
+	@Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String keyIcon;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private java.lang.String keyValue;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String keyImage;
+	/**详情*/
+	@Excel(name = "详情", width = 15)
+    @ApiModelProperty(value = "详情")
+    private java.lang.String keyDetails;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/mapper/CityConfMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityConf.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityConf.entity.CityConf;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 配置列表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-26
+ * @Version: V1.0
+ */
+public interface CityConfMapper extends BaseMapper<CityConf> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/mapper/xml/CityConfMapper.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.cityConf.mapper.CityConfMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/service/ICityConfService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityConf.service;
+
+import org.jeecg.modules.cityConf.entity.CityConf;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 配置列表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-26
+ * @Version: V1.0
+ */
+public interface ICityConfService extends IService<CityConf> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/service/impl/CityConfServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityConf.service.impl;
+
+import org.jeecg.modules.cityConf.entity.CityConf;
+import org.jeecg.modules.cityConf.mapper.CityConfMapper;
+import org.jeecg.modules.cityConf.service.ICityConfService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 配置列表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-26
+ * @Version: V1.0
+ */
+@Service
+public class CityConfServiceImpl extends ServiceImpl<CityConfMapper, CityConf> implements ICityConfService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/vue/CityConfList.vue

@@ -0,0 +1,191 @@
+<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('配置列表')">导出</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>
+
+    <city-conf-modal ref="modalForm" @ok="modalFormOk"></city-conf-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityConfModal from './modules/CityConfModal'
+
+  export default {
+    name: 'CityConfList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityConfModal
+    },
+    data () {
+      return {
+        description: '配置列表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'keyName'
+          },
+          {
+            title:'标签',
+            align:"center",
+            dataIndex: 'keyIcon'
+          },
+          {
+            title:'内容',
+            align:"center",
+            dataIndex: 'keyValue'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'keyImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityConf/cityConf/list",
+          delete: "/cityConf/cityConf/delete",
+          deleteBatch: "/cityConf/cityConf/deleteBatch",
+          exportXlsUrl: "/cityConf/cityConf/exportXls",
+          importExcelUrl: "cityConf/cityConf/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'keyName',text:'名称',dictCode:''})
+        fieldList.push({type:'string',value:'keyIcon',text:'标签',dictCode:''})
+        fieldList.push({type:'string',value:'keyValue',text:'内容',dictCode:''})
+        fieldList.push({type:'Text',value:'keyImage',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'keyDetails',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/cityConf/vue/modules/CityConfForm.vue

@@ -0,0 +1,124 @@
+<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="keyName">
+              <a-input v-model="model.keyName" placeholder="请输入名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyIcon">
+              <a-input v-model="model.keyIcon" placeholder="请输入标签"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyValue">
+              <a-input v-model="model.keyValue" placeholder="请输入内容"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyImage">
+              <j-image-upload isMultiple  v-model="model.keyImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="keyDetails">
+              <j-editor v-model="model.keyDetails" />
+            </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: 'CityConfForm',
+    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: "/cityConf/cityConf/add",
+          edit: "/cityConf/cityConf/edit",
+          queryById: "/cityConf/cityConf/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/cityConf/vue/modules/CityConfModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-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 CityConfForm from './CityConfForm'
+
+  export default {
+    name: 'CityConfModal',
+    components: {
+      CityConfForm
+    },
+    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/cityConf/vue/modules/CityConfModal.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="关闭">
+    <city-conf-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-conf-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityConfForm from './CityConfForm'
+  export default {
+    name: 'CityConfModal',
+    components: {
+      CityConfForm
+    },
+    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/cityConf/vue3/CityConf.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityConf/cityConf/list',
+  save='/cityConf/cityConf/add',
+  edit='/cityConf/cityConf/edit',
+  deleteOne = '/cityConf/cityConf/delete',
+  deleteBatch = '/cityConf/cityConf/deleteBatch',
+  importExcel = '/cityConf/cityConf/importExcel',
+  exportXls = '/cityConf/cityConf/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/cityConf/vue3/CityConf.data.ts

@@ -0,0 +1,61 @@
+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: 'keyName'
+   },
+   {
+    title: '标签',
+    align:"center",
+    dataIndex: 'keyIcon'
+   },
+   {
+    title: '内容',
+    align:"center",
+    dataIndex: 'keyValue'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'keyImage',
+    customRender:render.renderAvatar,
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '名称',
+    field: 'keyName',
+    component: 'Input',
+  },
+  {
+    label: '标签',
+    field: 'keyIcon',
+    component: 'Input',
+  },
+  {
+    label: '内容',
+    field: 'keyValue',
+    component: 'Input',
+  },
+  {
+    label: '图片',
+    field: 'keyImage',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '详情',
+    field: 'keyDetails',
+    component: 'JCodeEditor', //TODO String后缀暂未添加
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityConf/vue3/CityConfList.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>
+    <!-- 表单区域 -->
+    <CityConfModal @register="registerModal" @success="handleSuccess"></CityConfModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityConf-cityConf" 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 CityConfModal from './components/CityConfModal.vue'
+  import {columns, searchFormSchema} from './cityConf.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityConf.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '配置列表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"配置列表",
+            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/cityConf/vue3/components/CityConfModal.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 '../cityConf.data';
+    import {saveOrUpdate} from '../cityConf.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-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/controller/CityTrendsController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-25
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Api(tags="动态信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/entity/CityTrends.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-25
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Data
@@ -47,25 +47,31 @@ public class CityTrends implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**所属区域*/
+	@Excel(name = "所属区域", width = 15, dictTable = "city_addr", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "city_addr", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "所属区域")
+    private java.lang.String addId;
 	/**图片*/
 	@Excel(name = "图片", width = 15)
     @ApiModelProperty(value = "图片")
     private java.lang.String image;
+	/**发布昵称*/
+	@Excel(name = "发布昵称", width = 15)
+    @ApiModelProperty(value = "发布昵称")
+    private java.lang.String userName;
 	/**发布人*/
 	@Excel(name = "发布人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "发布人")
     private java.lang.String userId;
-	/**发布昵称*/
-	@Excel(name = "发布昵称", width = 15)
-    @ApiModelProperty(value = "发布昵称")
-    private java.lang.String userName;
 	/**发布人头像*/
 	@Excel(name = "发布人头像", width = 15)
     @ApiModelProperty(value = "发布人头像")
     private java.lang.String userImage;
 	/**审核状态*/
-	@Excel(name = "审核状态", width = 15)
+	@Excel(name = "审核状态", width = 15, dicCode = "open_state")
+	@Dict(dicCode = "open_state")
     @ApiModelProperty(value = "审核状态")
     private java.lang.Integer isState;
 	/**置顶*/
@@ -77,9 +83,9 @@ public class CityTrends implements Serializable {
 	@Dict(dictTable = "citiy_class", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "分类")
     private java.lang.String classId;
-	/**标题*/
-	@Excel(name = "标题", width = 15)
-    @ApiModelProperty(value = "标题")
+	/**帖子内容*/
+	@Excel(name = "帖子内容", width = 15)
+    @ApiModelProperty(value = "帖子内容")
     private java.lang.String title;
 	/**点赞量*/
 	@Excel(name = "点赞量", width = 15)
@@ -97,4 +103,28 @@ public class CityTrends implements Serializable {
 	@Excel(name = "浏览量", width = 15)
     @ApiModelProperty(value = "浏览量")
     private java.lang.Integer isBrowse;
+	/**经度*/
+	@Excel(name = "经度", width = 15)
+    @ApiModelProperty(value = "经度")
+    private java.lang.String longitude;
+	/**纬度*/
+	@Excel(name = "纬度", width = 15)
+    @ApiModelProperty(value = "纬度")
+    private java.lang.String latitude;
+	/**详细地址*/
+	@Excel(name = "详细地址", width = 15)
+    @ApiModelProperty(value = "详细地址")
+    private java.lang.String address;
+	/**性别*/
+	@Excel(name = "性别", width = 15)
+    @ApiModelProperty(value = "性别")
+    private java.lang.String sex;
+	/**多少年*/
+	@Excel(name = "多少年", width = 15)
+    @ApiModelProperty(value = "多少年")
+    private java.lang.Integer yearDate;
+	/**认证方式*/
+	@Excel(name = "认证方式", width = 15)
+    @ApiModelProperty(value = "认证方式")
+    private java.lang.String isContent;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/mapper/CityTrendsMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-25
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface CityTrendsMapper extends BaseMapper<CityTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/ICityTrendsService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-25
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 public interface ICityTrendsService extends IService<CityTrends> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/service/impl/CityTrendsServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 动态信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-25
+ * @Date:   2024-10-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/CityTrendsList.vue

@@ -4,11 +4,23 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="所属区域">
+              <j-search-select-tag placeholder="请选择所属区域" v-model="queryParam.addId" dict="city_addr,name,id"/>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="发布人">
               <j-search-select-tag placeholder="请选择发布人" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
             </a-form-item>
           </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="置顶">
+                <j-switch placeholder="请选择置顶" v-model="queryParam.isTop"  query></j-switch>
+              </a-form-item>
+            </a-col>
+          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -143,6 +155,11 @@
             sorter: true,
             dataIndex: 'createTime'
           },
+          {
+            title:'所属区域',
+            align:"center",
+            dataIndex: 'addId_dictText'
+          },
           {
             title:'图片',
             align:"center",
@@ -150,14 +167,14 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'发布人',
+            title:'发布昵称',
             align:"center",
-            dataIndex: 'userId_dictText'
+            dataIndex: 'userName'
           },
           {
-            title:'发布昵称',
+            title:'发布人',
             align:"center",
-            dataIndex: 'userName'
+            dataIndex: 'userId_dictText'
           },
           {
             title:'发布人头像',
@@ -168,7 +185,7 @@
           {
             title:'审核状态',
             align:"center",
-            dataIndex: 'isState'
+            dataIndex: 'isState_dictText'
           },
           {
             title:'置顶',
@@ -182,7 +199,7 @@
             dataIndex: 'classId_dictText'
           },
           {
-            title:'标题',
+            title:'帖子内容',
             align:"center",
             dataIndex: 'title'
           },
@@ -206,6 +223,36 @@
             align:"center",
             dataIndex: 'isBrowse'
           },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'longitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'latitude'
+          },
+          {
+            title:'详细地址',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'sex'
+          },
+          {
+            title:'多少年',
+            align:"center",
+            dataIndex: 'yearDate'
+          },
+          {
+            title:'认证方式',
+            align:"center",
+            dataIndex: 'isContent'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -242,18 +289,25 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'sel_search',value:'addId',text:'所属区域',dictTable:"city_addr", dictText:'name', dictCode:'id'})
         fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
-        fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'string',value:'userName',text:'发布昵称',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'发布人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
         fieldList.push({type:'Text',value:'userImage',text:'发布人头像',dictCode:''})
-        fieldList.push({type:'int',value:'isState',text:'审核状态',dictCode:''})
+        fieldList.push({type:'int',value:'isState',text:'审核状态',dictCode:'open_state'})
         fieldList.push({type:'switch',value:'isTop',text:'置顶'})
         fieldList.push({type:'sel_search',value:'classId',text:'分类',dictTable:"citiy_class", dictText:'title', dictCode:'id'})
-        fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'Text',value:'title',text:'帖子内容',dictCode:''})
         fieldList.push({type:'int',value:'isUp',text:'点赞量',dictCode:''})
         fieldList.push({type:'int',value:'isDown',text:'踩量',dictCode:''})
         fieldList.push({type:'int',value:'isComment',text:'评论量',dictCode:''})
         fieldList.push({type:'int',value:'isBrowse',text:'浏览量',dictCode:''})
+        fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
+        fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'Text',value:'address',text:'详细地址',dictCode:''})
+        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
+        fieldList.push({type:'int',value:'yearDate',text:'多少年',dictCode:''})
+        fieldList.push({type:'string',value:'isContent',text:'认证方式',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue/modules/CityTrendsForm.vue

@@ -4,13 +4,13 @@
       <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="image">
-              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            <a-form-model-item label="所属区域" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addId">
+              <j-search-select-tag v-model="model.addId" dict="city_addr,name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="发布人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -18,6 +18,11 @@
               <a-input v-model="model.userName" placeholder="请输入发布昵称"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="发布人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="发布人头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userImage">
               <j-image-upload isMultiple  v-model="model.userImage" ></j-image-upload>
@@ -25,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isState">
-              <a-input-number v-model="model.isState" placeholder="请输入审核状态" style="width: 100%" />
+              <j-dict-select-tag type="list" v-model="model.isState" dictCode="open_state" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -39,8 +44,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
-              <a-textarea v-model="model.title" rows="4" placeholder="请输入标题" />
+            <a-form-model-item label="帖子内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-textarea v-model="model.title" rows="4" placeholder="请输入帖子内容" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -63,6 +68,36 @@
               <a-input-number v-model="model.isBrowse" placeholder="请输入浏览量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
+              <a-input v-model="model.longitude" placeholder="请输入经度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
+              <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入详细地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="多少年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearDate">
+              <a-input-number v-model="model.yearDate" placeholder="请输入多少年" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="认证方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isContent">
+              <a-input v-model="model.isContent" placeholder="请输入认证方式"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityTrends/vue3/CityTrends.data.ts

@@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
     sorter: true,
     dataIndex: 'createTime'
    },
+   {
+    title: '所属区域',
+    align:"center",
+    dataIndex: 'addId_dictText'
+   },
    {
     title: '图片',
     align:"center",
@@ -17,14 +22,14 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '发布人',
+    title: '发布昵称',
     align:"center",
-    dataIndex: 'userId_dictText'
+    dataIndex: 'userName'
    },
    {
-    title: '发布昵称',
+    title: '发布人',
     align:"center",
-    dataIndex: 'userName'
+    dataIndex: 'userId_dictText'
    },
    {
     title: '发布人头像',
@@ -35,7 +40,7 @@ export const columns: BasicColumn[] = [
    {
     title: '审核状态',
     align:"center",
-    dataIndex: 'isState'
+    dataIndex: 'isState_dictText'
    },
    {
     title: '置顶',
@@ -51,7 +56,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'classId_dictText'
    },
    {
-    title: '标题',
+    title: '帖子内容',
     align:"center",
     dataIndex: 'title'
    },
@@ -75,10 +80,49 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'isBrowse'
    },
+   {
+    title: '经度',
+    align:"center",
+    dataIndex: 'longitude'
+   },
+   {
+    title: '纬度',
+    align:"center",
+    dataIndex: 'latitude'
+   },
+   {
+    title: '详细地址',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '性别',
+    align:"center",
+    dataIndex: 'sex'
+   },
+   {
+    title: '多少年',
+    align:"center",
+    dataIndex: 'yearDate'
+   },
+   {
+    title: '认证方式',
+    align:"center",
+    dataIndex: 'isContent'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
+      label: "所属区域",
+      field: "addId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"city_addr,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
       label: "发布人",
       field: "userId",
       component: 'JSearchSelect',
@@ -87,9 +131,25 @@ export const searchFormSchema: FormSchema[] = [
       },
       colProps: {span: 6},
  	},
+	{
+      label: "置顶",
+      field: "isTop",
+      component: 'JSwitch',
+      componentProps:{
+       },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '所属区域',
+    field: 'addId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"city_addr,name,id"
+    },
+  },
   {
     label: '图片',
     field: 'image',
@@ -97,6 +157,11 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '发布昵称',
+    field: 'userName',
+    component: 'Input',
+  },
   {
     label: '发布人',
     field: 'userId',
@@ -105,11 +170,6 @@ export const formSchema: FormSchema[] = [
        dict:"han_hai_member,nick_name,id"
     },
   },
-  {
-    label: '发布昵称',
-    field: 'userName',
-    component: 'Input',
-  },
   {
     label: '发布人头像',
     field: 'userImage',
@@ -120,7 +180,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '审核状态',
     field: 'isState',
-    component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"open_state"
+     },
   },
   {
     label: '置顶',
@@ -138,7 +201,7 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '标题',
+    label: '帖子内容',
     field: 'title',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
@@ -162,4 +225,34 @@ export const formSchema: FormSchema[] = [
     field: 'isBrowse',
     component: 'InputNumber',
   },
+  {
+    label: '经度',
+    field: 'longitude',
+    component: 'Input',
+  },
+  {
+    label: '纬度',
+    field: 'latitude',
+    component: 'Input',
+  },
+  {
+    label: '详细地址',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'Input',
+  },
+  {
+    label: '多少年',
+    field: 'yearDate',
+    component: 'InputNumber',
+  },
+  {
+    label: '认证方式',
+    field: 'isContent',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -198,4 +198,12 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "是否分销商", width = 15)
     @ApiModelProperty(value = "是否分销商")
     private java.lang.String isDai;
+	/**出生年*/
+	@Excel(name = "出生年", width = 15)
+    @ApiModelProperty(value = "出生年")
+    private java.lang.Integer yearDate;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private java.lang.String address;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -172,6 +172,16 @@
             align:"center",
             dataIndex: 'sex'
           },
+          {
+            title:'出生年',
+            align:"center",
+            dataIndex: 'yearDate'
+          },
+          {
+            title:'地址',
+            align:"center",
+            dataIndex: 'address'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -216,6 +226,8 @@
         fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''})
         fieldList.push({type:'datetime',value:'vtime',text:'邀请时间'})
         fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
+        fieldList.push({type:'int',value:'yearDate',text:'出生年',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -53,6 +53,16 @@
               <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出生年" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yearDate">
+              <a-input-number v-model="model.yearDate" placeholder="请输入出生年" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -55,6 +55,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'sex'
    },
+   {
+    title: '出生年',
+    align:"center",
+    dataIndex: 'yearDate'
+   },
+   {
+    title: '地址',
+    align:"center",
+    dataIndex: 'address'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -113,4 +123,14 @@ export const formSchema: FormSchema[] = [
     field: 'sex',
     component: 'Input',
   },
+  {
+    label: '出生年',
+    field: 'yearDate',
+    component: 'InputNumber',
+  },
+  {
+    label: '地址',
+    field: 'address',
+    component: 'Input',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java

@@ -38,7 +38,7 @@ public interface YaoDuApiService {
 
 
     //根据分类获取动态帖子列表带分页
-    Result<?> getPostPage(PageBean pageBean);
+    Result<?> getPostPage(String classId,PageBean pageBean);
 
 
     //根据帖子标识获取帖子详情

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.api.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.api.bean.PageBean;
@@ -22,6 +23,8 @@ import org.jeecg.modules.cityAddressLog.service.ICityAddressLogService;
 import org.jeecg.modules.cityBanner.entity.CityBanner;
 import org.jeecg.modules.cityBanner.service.ICityBannerService;
 import org.jeecg.modules.cityComment.service.ICityCommentService;
+import org.jeecg.modules.cityConf.entity.CityConf;
+import org.jeecg.modules.cityConf.service.ICityConfService;
 import org.jeecg.modules.cityHome.entity.CityHome;
 import org.jeecg.modules.cityHome.service.ICityHomeService;
 import org.jeecg.modules.cityIcon.entity.CityIcon;
@@ -101,6 +104,9 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     //用户信息
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    //获取配置信息
+    @Resource
+    private ICityConfService cityConfService;
 
 
     //获取个人信息接口
@@ -125,7 +131,6 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     @Override
     public Result<?> getCityList(){
         List<CityAddr> list = cityService.lambdaQuery()
-                .select(CityAddr::getName)
                 .orderByDesc(CityAddr::getSort)
                 .list();
         return Result.OK(list);
@@ -146,10 +151,16 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     @Override
     public Result<?> getIndexHeaderInfo(){
         Map<String,Object> map=new HashMap<>();
-        map.put("headImage","https://dianpin-img.xzaiyp.top/upload/bg_1728634973432.png");
-        map.put("name","瑶都万能墙");
-        map.put("userNum","16888");
-        map.put("num","1888");
+        CityConf headImage = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "headImage").one();
+        map.put("headImage",headImage.getKeyImage());
+        CityConf name = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "name").one();
+        map.put("name",name.getKeyValue());
+        //获取所有动态
+        Long count = cityTrendsService.lambdaQuery().count();
+        map.put("userNum",count);
+        //获取用户人数
+        Long count1 = hanHaiMemberService.lambdaQuery().count();
+        map.put("num",count1);
         return Result.OK(map);
     }
 
@@ -176,10 +187,21 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
     //根据分类获取动态帖子列表带分页
     @Override
-    public Result<?> getPostPage(PageBean pageBean){
+    public Result<?> getPostPage(String classId,PageBean pageBean){
         Page<CityTrends> page = new Page<CityTrends>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityTrends> page1 = cityTrendsService
+                .lambdaQuery()
+                .orderByDesc(CityTrends::getCreateTime)
                 .page(page);
+
+        if(StringUtils.isNotBlank(classId)){
+            page1 = cityTrendsService
+                    .lambdaQuery()
+                    .eq(CityTrends::getClassId,classId)
+                    .orderByDesc(CityTrends::getCreateTime)
+                    .page(page);
+
+        }
         return Result.OK(page1);
     }
 
@@ -199,6 +221,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     public Result<?> getRentPage(PageBean pageBean){
         Page<CityHome> page = new Page<CityHome>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityHome> page1 = cityHomeService
+                .lambdaQuery()
+                .orderByDesc(CityHome::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -222,6 +246,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     public Result<?> getJobPage(PageBean pageBean){
         Page<CityJob> page = new Page<CityJob>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityJob> page1 = cityJobService
+                .lambdaQuery()
+                .orderByDesc(CityJob::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -245,6 +271,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     public Result<?> getStorePage(PageBean pageBean){
         Page<CityShop> page = new Page<CityShop>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityShop> page1 = cityShopService
+                .lambdaQuery()
+                .orderByDesc(CityShop::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -262,6 +290,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     public Result<?> getActivityPage(PageBean pageBean){
         Page<CityActivity> page = new Page<CityActivity>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityActivity> page1 = cityActivityService
+                .lambdaQuery()
+                .orderByDesc(CityActivity::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -326,6 +356,9 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         cityTrends.setUserName(hanHaiMember.getNickName());
         cityTrends.setUserImage(hanHaiMember.getHeadImage());
         cityTrends.setCreateTime(new Date());
+        cityTrends.setSex(hanHaiMember.getSex());
+        cityTrends.setYearDate(hanHaiMember.getYearDate());
+
 
         boolean save = cityTrendsService.save(cityTrends);
         return Result.OK("发布成功");
@@ -342,13 +375,21 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     //个人认证
     @Override
     public Result<?> personalAuthentication(String token, CitiyUserAuthentication object){
-        return Result.OK();
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        object.setUserId(hanHaiMember.getId());
+        object.setCreateTime(new Date());
+        cityUserAuthenticationService.save(object);
+        return Result.OK("认证成功");
     }
 
     //企业认证
     @Override
     public Result<?> companyAuthentication(String token, CitiyShopAuthentication object){
-        return Result.OK();
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        object.setUserId(hanHaiMember.getId());
+        object.setCreateTime(new Date());
+        cityShopAuthenticationService.save(object);
+        return Result.OK("认证成功");
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiController.java

@@ -66,8 +66,8 @@ public class YaoDuApiController {
     //根据分类获取动态帖子列表带分页
     @ApiOperation(value="根据分类获取动态帖子列表带分页")
     @GetMapping(value = "/getPostPage")
-    public Result<?> getPostPage(PageBean pageBean) {
-        return yaoDuApiService.getPostPage(pageBean);
+    public Result<?> getPostPage(String classId,PageBean pageBean) {
+        return yaoDuApiService.getPostPage(classId,pageBean);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.service.YaoDuApiService;
+import org.jeecg.modules.citiyShopAuthentication.entity.CitiyShopAuthentication;
 import org.jeecg.modules.citiyUserAuthentication.entity.CitiyUserAuthentication;
 import org.jeecg.modules.cityTrends.entity.CityTrends;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -79,8 +80,15 @@ public class YaoDuApiTokenController {
     //个人认证
     @PostMapping(value = "/personalAuthentication")
     @ApiOperation(value="个人认证")
-    public Result<?> personalAuthentication(@RequestHeader("X-Access-Token") String token, CitiyUserAuthentication citiyUserAuthentication) {
-        return yaoDuApiService.personalAuthentication(token,citiyUserAuthentication);
+    public Result<?> personalAuthentication(@RequestHeader("X-Access-Token") String token, CitiyUserAuthentication object) {
+        return yaoDuApiService.personalAuthentication(token,object);
+    }
+
+    //店铺认证
+    @PostMapping(value = "/companyAuthentication")
+    @ApiOperation(value="店铺认证")
+    public Result<?> companyAuthentication(@RequestHeader("X-Access-Token") String token, CitiyShopAuthentication object) {
+        return yaoDuApiService.companyAuthentication(token,object);
     }