修改获取小二账号以及绑定站点功能

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/controller/OkkiAccountApiController.java

@@ -1,42 +0,0 @@
-package org.jeecg.modules.okki.account.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpHeaders;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.okki.account.param.OkkiAccountParam;
-import org.jeecg.modules.okki.account.service.IOkkiAccountService;
-import org.jeecg.modules.okki.account.entity.OkkiAccount;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@RestController
-@Slf4j
-@RequestMapping("/website")
-public class OkkiAccountApiController {
-
-    @Resource
-    private IOkkiAccountService okkiAccountService;
-
-    @PostMapping(value = "/xiaoerAccount/store")
-    public Result<String> add(@RequestBody OkkiAccountParam okkiAccountParam, @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization) {
-        log.info("请求参数 param" + okkiAccountParam.toString() + "authorization" + authorization);
-        String Authorization = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlYW4iLCJleHAiOjE3MTQ0NjU5Njl9.QdCBYR8mioXcKGi1n5RdMQ5RbJHCSGbE8dkdwYuOXh4";
-        if (!authorization.equals(Authorization)) {
-            return Result.error("sign 验证不通过");
-        }
-        OkkiAccount okkiAccount = new OkkiAccount();
-        okkiAccount.setAccount(okkiAccountParam.getAccount());
-        okkiAccount.setPassword(okkiAccountParam.getPassword());
-        okkiAccount.setSiteId(okkiAccountParam.getSite_id());
-        okkiAccount.setCompanyName(okkiAccountParam.getCompany_name());
-        okkiAccount.setTcName(okkiAccountParam.getTc_name());
-        boolean result = okkiAccountService.insertAccount(okkiAccount);
-        log.info("请求成功，返回结果" + result);
-        if (result) {
-            return Result.OK("添加成功！");
-        }else {
-            return Result.error("添加失败！");
-        }
-    }
-}

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/controller/OkkiAccountController.java

@@ -11,8 +11,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.okki.account.service.IOkkiAccountService;
 import org.jeecg.modules.okki.account.entity.OkkiAccount;
+import org.jeecg.modules.okki.account.service.IOkkiAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -24,7 +24,7 @@ import java.util.Arrays;
  /**
  * @Description: 小二账号
  * @Author: jeecg-boot
- * @Date:   2024-05-10
+ * @Date:   2024-05-22
  * @Version: V1.0
  */
 @Api(tags="小二账号")
@@ -68,7 +68,7 @@ public class OkkiAccountController extends JeecgController<OkkiAccount, IOkkiAcc
 	@RequiresPermissions("account:okki_account:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody OkkiAccount okkiAccount) {
-		okkiAccountService.save(okkiAccount);
+		okkiAccountService.insertAccount(okkiAccount);
 		return Result.OK("添加成功！");
 	}
 	
@@ -83,7 +83,7 @@ public class OkkiAccountController extends JeecgController<OkkiAccount, IOkkiAcc
 	@RequiresPermissions("account:okki_account:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody OkkiAccount okkiAccount) {
-		okkiAccountService.updateById(okkiAccount);
+		okkiAccountService.updateAccount(okkiAccount);
 		return Result.OK("编辑成功!");
 	}
 	

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/entity/OkkiAccount.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -18,7 +19,7 @@ import java.util.Date;
 /**
  * @Description: 小二账号
  * @Author: jeecg-boot
- * @Date:   2024-05-10
+ * @Date:   2024-05-22
  * @Version: V1.0
  */
 @Data
@@ -39,26 +40,28 @@ public class OkkiAccount implements Serializable {
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private String updateBy;
-	/**站点ID*/
-	@Excel(name = "站点ID", width = 15)
-    @ApiModelProperty(value = "站点ID")
-    private Integer siteId;
-	/**账号*/
-	@Excel(name = "账号", width = 15)
-    @ApiModelProperty(value = "账号")
+	/**邮箱*/
+	@Excel(name = "邮箱", width = 15)
+    @ApiModelProperty(value = "邮箱")
     private String account;
 	/**密码*/
 	@Excel(name = "密码", width = 15)
     @ApiModelProperty(value = "密码")
     private String password;
-	/**公司名称*/
-	@Excel(name = "公司名称", width = 15)
-    @ApiModelProperty(value = "公司名称")
-    private String companyName;
-	/**套餐名称*/
-	@Excel(name = "套餐名称", width = 15)
-    @ApiModelProperty(value = "套餐名称")
-    private String tcName;
+	/**小二账号id*/
+	@Excel(name = "小二账号id", width = 15)
+    @ApiModelProperty(value = "小二账号id")
+    private Integer userId;
+	/**关联站点*/
+	@Excel(name = "关联站点", width = 15, dictTable = "okki_site", dicText = "company_name", dicCode = "site_id")
+	@Dict(dictTable = "okki_site", dicText = "company_name", dicCode = "site_id")
+    @ApiModelProperty(value = "关联站点")
+    private String siteIds;
+	/**状态*/
+	@Excel(name = "状态", width = 15, dicCode = "account_status")
+	@Dict(dicCode = "account_status")
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/mapper/OkkiAccountMapper.java

@@ -6,7 +6,7 @@ import org.jeecg.modules.okki.account.entity.OkkiAccount;
 /**
  * @Description: 小二账号
  * @Author: jeecg-boot
- * @Date:   2024-05-10
+ * @Date:   2024-05-22
  * @Version: V1.0
  */
 public interface OkkiAccountMapper extends BaseMapper<OkkiAccount> {

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/service/IOkkiAccountService.java

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 小二账号
  * @Author: jeecg-boot
- * @Date:   2024-05-10
+ * @Date:   2024-05-22
  * @Version: V1.0
  */
 public interface IOkkiAccountService extends IService<OkkiAccount> {
 
-    boolean insertAccount(OkkiAccount okkiAccount);
+    void insertAccount(OkkiAccount okkiAccount);
+
+    void updateAccount(OkkiAccount okkiAccount);
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/service/impl/OkkiAccountServiceImpl.java

@@ -1,23 +1,118 @@
 package org.jeecg.modules.okki.account.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.okki.account.service.IOkkiAccountService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.okki.account.entity.OkkiAccount;
 import org.jeecg.modules.okki.account.mapper.OkkiAccountMapper;
+import org.jeecg.modules.okki.account.service.IOkkiAccountService;
+import org.jeecg.modules.okki.utils.HttpClientUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @Description: 小二账号
  * @Author: jeecg-boot
- * @Date:   2024-05-10
+ * @Date:   2024-05-22
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiAccount> implements IOkkiAccountService {
 
+    @Value("${OKKI.BASE_URL_V1}")
+    private String URL;
+
+    @Value("${OKKI.CLIENT_SECRET}")
+    private String CLIENT_SECRET;
+    @Override
+    public void insertAccount(OkkiAccount okkiAccount) {
+        //创建小二账号
+        // 请求okki平台接口
+        Map<String, String> query = new TreeMap<>();
+        query.put("sign_method", "hmac-md5");
+        query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        query.put("site_id", "sp_weichi");
+        query.put("method", "dumpUser");
+        Map<String, Object> postData = new HashMap<>();
+        try {
+            String queryStr = HttpClientUtils.buildQueryString(query);
+            postData.put("email", okkiAccount.getAccount());
+            postData.put("pwd", okkiAccount.getPassword());
+
+            String body = HttpClientUtils.toJsonString(postData);
+            String signStr = queryStr + body;
+            query.put("signature", HttpClientUtils.generateHmacMD5(signStr, CLIENT_SECRET));
+            String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
+            log.info("url:" + okkiUrl + ",body:" + body);
+            String res = HttpClientUtils.doPost(okkiUrl, body);
+            log.info(res);
+            // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
+            JSONObject jsonObject= JSONObject.parseObject(res);
+            if (jsonObject.get("code").equals(0)) {
+                Object data = jsonObject.get("data");
+                JSONObject jsonObject1 = JSONObject.parseObject(data.toString());
+                Integer userId = (Integer) jsonObject1.get("user_id");
+                Integer userStatus = (Integer) jsonObject1.get("user_status");
+                okkiAccount.setUserId(userId);
+                okkiAccount.setStatus(userStatus);
+                //关联站点
+                if (!okkiAccount.getSiteIds().equals("")) {
+                    bindSites(okkiAccount);
+                }
+            }else {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
-    public boolean insertAccount(OkkiAccount okkiAccount) {
-        return super.save(okkiAccount);
+    public void updateAccount(OkkiAccount okkiAccount) {
+        // 密码重置
+
+        // 站点关联
+    }
+
+    private void bindSites(OkkiAccount okkiAccount) {
+        // 请求okki平台接口
+        Map<String, String> query = new TreeMap<>();
+        query.put("sign_method", "hmac-md5");
+        query.put("timestamp", String.valueOf(System.currentTimeMillis()));
+        query.put("site_id", "sp_weichi");
+        query.put("method", "bindSite");
+        Map<String, Object> postData = new HashMap<>();
+        try {
+            String queryStr = HttpClientUtils.buildQueryString(query);
+            postData.put("user_id", okkiAccount.getUserId());
+            // 字符串转数组
+            String siteIds = okkiAccount.getSiteIds();
+            String[] split = siteIds.split(",");
+            postData.put("site_ids", split);
+            postData.put("type", "update");
+
+            String body = HttpClientUtils.toJsonString(postData);
+            String signStr = queryStr + body;
+            query.put("signature", HttpClientUtils.generateHmacMD5(signStr, CLIENT_SECRET));
+            String okkiUrl = URL + "?" + HttpClientUtils.buildQueryString(query);
+            log.info("url:" + okkiUrl + ",body:" + body);
+            String res = HttpClientUtils.doPost(okkiUrl, body);
+            log.info(res);
+            // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
+            JSONObject jsonObject= JSONObject.parseObject(res);
+            if (jsonObject.get("code").equals(0)) {
+                this.save(okkiAccount);
+            }else {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/entity/OkkiSite.java

@@ -17,7 +17,7 @@ import java.util.Date;
 /**
  * @Description: 站点
  * @Author: jeecg-boot
- * @Date:   2024-04-29
+ * @Date:   2024-05-23
  * @Version: V1.0
  */
 @Data
@@ -105,6 +105,10 @@ public class OkkiSite implements Serializable {
     @Excel(name = "状态", width = 15, dicCode = "site_status")
     @Dict(dicCode = "site_status")
     @ApiModelProperty(value = "状态")
-    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
-    private Integer status = 0;
+    private Integer status;
+    /**数据授权用户*/
+    @Excel(name = "数据授权用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @ApiModelProperty(value = "数据授权用户")
+    private java.lang.String userIds;
 }

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/site/service/impl/OkkiSiteServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.modules.okki.site.mapper.OkkiSiteMapper;
 import org.jeecg.modules.okki.site.entity.OkkiSite;
 import org.jeecg.modules.okki.site.entity.OkkiSiteStatusChangeLog;
+import org.jeecg.modules.okki.site.mapper.OkkiSiteMapper;
 import org.jeecg.modules.okki.site.param.ChangeSiteStatusParam;
 import org.jeecg.modules.okki.site.service.IOkkiSiteService;
 import org.jeecg.modules.okki.site.service.IOkkiSiteStatusChangeLogService;

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -324,6 +324,7 @@ OKKI:
   # 小满测试环境
   BASE_URL: https://cms.dev.xiaoman.cn/shop-api/External/site
   CLIENT_SECRET : rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ
+  BASE_URL_V1 : https://cms.dev.xiaoman.cn/shop-api/External/sitev1
   # 小满生产环境
 #  BASE_URL: https://cms.xiaoman.cn/shop-api/External/site
 #  CLIENT_SECRET: G8v7vplPP9cm7vgUFXqZJOB4TVjoomIy

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -77,7 +77,7 @@ spring:
           jobStore:
             class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: qrtz_
+            tablePrefix: QRTZ_
             isClustered: true
             misfireThreshold: 12000
             clusterCheckinInterval: 15000
@@ -309,4 +309,5 @@ justauth:
     timeout: 1h
 OKKI:
   BASE_URL: https://cms.xiaoman.cn/shop-api/External/site
-  CLIENT_SECRET : G8v7vplPP9cm7vgUFXqZJOB4TVjoomIy
+  CLIENT_SECRET : G8v7vplPP9cm7vgUFXqZJOB4TVjoomIy
+  BASE_URL_V1 : https://cms.xiaoman.cn/shop-api/External/sitev1

jeecgboot-vue3/src/views/okki/account/OkkiAccount.data.ts

@@ -5,12 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
    {
-    title: '站点ID',
-    align:"center",
-    dataIndex: 'siteId'
-   },
-   {
-    title: '账号',
+    title: '邮箱',
     align:"center",
     dataIndex: 'account'
    },
@@ -20,14 +15,24 @@ export const columns: BasicColumn[] = [
     dataIndex: 'password'
    },
    {
-    title: '公司名称',
+    title: '小二账号id',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '关联站点',
     align:"center",
-    dataIndex: 'companyName'
+    dataIndex: 'siteIds_dictText'
    },
    {
-    title: '套餐名称',
+    title: '状态',
     align:"center",
-    dataIndex: 'tcName'
+    dataIndex: 'status_dictText'
+   },
+   {
+    title: '创建日期',
+    align:"center",
+    dataIndex: 'createTime'
    },
 ];
 //查询数据
@@ -36,12 +41,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '站点ID',
-    field: 'siteId',
-    component: 'InputNumber',
-  },
-  {
-    label: '账号',
+    label: '邮箱',
     field: 'account',
     component: 'Input',
   },
@@ -51,31 +51,11 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '公司名称',
-    field: 'companyName',
-    component: 'Input',
-  },
-  {
-    label: '套餐名称',
-    field: 'tcName',
-    component: 'Input',
-  },
-  {
-    label: '创建日期',
-    field: 'createTime',
-    component: 'DatePicker',
-    componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
-     },
-  },
-  {
-    label: '更新日期',
-    field: 'updateTime',
-    component: 'DatePicker',
-    componentProps: {
-       showTime: true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
+    label: '关联站点',
+    field: 'siteIds',
+    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"okki_site,company_name,site_id"
      },
   },
 	// TODO 主键隐藏字段，目前写死为ID
@@ -89,11 +69,12 @@ export const formSchema: FormSchema[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
-  siteId: {title: '站点ID',order: 0,view: 'number', type: 'number',},
-  account: {title: '账号',order: 1,view: 'text', type: 'string',},
-  password: {title: '密码',order: 2,view: 'text', type: 'string',},
-  companyName: {title: '公司名称',order: 3,view: 'text', type: 'string',},
-  tcName: {title: '套餐名称',order: 4,view: 'text', type: 'string',},
+  account: {title: '邮箱',order: 0,view: 'text', type: 'string',},
+  password: {title: '密码',order: 1,view: 'text', type: 'string',},
+  userId: {title: '小二账号id',order: 2,view: 'number', type: 'number',},
+  siteIds: {title: '关联站点',order: 3,view: 'list_multi', type: 'string',dictTable: "okki_site", dictCode: 'site_id', dictText: 'company_name',},
+  status: {title: '状态',order: 4,view: 'number', type: 'number',},
+  createTime: {title: '创建日期',order: 5,view: 'datetime', type: 'string',},
 };
 
 /**

jeecgboot-vue3/src/views/okki/account/V20240510_1__menu_insert_OkkiAccount.sql → jeecgboot-vue3/src/views/okki/account/V20240522_1__menu_insert_OkkiAccount.sql

@@ -3,24 +3,24 @@
 
 
 INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
-VALUES ('2024051010005030330', NULL, '小二账号', '/account/okkiAccountList', 'account/OkkiAccountList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0);
+VALUES ('2024052203578560400', NULL, '小二账号', '/account/okkiAccountList', 'account/OkkiAccountList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0);
 
 -- 权限控制sql
 -- 新增
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030331', '2024051010005030330', '添加小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560401', '2024052203578560400', '添加小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);
 -- 编辑
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030332', '2024051010005030330', '编辑小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560402', '2024052203578560400', '编辑小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);
 -- 删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030333', '2024051010005030330', '删除小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560403', '2024052203578560400', '删除小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);
 -- 批量删除
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030334', '2024051010005030330', '批量删除小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560404', '2024052203578560400', '批量删除小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);
 -- 导出excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030335', '2024051010005030330', '导出excel_小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560405', '2024052203578560400', '导出excel_小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);
 -- 导入excel
 INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('2024051010005030336', '2024051010005030330', '导入excel_小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-10 10:00:33', NULL, NULL, 0, 0, '1', 0);
+VALUES ('2024052203578560406', '2024052203578560400', '导入excel_小二账号', NULL, NULL, 0, NULL, NULL, 2, 'account:okki_account:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-22 15:57:40', NULL, NULL, 0, 0, '1', 0);

jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts

@@ -64,6 +64,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'status_dictText'
    },
+   {
+    title: '数据授权用户',
+    align:"center",
+    dataIndex: 'userIds_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -133,6 +138,14 @@ export const formSchema: FormSchema[] = [
         dictCode:"site_status"
      },
   },
+  {
+    label: '数据授权用户',
+    field: 'userIds',
+    component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"sys_user,realname,id"
+     },
+  },
 	// TODO 主键隐藏字段，目前写死为ID
 	{
 	  label: '',
@@ -156,6 +169,7 @@ export const superQuerySchema = {
   tcLanguage: {title: '站点选择的⼩语种语⾔',order: 9,view: 'text', type: 'string',},
   remark: {title: '备注',order: 10,view: 'textarea', type: 'string',},
   status: {title: '状态',order: 11,view: 'number', type: 'number',},
+  userIds: {title: '数据授权用户',order: 12,view: 'list_multi', type: 'string',dictTable: "sys_user", dictCode: 'id', dictText: 'realname',},
 };
 
 /**

jeecgboot-vue3/src/views/okki/site/OkkiSiteList.vue

@@ -154,7 +154,7 @@
   function getTableAction(record){
        return [
          {
-           label: '编辑',
+           label: '授权',
            onClick: handleEdit.bind(null, record),
          }
        ]