小二账号添加名称字段

小二账号添加授权功能
小二账号添加修改密码功能
小二账号添加绑定站点功能

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

@@ -12,6 +12,7 @@ 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.entity.OkkiAccount;
+import org.jeecg.modules.okki.account.param.OkkiAccountResetPwdParam;
 import org.jeecg.modules.okki.account.service.IOkkiAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -159,4 +160,48 @@ public class OkkiAccountController extends JeecgController<OkkiAccount, IOkkiAcc
         return super.importExcel(request, response, OkkiAccount.class);
     }
 
+	 /**
+	  *  授权
+	  *
+	  * @param okkiAccount
+	  * @return
+	  */
+	 @AutoLog(value = "小二账号-授权")
+	 @ApiOperation(value="小二账号-授权", notes="小二账号-授权")
+	 @RequiresPermissions("account:okki_account:edit")
+	 @RequestMapping(value = "/resetRole", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> resetRole(@RequestBody OkkiAccount okkiAccount) {
+		 okkiAccountService.resetRole(okkiAccount);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *  绑定站点
+	  *
+	  * @param okkiAccount
+	  * @return
+	  */
+	 @AutoLog(value = "小二账号-绑定站点")
+	 @ApiOperation(value="小二账号-绑定站点", notes="小二账号-绑定站点")
+	 @RequiresPermissions("account:okki_account:edit")
+	 @RequestMapping(value = "/bindSite", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> bindSite(@RequestBody OkkiAccount okkiAccount) {
+		 okkiAccountService.bindSites(okkiAccount);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *  重置密码
+	  *
+	  * @param okkiAccount
+	  * @return
+	  */
+	 @AutoLog(value = "小二账号-绑定站点")
+	 @ApiOperation(value="小二账号-重置密码", notes="小二账号-重置密码")
+	 @RequiresPermissions("account:okki_account:edit")
+	 @RequestMapping(value = "/resetPwd", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> resetPwd(@RequestBody OkkiAccountResetPwdParam okkiAccountResetPwdParam) {
+		 okkiAccountService.resetPwd(okkiAccountResetPwdParam);
+		 return Result.OK("编辑成功!");
+	 }
 }

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

@@ -67,6 +67,11 @@ public class OkkiAccount implements Serializable {
     @Dict(dictTable = "okki_site", dicText = "company_name", dicCode = "site_id")
     @ApiModelProperty(value = "关联站点")
     private java.lang.String siteIds;
+    /**用户角色*/
+    @Excel(name = "用户角色", width = 15, dicCode = "user_role")
+    @Dict(dicCode = "user_role")
+    @ApiModelProperty(value = "用户角色")
+    private java.lang.Integer userRole;
     /**所属人员*/
     @Excel(name = "所属人员", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/param/OkkiAccountParam.java → jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/account/param/OkkiAccountResetPwdParam.java

@@ -11,17 +11,13 @@ import java.io.Serializable;
  * @Version: V1.0
  */
 @Data
-public class OkkiAccountParam implements Serializable {
+public class OkkiAccountResetPwdParam implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**站点ID*/
-    private Integer site_id;
-	/**账号*/
-    private String account;
-	/**密码*/
-    private String password;
-	/**公司名称*/
-    private String company_name;
-	/**套餐名称*/
-    private String tc_name;
+    private String id;
+	/**旧密码*/
+    private String oldPassword;
+	/**新密码*/
+    private String newPassword;
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.okki.account.service;
 
 import org.jeecg.modules.okki.account.entity.OkkiAccount;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.okki.account.param.OkkiAccountResetPwdParam;
 
 /**
  * @Description: 小二账号
@@ -14,4 +15,10 @@ public interface IOkkiAccountService extends IService<OkkiAccount> {
     void insertAccount(OkkiAccount okkiAccount);
 
     void updateAccount(OkkiAccount okkiAccount);
+
+    void resetRole(OkkiAccount okkiAccount);
+
+    void bindSites(OkkiAccount okkiAccount);
+
+    void resetPwd(OkkiAccountResetPwdParam okkiAccountResetPwdParam);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.param.OkkiAccountResetPwdParam;
 import org.jeecg.modules.okki.account.service.IOkkiAccountService;
 import org.jeecg.modules.okki.utils.HttpClientUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -49,6 +50,7 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
             String queryStr = HttpClientUtils.buildQueryString(query);
             postData.put("email", okkiAccount.getAccount());
             postData.put("pwd", okkiAccount.getPassword());
+            postData.put("user_role", okkiAccount.getUserRole());
 
             String body = HttpClientUtils.toJsonString(postData);
             String signStr = queryStr + body;
@@ -66,11 +68,10 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
                 Integer userStatus = (Integer) jsonObject1.get("user_status");
                 okkiAccount.setUserId(userId);
                 okkiAccount.setStatus(userStatus);
+                this.save(okkiAccount);
                 //关联站点
                 if (!okkiAccount.getSiteIds().equals("")) {
                     bindSites(okkiAccount);
-                }else {
-                    this.save(okkiAccount);
                 }
             }else {
                 throw new RuntimeException(jsonObject.get("msg").toString());
@@ -81,23 +82,26 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
     }
 
     @Override
-    public void updateAccount(OkkiAccount okkiAccount) {
-        // 站点关联
+    public void updateAccount(OkkiAccount okkiAccountParam) {
+        final OkkiAccount okkiAccount = this.getById(okkiAccountParam.getId());
+        okkiAccount.setUserId(okkiAccountParam.getUserId());
+        this.updateById(okkiAccount);
+    }
+
+    @Override
+    public void resetRole(OkkiAccount okkiAccountParam) {
         // 请求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");
+        query.put("method", "resetRole");
         Map<String, Object> postData = new HashMap<>();
         try {
             String queryStr = HttpClientUtils.buildQueryString(query);
-            postData.put("user_id", this.getById(okkiAccount.getId()).getUserId());
-            // 字符串转数组
-            String siteIds = okkiAccount.getSiteIds();
-            String[] split = siteIds.split(",");
-            postData.put("site_ids", split);
-            postData.put("type", "update");
+            final OkkiAccount okkiAccount = this.getById(okkiAccountParam.getId());
+            postData.put("user_id", okkiAccount.getUserId());
+            postData.put("user_role", okkiAccountParam.getUserRole());
 
             String body = HttpClientUtils.toJsonString(postData);
             String signStr = queryStr + body;
@@ -109,6 +113,7 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
             // {"code":0,"msg":"success","now":"2024-05-06 15:34:54","data":[]}
             JSONObject jsonObject= JSONObject.parseObject(res);
             if (jsonObject.get("code").equals(0)) {
+                okkiAccount.setUserRole(okkiAccountParam.getUserRole());
                 this.updateById(okkiAccount);
             }else {
                 throw new RuntimeException(jsonObject.get("msg").toString());
@@ -118,7 +123,8 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
         }
     }
 
-    private void bindSites(OkkiAccount okkiAccount) {
+    @Override
+    public void bindSites(OkkiAccount okkiAccountParam) {
         // 请求okki平台接口
         Map<String, String> query = new TreeMap<>();
         query.put("sign_method", "hmac-md5");
@@ -128,9 +134,10 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
         Map<String, Object> postData = new HashMap<>();
         try {
             String queryStr = HttpClientUtils.buildQueryString(query);
+            final OkkiAccount okkiAccount = this.getById(okkiAccountParam.getId());
             postData.put("user_id", okkiAccount.getUserId());
             // 字符串转数组
-            String siteIds = okkiAccount.getSiteIds();
+            String siteIds = okkiAccountParam.getSiteIds();
             String[] split = siteIds.split(",");
             postData.put("site_ids", split);
             postData.put("type", "update");
@@ -142,10 +149,45 @@ public class OkkiAccountServiceImpl extends ServiceImpl<OkkiAccountMapper, OkkiA
             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);
+                okkiAccount.setSiteIds(siteIds);
+                this.updateById(okkiAccount);
+            }else {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void resetPwd(OkkiAccountResetPwdParam okkiAccountResetPwdParam) {
+        // 请求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", "resetPwd");
+        Map<String, Object> postData = new HashMap<>();
+        try {
+            String queryStr = HttpClientUtils.buildQueryString(query);
+            final OkkiAccount okkiAccount = this.getById(okkiAccountResetPwdParam.getId());
+            postData.put("user_id", okkiAccount.getUserId());
+            postData.put("old_pwd", okkiAccountResetPwdParam.getOldPassword());
+            postData.put("pwd", okkiAccountResetPwdParam.getNewPassword());
+
+            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);
+            JSONObject jsonObject= JSONObject.parseObject(res);
+            if (jsonObject.get("code").equals(0)) {
+                okkiAccount.setPassword(okkiAccountResetPwdParam.getNewPassword());
+                this.updateById(okkiAccount);
             }else {
                 throw new RuntimeException(jsonObject.get("msg").toString());
             }

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

@@ -7,6 +7,9 @@ enum Api {
   list = '/account/okkiAccount/list',
   save='/account/okkiAccount/add',
   edit='/account/okkiAccount/edit',
+  resetRole='/account/okkiAccount/resetRole',
+  bindSite='/account/okkiAccount/bindSite',
+  resetPwd='/account/okkiAccount/resetPwd',
   deleteOne = '/account/okkiAccount/delete',
   deleteBatch = '/account/okkiAccount/deleteBatch',
   importExcel = '/account/okkiAccount/importExcel',
@@ -70,3 +73,18 @@ export const saveOrUpdate = (params, isUpdate) => {
   let url = isUpdate ? Api.edit : Api.save;
   return defHttp.post({ url: url, params }, { isTransformResponse: false });
 }
+
+export const resetRole = (params) => {
+  let url =  Api.resetRole;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+export const bindSite = (params) => {
+  let url =  Api.bindSite;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
+
+export const resetPwd = (params) => {
+  let url =  Api.resetPwd;
+  return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}

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

@@ -5,6 +5,11 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
   {
+    title: '名称',
+    align: "center",
+    dataIndex: 'name'
+  },
+  {
     title: '邮箱账号',
     align: "center",
     dataIndex: 'account'
@@ -25,6 +30,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'siteIds_dictText'
   },
   {
+    title: '用户角色',
+    align:"center",
+    dataIndex: 'userRole_dictText'
+  },
+  {
     title: '所属人员',
     align: "center",
     dataIndex: 'sysUserCode_dictText'
@@ -43,14 +53,29 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
+    label: '名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
     label: '邮箱账号',
     field: 'account',
     component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请输入邮箱账号!'},
+      ];
+    },
   },
   {
     label: '密码',
     field: 'password',
     component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请输入密码!'},
+      ];
+    },
   },
   {
     label: '关联站点',
@@ -61,6 +86,19 @@ export const formSchema: FormSchema[] = [
      },
   },
   {
+    label: '用户角色',
+    field: 'userRole',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode:"user_role"
+    },
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: true, message: '请选择用户角色!'},
+      ];
+    },
+  },
+  {
     label: '所属人员',
     field: 'sysUserCode',
     component: 'JSelectUser',
@@ -79,10 +117,12 @@ export const formSchema: FormSchema[] = [
 
 // 高级查询数据
 export const superQuerySchema = {
+  name: {title: '名称',order: 0,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: 'checkbox', type: 'string',dictTable: "okki_site", dictCode: 'site_id', dictText: 'company_name',},
+  userRole: {title: '用户角色',order: 7,view: 'number', type: 'number',},
   sysUserCode: {title: '所属人员',order: 4,view: 'sel_user', type: 'string',},
   status: {title: '状态',order: 5,view: 'number', type: 'number',},
 };

jeecgboot-vue3/src/views/okki/account/OkkiAccountList.vue

@@ -39,6 +39,9 @@
     </BasicTable>
     <!-- 表单区域 -->
     <OkkiAccountModal ref="registerModal" @success="handleSuccess"></OkkiAccountModal>
+    <OkkiAccountAuthModal ref="registerAuthModal" @success="handleSuccess"></OkkiAccountAuthModal>
+    <OkkiAccountBindSiteModal ref="registerBindSiteModal" @success="handleSuccess"></OkkiAccountBindSiteModal>
+    <OkkiAccountResetPwdModal ref="registerResetPwdModal" @success="handleSuccess"></OkkiAccountResetPwdModal>
   </div>
 </template>
 
@@ -48,15 +51,19 @@
   import { useListPage } from '/@/hooks/system/useListPage';
   import { columns, superQuerySchema } from './OkkiAccount.data';
   import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './OkkiAccount.api';
-  import { downloadFile } from '/@/utils/common/renderUtils';
   import OkkiAccountModal from './components/OkkiAccountModal.vue'
+  import OkkiAccountAuthModal from './components/OkkiAccountAuthModal.vue'
+  import OkkiAccountBindSiteModal from './components/OkkiAccountBindSiteModal.vue'
+  import OkkiAccountResetPwdModal from './components/OkkiAccountResetPwdModal.vue'
   import { useUserStore } from '/@/store/modules/user';
-  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
 
   const formRef = ref();
   const queryParam = reactive<any>({});
   const toggleSearchStatus = ref<boolean>(false);
   const registerModal = ref();
+  const registerAuthModal = ref();
+  const registerBindSiteModal = ref();
+  const registerResetPwdModal = ref();
   const userStore = useUserStore();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
@@ -124,7 +131,31 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
+  /**
+   * 授权事件
+   */
+  function handleAuth(record: Recordable) {
+    registerAuthModal.value.disableSubmit = false;
+    registerAuthModal.value.edit(record);
+  }
+
+  /**
+   * 绑定站点事件
+   */
+  function handleBindSite(record: Recordable) {
+    registerBindSiteModal.value.disableSubmit = false;
+    registerBindSiteModal.value.edit(record);
+  }
+
+  /**
+   * 重置密码事件
+   */
+  function handleResetPwd(record: Recordable) {
+    registerResetPwdModal.value.disableSubmit = false;
+    registerResetPwdModal.value.edit(record);
+  }
+
   /**
    * 详情
    */
@@ -160,7 +191,7 @@
   function getTableAction(record) {
     return [
       {
-        label: '编辑',
+        label: '分配账号',
         onClick: handleEdit.bind(null, record),
       },
     ];
@@ -174,7 +205,20 @@
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
+      },
+      {
+        label: '授权角色',
+        onClick: handleAuth.bind(null, record),
+      },
+      {
+        label: '关联站点',
+        onClick: handleBindSite.bind(null, record),
+      },
+      {
+        label: '修改密码',
+        onClick: handleResetPwd.bind(null, record),
+      },
+      {
         label: '删除',
         popConfirm: {
           title: '是否确认删除',

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountAuthForm.vue

@@ -0,0 +1,133 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="用户角色" v-bind="validateInfos.userRole">
+            <j-dict-select-tag type='radio' v-model:value="formData.userRole" dictCode="user_role" placeholder="请选择用户角色" :disabled="disabled"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import {resetRole} from '../OkkiAccount.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    account: '',   
+    password: '',   
+    siteIds: '',   
+    sysUserCode: '',
+    userRole: undefined,
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    userRole: [{ required: true, message: '请选择用户角色!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    //时间格式化
+    let model = formData;
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await resetRole(model)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    height: 500px !important;
+    overflow-y: auto;
+    padding: 14px;
+  }
+</style>

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountAuthModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <OkkiAccountAuthForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></OkkiAccountAuthForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import OkkiAccountAuthForm from './OkkiAccountAuthForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountBindSiteForm.vue

@@ -0,0 +1,133 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="关联站点" v-bind="validateInfos.siteIds">
+            <j-vxe-site-select-cell v-model:value="formData.siteIds"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JVxeSiteSelectCell from '/@/components/JVxeCustom/site/JVxeSiteSelectCell.vue';
+  import { getValueType } from '/@/utils';
+  import {bindSite, saveOrUpdate} from '../OkkiAccount.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    account: '',   
+    password: '',   
+    siteIds: '',   
+    sysUserCode: '',
+    userRole: undefined,
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    userRole: [{ required: true, message: '请选择用户角色!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    //时间格式化
+    let model = formData;
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await bindSite(model)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    height: 500px !important;
+    overflow-y: auto;
+    padding: 14px;
+  }
+</style>

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountBindSiteModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <OkkiAccountBindSiteForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></OkkiAccountBindSiteForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import OkkiAccountBindSiteForm from './OkkiAccountBindSiteForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountForm.vue

@@ -3,6 +3,11 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24">
+          <a-form-item label="名称" v-bind="validateInfos.name">
+            <a-input v-model:value="formData.name" placeholder="请输入名称" :disabled="disabled"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
           <a-form-item label="邮箱账号" v-bind="validateInfos.account">
             <a-input v-model:value="formData.account" placeholder="请输入邮箱账号" :disabled="(disabled||formData.id>0)?true:false"></a-input>
           </a-form-item>
@@ -14,8 +19,12 @@
         </a-col>
         <a-col :span="24">
           <a-form-item label="关联站点" v-bind="validateInfos.siteIds">
-            <j-vxe-site-select-cell v-model:value="formData.siteIds" :disabled="disabled" />
-<!--	          <j-checkbox type="checkbox" v-model:value="formData.siteIds" dictCode="okki_site,company_name,site_id" placeholder="请选择关联站点" :disabled="disabled"/>-->
+            <j-vxe-site-select-cell v-model:value="formData.siteIds" :disabled="(disabled||formData.id>0)?true:false"/>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="用户角色" v-bind="validateInfos.userRole">
+            <j-dict-select-tag type='radio' v-model:value="formData.userRole" dictCode="user_role" placeholder="请选择用户角色" :disabled="(disabled||formData.id>0)?true:false"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
@@ -30,11 +39,10 @@
 
 <script lang="ts" setup>
   import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
-  import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JVxeSiteSelectCell from '/@/components/JVxeCustom/site/JVxeSiteSelectCell.vue';
-  // import JCheckbox from "/@/components/Form/src/jeecg/components/JCheckbox.vue";
   import { getValueType } from '/@/utils';
   import { saveOrUpdate } from '../OkkiAccount.api';
   import { Form } from 'ant-design-vue';
@@ -52,7 +60,8 @@
     account: '',   
     password: '',   
     siteIds: '',   
-    sysUserCode: '',   
+    sysUserCode: '',
+    userRole: undefined,
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -60,6 +69,9 @@
   const confirmLoading = ref<boolean>(false);
   //表单验证
   const validatorRules = {
+    account: [{ required: true, message: '请输入邮箱账号!'},],
+    password: [{ required: true, message: '请输入密码!'},],
+    userRole: [{ required: true, message: '请选择用户角色!'},],
   };
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountResetPwdForm.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-row>
+        <a-col :span="24">
+          <a-form-item label="邮箱账号" v-bind="validateInfos.account">
+            <a-input v-model:value="formData.account" placeholder="请输入邮箱账号" :disabled=true></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="旧密码" v-bind="validateInfos.oldPassword">
+            <a-input v-model:value="formData.oldPassword" placeholder="请输入旧密码" ></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="新密码" v-bind="validateInfos.newPassword">
+            <a-input v-model:value="formData.newPassword" placeholder="请输入新密码" ></a-input>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getValueType } from '/@/utils';
+  import {resetPwd} from '../OkkiAccount.api';
+  import { Form } from 'ant-design-vue';
+  
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: ()=>{} },
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    account: '',   
+    oldPassword: '',
+    newPassword: ''
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = {
+    oldPassword: [{ required: true, message: '请输入旧密码!'},],
+    newPassword: [{ required: true, message: '请输入新密码!'},],
+  };
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    // 触发表单验证
+    await validate();
+    confirmLoading.value = true;
+    //时间格式化
+    let model = formData;
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await resetPwd(model)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    height: 500px !important;
+    overflow-y: auto;
+    padding: 14px;
+  }
+</style>

jeecgboot-vue3/src/views/okki/account/components/OkkiAccountResetPwdModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <OkkiAccountResetPwdForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></OkkiAccountResetPwdForm>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import OkkiAccountResetPwdForm from './OkkiAccountResetPwdForm.vue'
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style>
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>