Browse Source

Google Ads账号功能完善联调测试通过

Jack 10 months ago
parent
commit
4c134abf3b
15 changed files with 905 additions and 26 deletions
  1. 19 26
      .idea/workspace.xml
  2. 37 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountApiController.java
  3. 162 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountController.java
  4. 77 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/entity/OkkiGoogleAdsAccount.java
  5. 14 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/OkkiGoogleAdsAccountMapper.java
  6. 5 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/xml/OkkiGoogleAdsAccountMapper.xml
  7. 21 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/param/OkkiGoogleAdsAccountParam.java
  8. 16 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/IOkkiGoogleAdsAccountService.java
  9. 54 0
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/impl/OkkiGoogleAdsAccountServiceImpl.java
  10. 64 0
      jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.api.ts
  11. 88 0
      jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.data.ts
  12. 186 0
      jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccountList.vue
  13. 26 0
      jeecgboot-vue3/src/views/okki/google/V20240517_1__menu_insert_OkkiGoogleAdsAccount.sql
  14. 70 0
      jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountForm.vue
  15. 66 0
      jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountModal.vue

+ 19 - 26
.idea/workspace.xml

@@ -5,29 +5,21 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="网站质量检查结果功能完善联调测试通过">
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/controller/OkkiLinkedinMarketingDataController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/entity/OkkiLinkedinMarketingData.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/entity/OkkiLinkedinMarketingDataDetail.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/mapper/OkkiLinkedinMarketingDataDetailMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/mapper/OkkiLinkedinMarketingDataMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/mapper/xml/OkkiLinkedinMarketingDataDetailMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/mapper/xml/OkkiLinkedinMarketingDataMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/param/LinkedinMarketingDataParam.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/param/LinkedinReportListParam.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/service/IOkkiLinkedinMarketingDataDetailService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/service/IOkkiLinkedinMarketingDataService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/service/impl/OkkiLinkedinMarketingDataDetailServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/service/impl/OkkiLinkedinMarketingDataServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin/vo/OkkiLinkedinMarketingDataPage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/OkkiLinkedinMarketingData.api.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/OkkiLinkedinMarketingData.data.ts" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/OkkiLinkedinMarketingDataList.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/V20240516_1__menu_insert_OkkiLinkedinMarketingData.sql" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/components/OkkiLinkedinMarketingDataForm.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/linkedin/components/OkkiLinkedinMarketingDataModal.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountApiController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/entity/OkkiGoogleAdsAccount.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/OkkiGoogleAdsAccountMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/xml/OkkiGoogleAdsAccountMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/param/OkkiGoogleAdsAccountParam.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/IOkkiGoogleAdsAccountService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/impl/OkkiGoogleAdsAccountServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.api.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.data.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccountList.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/V20240517_1__menu_insert_OkkiGoogleAdsAccount.sql" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountForm.vue" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountModal.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/showlist/service/impl/OkkiShowlistServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -92,7 +84,7 @@
     "Spring Boot.JeecgSystemApplication.executor": "Debug",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/linkedin",
+    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/entity",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.stylelint": "true",
     "node.js.detected.package.tslint": "true",
@@ -118,11 +110,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\google\entity" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\google" />
+      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\google" />
       <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\linkedin" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\linkedin" />
-      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\youtube" />
-      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\youtube" />
-      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\okki\websitequality" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="org.jeecg.modules.okki.websitequality.param" />
@@ -186,6 +178,7 @@
       <workItem from="1715333910993" duration="2376000" />
       <workItem from="1715391022847" duration="21115000" />
       <workItem from="1715648405916" duration="53955000" />
+      <workItem from="1715907931997" duration="3509000" />
     </task>
     <task id="LOCAL-00001" summary="增加添加站点对外接口">
       <option name="closed" value="true" />

+ 37 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountApiController.java

@@ -0,0 +1,37 @@
+package org.jeecg.modules.okki.google.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpHeaders;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.okki.google.param.OkkiGoogleAdsAccountParam;
+import org.jeecg.modules.okki.google.service.IOkkiGoogleAdsAccountService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Slf4j
+@RequestMapping("/website")
+public class OkkiGoogleAdsAccountApiController {
+
+    @Resource
+    private IOkkiGoogleAdsAccountService okkiGoogleAdsAccountService;
+    /**
+     *   小满推送数据
+     *
+     * @param okkiGoogleAdsAccountParam
+     * @return
+     */
+    @AutoLog(value = "Google Ads账号-小满推送数据")
+    @PostMapping(value = "/googleAdsAccount")
+    public Result<String> add(@RequestBody OkkiGoogleAdsAccountParam okkiGoogleAdsAccountParam, @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization) {
+        log.info("请求参数 param" + okkiGoogleAdsAccountParam.toString() + "authorization" + authorization);
+        String Authorization = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImRlYW4iLCJleHAiOjE3MTQ0NjU5Njl9.QdCBYR8mioXcKGi1n5RdMQ5RbJHCSGbE8dkdwYuOXh4";
+        if (!authorization.equals(Authorization)) {
+            return Result.error("sign 验证不通过");
+        }
+        okkiGoogleAdsAccountService.okkiSave(okkiGoogleAdsAccountParam);
+        return Result.OK("添加成功!");
+    }
+}

+ 162 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/controller/OkkiGoogleAdsAccountController.java

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

+ 77 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/entity/OkkiGoogleAdsAccount.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.okki.google.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: Google Ads账号管理
+ * @Author: jeecg-boot
+ * @Date:   2024-05-17
+ * @Version: V1.0
+ */
+@Data
+@TableName("okki_google_ads_account")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="okki_google_ads_account对象", description="Google Ads账号管理")
+public class OkkiGoogleAdsAccount implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**站点id*/
+	@Excel(name = "站点id", width = 15)
+    @ApiModelProperty(value = "站点id")
+    private String siteId;
+	/**google广告账号id */
+	@Excel(name = "google广告账号id ", width = 15)
+    @ApiModelProperty(value = "google广告账号id ")
+    private String cid;
+	/**业务金额(人民币)*/
+	@Excel(name = "业务金额(人民币)", width = 15)
+    @ApiModelProperty(value = "业务金额(人民币)")
+    private BigDecimal amount;
+	/**google广告账号*/
+	@Excel(name = "google广告账号", width = 15)
+    @ApiModelProperty(value = "google广告账号")
+    private String googleAccount;
+	/** 1--新签 2--续充 */
+	@Excel(name = " 1--新签 2--续充 ", width = 15)
+    @ApiModelProperty(value = " 1--新签 2--续充 ")
+    private Integer type;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+}

+ 14 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/OkkiGoogleAdsAccountMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.okki.google.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.okki.google.entity.OkkiGoogleAdsAccount;
+
+/**
+ * @Description: Google Ads账号管理
+ * @Author: jeecg-boot
+ * @Date:   2024-05-17
+ * @Version: V1.0
+ */
+public interface OkkiGoogleAdsAccountMapper extends BaseMapper<OkkiGoogleAdsAccount> {
+
+}

+ 5 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/mapper/xml/OkkiGoogleAdsAccountMapper.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.okki.google.mapper.OkkiGoogleAdsAccountMapper">
+
+</mapper>

+ 21 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/param/OkkiGoogleAdsAccountParam.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.okki.google.param;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OkkiGoogleAdsAccountParam {
+
+    private String site_id;
+
+    private String cid;
+
+    private BigDecimal amount;
+
+    private String google_account;
+
+    private Integer type;
+
+    private String company_name;
+}

+ 16 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/IOkkiGoogleAdsAccountService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.okki.google.service;
+
+import org.jeecg.modules.okki.google.entity.OkkiGoogleAdsAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.okki.google.param.OkkiGoogleAdsAccountParam;
+
+/**
+ * @Description: Google Ads账号管理
+ * @Author: jeecg-boot
+ * @Date:   2024-05-17
+ * @Version: V1.0
+ */
+public interface IOkkiGoogleAdsAccountService extends IService<OkkiGoogleAdsAccount> {
+
+    void okkiSave(OkkiGoogleAdsAccountParam okkiGoogleAdsAccountParam);
+}

+ 54 - 0
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/okki/google/service/impl/OkkiGoogleAdsAccountServiceImpl.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.okki.google.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.okki.google.entity.OkkiGoogleAdsAccount;
+import org.jeecg.modules.okki.google.mapper.OkkiGoogleAdsAccountMapper;
+import org.jeecg.modules.okki.google.param.OkkiGoogleAdsAccountParam;
+import org.jeecg.modules.okki.google.service.IOkkiGoogleAdsAccountService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description: Google Ads账号管理
+ * @Author: jeecg-boot
+ * @Date:   2024-05-17
+ * @Version: V1.0
+ */
+@Service
+public class OkkiGoogleAdsAccountServiceImpl extends ServiceImpl<OkkiGoogleAdsAccountMapper, OkkiGoogleAdsAccount> implements IOkkiGoogleAdsAccountService {
+
+    @Resource
+    private OkkiGoogleAdsAccountMapper okkiGoogleAdsAccountMapper;
+
+    @Override
+    public void okkiSave(OkkiGoogleAdsAccountParam okkiGoogleAdsAccountParam){
+        LambdaUpdateWrapper<OkkiGoogleAdsAccount> okkiGoogleAdsAccountLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        okkiGoogleAdsAccountLambdaUpdateWrapper.eq(OkkiGoogleAdsAccount::getCid, okkiGoogleAdsAccountParam.getCid())
+                        .last("limit 1");
+        try {
+            OkkiGoogleAdsAccount okkiGoogleAdsAccount = okkiGoogleAdsAccountMapper.selectOne(okkiGoogleAdsAccountLambdaUpdateWrapper);
+            if (okkiGoogleAdsAccount == null) {
+                okkiGoogleAdsAccount = new OkkiGoogleAdsAccount();
+                okkiGoogleAdsAccount.setSiteId(okkiGoogleAdsAccountParam.getSite_id());
+                okkiGoogleAdsAccount.setCid(okkiGoogleAdsAccountParam.getCid());
+                okkiGoogleAdsAccount.setAmount(okkiGoogleAdsAccountParam.getAmount());
+                okkiGoogleAdsAccount.setGoogleAccount(okkiGoogleAdsAccountParam.getGoogle_account());
+                okkiGoogleAdsAccount.setType(okkiGoogleAdsAccountParam.getType());
+                okkiGoogleAdsAccount.setCompanyName(okkiGoogleAdsAccountParam.getCompany_name());
+                okkiGoogleAdsAccountMapper.insert(okkiGoogleAdsAccount);
+            }else {
+                okkiGoogleAdsAccount.setSiteId(okkiGoogleAdsAccountParam.getSite_id());
+                okkiGoogleAdsAccount.setAmount(okkiGoogleAdsAccountParam.getAmount());
+                okkiGoogleAdsAccount.setGoogleAccount(okkiGoogleAdsAccountParam.getGoogle_account());
+                okkiGoogleAdsAccount.setType(okkiGoogleAdsAccountParam.getType());
+                okkiGoogleAdsAccount.setCompanyName(okkiGoogleAdsAccountParam.getCompany_name());
+                okkiGoogleAdsAccountMapper.updateById(okkiGoogleAdsAccount);
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+}

+ 64 - 0
jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.api.ts

@@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/google/okkiGoogleAdsAccount/list',
+  save='/google/okkiGoogleAdsAccount/add',
+  edit='/google/okkiGoogleAdsAccount/edit',
+  deleteOne = '/google/okkiGoogleAdsAccount/delete',
+  deleteBatch = '/google/okkiGoogleAdsAccount/deleteBatch',
+  importExcel = '/google/okkiGoogleAdsAccount/importExcel',
+  exportXls = '/google/okkiGoogleAdsAccount/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) => {
+  createConfirm({
+    iconType: 'warning',
+    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});
+}

+ 88 - 0
jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccount.data.ts

@@ -0,0 +1,88 @@
+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: '站点id',
+    align:"center",
+    dataIndex: 'siteId'
+   },
+   {
+    title: '业务金额(人民币)',
+    align:"center",
+    dataIndex: 'amount'
+   },
+   {
+    title: 'google广告账号',
+    align:"center",
+    dataIndex: 'googleAccount'
+   },
+   {
+    title: ' 1--新签 2--续充 ',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '公司名称',
+    align:"center",
+    dataIndex: 'companyName'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '站点id',
+    field: 'siteId',
+    component: 'Input',
+  },
+  {
+    label: '业务金额(人民币)',
+    field: 'amount',
+    component: 'InputNumber',
+  },
+  {
+    label: 'google广告账号',
+    field: 'googleAccount',
+    component: 'Input',
+  },
+  {
+    label: ' 1--新签 2--续充 ',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '公司名称',
+    field: 'companyName',
+    component: 'Input',
+  },
+	// TODO 主键隐藏字段,目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  siteId: {title: '站点id',order: 0,view: 'text', type: 'string',},
+  amount: {title: '业务金额(人民币)',order: 1,view: 'number', type: 'number',},
+  googleAccount: {title: 'google广告账号',order: 2,view: 'text', type: 'string',},
+  type: {title: ' 1--新签 2--续充 ',order: 3,view: 'number', type: 'number',},
+  companyName: {title: '公司名称',order: 4,view: 'text', type: 'string',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
+  return formSchema;
+}

+ 186 - 0
jeecgboot-vue3/src/views/okki/google/OkkiGoogleAdsAccountList.vue

@@ -0,0 +1,186 @@
+<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="selectedRowKeys.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>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <OkkiGoogleAdsAccountModal @register="registerModal" @success="handleSuccess"></OkkiGoogleAdsAccountModal>
+  </div>
+</template>
+
+<script lang="ts" name="google-okkiGoogleAdsAccount" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import OkkiGoogleAdsAccountModal from './components/OkkiGoogleAdsAccountModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './OkkiGoogleAdsAccount.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './OkkiGoogleAdsAccount.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'Google Ads账号管理',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"Google Ads账号管理",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  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}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && 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),
+             placement: 'topLeft',
+           }
+         }
+       ]
+   }
+
+
+</script>
+
+<style scoped>
+
+</style>

+ 26 - 0
jeecgboot-vue3/src/views/okki/google/V20240517_1__menu_insert_OkkiGoogleAdsAccount.sql

@@ -0,0 +1,26 @@
+-- 注意:该页面对应的前台目录为views/google文件夹下
+-- 如果你想更改到其他目录,请修改sql中component字段对应的值
+
+
+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 ('202405170919390410', NULL, 'Google Ads账号管理', '/google/okkiGoogleAdsAccountList', 'google/OkkiGoogleAdsAccountList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390411', '202405170919390410', '添加Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390412', '202405170919390410', '编辑Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390413', '202405170919390410', '删除Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390414', '202405170919390410', '批量删除Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390415', '202405170919390410', '导出excel_Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', 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 ('202405170919390416', '202405170919390410', '导入excel_Google Ads账号管理', NULL, NULL, 0, NULL, NULL, 2, 'google:okki_google_ads_account:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-05-17 09:19:41', NULL, NULL, 0, 0, '1', 0);

+ 70 - 0
jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountForm.vue

@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../OkkiGoogleAdsAccount.data';
+    import {saveOrUpdate} from '../OkkiGoogleAdsAccount.api';
+    
+    export default defineComponent({
+        name: "OkkiGoogleAdsAccountForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/google/okkiGoogleAdsAccount/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>

+ 66 - 0
jeecgboot-vue3/src/views/okki/google/components/OkkiGoogleAdsAccountModal.vue

@@ -0,0 +1,66 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @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 '../OkkiGoogleAdsAccount.data';
+    import {saveOrUpdate} from '../OkkiGoogleAdsAccount.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        //labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    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>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number){
+		width: 100%
+	}
+
+	:deep(.ant-calendar-picker){
+		width: 100%
+	}
+</style>