Ver Fonte

修改包名称

yumeng há 4 anos atrás
pai
commit
b2bac06449
13 ficheiros alterados com 321 adições e 61 exclusões
  1. 25 25
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/controller/ThirtConfigAdvertiserController.java
  2. 132 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/controller/ThirdConfigController.java
  3. 57 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/entity/ThirdConfig.java
  4. 57 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/entity/ThirdConfigAdvertiser.java
  5. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/ThirtConfigAdvertiserMapper.java
  6. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/ThirtConfigMapper.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/xml/ThirtConfigAdvertiserMapper.xml
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/xml/ThirtConfigMapper.xml
  9. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/IThirtConfigAdvertiserService.java
  10. 14 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/server/IThirdConfigService.java
  11. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/impl/ThirtConfigAdvertiserServiceImpl.java
  12. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/server/impl/ThirdConfigServiceImpl.java
  13. 0 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/impl/ThirtConfigServiceImpl.java

+ 25 - 25
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/controller/ThirtConfigAdvertiserController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.thirt.controller;
+package org.jeecg.modules.third.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import com.alibaba.fastjson.JSON;
@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.thirt.entity.ThirtConfigAdvertiser;
-import org.jeecg.modules.thirt.server.IThirtConfigAdvertiserService;
+import org.jeecg.modules.third.entity.ThirdConfigAdvertiser;
+import org.jeecg.modules.third.server.IThirdConfigAdvertiserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -44,9 +44,9 @@ import java.util.Map;
 @Api(tags = "对外配置关联广告主")
 @RestController
 @RequestMapping("/n/thirtConfigAdvertiser")
-public class ThirtConfigAdvertiserController {
+public class ThirdConfigAdvertiserController {
     @Autowired
-    private IThirtConfigAdvertiserService thirtConfigAdvertiserService;
+    private IThirdConfigAdvertiserService thirtConfigAdvertiserService;
 
     /**
      * 分页列表查询
@@ -60,14 +60,14 @@ public class ThirtConfigAdvertiserController {
     @AutoLog(value = "对外配置关联广告主-分页列表查询")
     @ApiOperation(value = "对外配置关联广告主-分页列表查询", notes = "对外配置关联广告主-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ThirtConfigAdvertiser>> queryPageList(ThirtConfigAdvertiser thirtConfigAdvertiser,
+    public Result<IPage<ThirdConfigAdvertiser>> queryPageList(ThirdConfigAdvertiser thirtConfigAdvertiser,
                                                               @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                               HttpServletRequest req) {
-        Result<IPage<ThirtConfigAdvertiser>> result = new Result<>();
-        QueryWrapper<ThirtConfigAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(thirtConfigAdvertiser, req.getParameterMap());
-        Page<ThirtConfigAdvertiser> page = new Page<ThirtConfigAdvertiser>(pageNo, pageSize);
-        IPage<ThirtConfigAdvertiser> pageList = thirtConfigAdvertiserService.page(page, queryWrapper);
+        Result<IPage<ThirdConfigAdvertiser>> result = new Result<>();
+        QueryWrapper<ThirdConfigAdvertiser> queryWrapper = QueryGenerator.initQueryWrapper(thirtConfigAdvertiser, req.getParameterMap());
+        Page<ThirdConfigAdvertiser> page = new Page<ThirdConfigAdvertiser>(pageNo, pageSize);
+        IPage<ThirdConfigAdvertiser> pageList = thirtConfigAdvertiserService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;
@@ -82,8 +82,8 @@ public class ThirtConfigAdvertiserController {
     @AutoLog(value = "对外配置关联广告主-添加")
     @ApiOperation(value = "对外配置关联广告主-添加", notes = "对外配置关联广告主-添加")
     @PostMapping(value = "/add")
-    public Result<ThirtConfigAdvertiser> add(@RequestBody ThirtConfigAdvertiser thirtConfigAdvertiser) {
-        Result<ThirtConfigAdvertiser> result = new Result<>();
+    public Result<ThirdConfigAdvertiser> add(@RequestBody ThirdConfigAdvertiser thirtConfigAdvertiser) {
+        Result<ThirdConfigAdvertiser> result = new Result<>();
         try {
             thirtConfigAdvertiserService.save(thirtConfigAdvertiser);
             result.success("添加成功!");
@@ -103,9 +103,9 @@ public class ThirtConfigAdvertiserController {
     @AutoLog(value = "对外配置关联广告主-编辑")
     @ApiOperation(value = "对外配置关联广告主-编辑", notes = "对外配置关联广告主-编辑")
     @PutMapping(value = "/edit")
-    public Result<ThirtConfigAdvertiser> edit(@RequestBody ThirtConfigAdvertiser thirtConfigAdvertiser) {
-        Result<ThirtConfigAdvertiser> result = new Result<ThirtConfigAdvertiser>();
-        ThirtConfigAdvertiser thirtConfigAdvertiserEntity = thirtConfigAdvertiserService.getById(thirtConfigAdvertiser.getId());
+    public Result<ThirdConfigAdvertiser> edit(@RequestBody ThirdConfigAdvertiser thirtConfigAdvertiser) {
+        Result<ThirdConfigAdvertiser> result = new Result<ThirdConfigAdvertiser>();
+        ThirdConfigAdvertiser thirtConfigAdvertiserEntity = thirtConfigAdvertiserService.getById(thirtConfigAdvertiser.getId());
         if (thirtConfigAdvertiserEntity == null) {
             result.error500("未找到对应实体");
         } else {
@@ -146,8 +146,8 @@ public class ThirtConfigAdvertiserController {
     @AutoLog(value = "对外配置关联广告主-批量删除")
     @ApiOperation(value = "对外配置关联广告主-批量删除", notes = "对外配置关联广告主-批量删除")
     @DeleteMapping(value = "/deleteBatch")
-    public Result<ThirtConfigAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<ThirtConfigAdvertiser> result = new Result<>();
+    public Result<ThirdConfigAdvertiser> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ThirdConfigAdvertiser> result = new Result<>();
         if (ids == null || "".equals(ids.trim())) {
             result.error500("参数不识别!");
         } else {
@@ -166,9 +166,9 @@ public class ThirtConfigAdvertiserController {
     @AutoLog(value = "对外配置关联广告主-通过id查询")
     @ApiOperation(value = "对外配置关联广告主-通过id查询", notes = "对外配置关联广告主-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<ThirtConfigAdvertiser> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<ThirtConfigAdvertiser> result = new Result<>();
-        ThirtConfigAdvertiser thirtConfigAdvertiser = thirtConfigAdvertiserService.getById(id);
+    public Result<ThirdConfigAdvertiser> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ThirdConfigAdvertiser> result = new Result<>();
+        ThirdConfigAdvertiser thirtConfigAdvertiser = thirtConfigAdvertiserService.getById(id);
         if (thirtConfigAdvertiser == null) {
             result.error500("未找到对应实体");
         } else {
@@ -187,12 +187,12 @@ public class ThirtConfigAdvertiserController {
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
         // Step.1 组装查询条件
-        QueryWrapper<ThirtConfigAdvertiser> queryWrapper = null;
+        QueryWrapper<ThirdConfigAdvertiser> queryWrapper = null;
         try {
             String paramsStr = request.getParameter("paramsStr");
             if (oConvertUtils.isNotEmpty(paramsStr)) {
                 String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ThirtConfigAdvertiser thirtConfigAdvertiser = JSON.parseObject(deString, ThirtConfigAdvertiser.class);
+                ThirdConfigAdvertiser thirtConfigAdvertiser = JSON.parseObject(deString, ThirdConfigAdvertiser.class);
                 queryWrapper = QueryGenerator.initQueryWrapper(thirtConfigAdvertiser, request.getParameterMap());
             }
         } catch (UnsupportedEncodingException e) {
@@ -201,10 +201,10 @@ public class ThirtConfigAdvertiserController {
 
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<ThirtConfigAdvertiser> pageList = thirtConfigAdvertiserService.list(queryWrapper);
+        List<ThirdConfigAdvertiser> pageList = thirtConfigAdvertiserService.list(queryWrapper);
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "对外配置关联广告主列表");
-        mv.addObject(NormalExcelConstants.CLASS, ThirtConfigAdvertiser.class);
+        mv.addObject(NormalExcelConstants.CLASS, ThirdConfigAdvertiser.class);
         mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("对外配置关联广告主列表数据", "导出人:Jeecg", "导出信息"));
         mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
         return mv;
@@ -228,7 +228,7 @@ public class ThirtConfigAdvertiserController {
             params.setHeadRows(1);
             params.setNeedSave(true);
             try {
-                List<ThirtConfigAdvertiser> listThirtConfigAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ThirtConfigAdvertiser.class, params);
+                List<ThirdConfigAdvertiser> listThirtConfigAdvertisers = ExcelImportUtil.importExcel(file.getInputStream(), ThirdConfigAdvertiser.class, params);
                 thirtConfigAdvertiserService.saveBatch(listThirtConfigAdvertisers);
                 return Result.ok("文件导入成功!数据行数:" + listThirtConfigAdvertisers.size());
             } catch (Exception e) {

+ 132 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/controller/ThirdConfigController.java

@@ -0,0 +1,132 @@
+package org.jeecg.modules.third.controller;
+
+import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.third.entity.ThirdConfig;
+import org.jeecg.modules.third.entity.ThirdConfigAdvertiser;
+import org.jeecg.modules.third.server.IThirdConfigAdvertiserService;
+import org.jeecg.modules.third.server.IThirdConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 对外配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-08-14
+ */
+@Slf4j
+@Api(tags = "对外配置")
+@RestController
+@RequestMapping("/third")
+public class ThirdConfigController {
+    @Autowired
+    private IThirdConfigService thirtConfigService;
+    @Autowired
+    private IThirdConfigAdvertiserService thirtConfigAdvertiserService;
+
+    @PostMapping(value = "/getAdvertiserList")
+    public Result<List<String>> getAdvertiserList(@RequestBody JSONObject requestJson) {
+
+        Result<List<String>> result = new Result<>();
+        try {
+            Long appId = requestJson.getLong("appId");
+            if (Check.isNull(appId)) {
+                throw new Exception("必传参数appId不能为空");
+            }
+            QueryWrapper<ThirdConfig> thirtConfigQueryWrapper = new QueryWrapper<>();
+            thirtConfigQueryWrapper.eq("app_id", appId);
+            ThirdConfig config = thirtConfigService.getOne(thirtConfigQueryWrapper);
+            if (Check.isNull(config)) {
+                throw new Exception("appId不正确");
+            }
+            String secret = requestJson.getString("secret");
+            if (Check.isNull(secret)) {
+                throw new Exception("secret不能为空");
+            }
+            if (!secret.equals(config.getSecret())) {
+                throw new Exception("secret不正确");
+            }
+
+            List<String> advertiserList = thirtConfigAdvertiserService.getAdvertiserListByAppId(appId);
+            result.setResult(advertiserList);
+
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+            result.setCode(-1);
+
+        }
+        return result;
+    }
+
+
+    @PostMapping(value = "/getAdvertiserCost")
+    public Result<List<JSONObject>> getAdvertiserCost(@RequestBody JSONObject requestJson) {
+        Result<List<JSONObject>> result = new Result<>();
+        try {
+
+            Long appId = requestJson.getLong("appId");
+            if (Check.isNull(appId)) {
+                throw new Exception("必传参数appId不能为空");
+            }
+            QueryWrapper<ThirdConfig> thirtConfigQueryWrapper = new QueryWrapper<>();
+            thirtConfigQueryWrapper.eq("app_id", appId);
+            ThirdConfig config = thirtConfigService.getOne(thirtConfigQueryWrapper);
+            if (Check.isNull(config)) {
+                throw new Exception("appId不正确");
+            }
+            String secret = requestJson.getString("secret");
+            if (Check.isNull(secret)) {
+                throw new Exception("secret不能为空");
+            }
+            if (!secret.equals(config.getSecret())) {
+                throw new Exception("secret不正确");
+            }
+
+            String advertiserName = requestJson.getString("advertiserName");
+            if (Check.isNull(advertiserName)) {
+                throw new Exception("请输入需要查询广告主名称");
+            }
+
+            QueryWrapper<ThirdConfigAdvertiser> thirtConfigAdvertiserQueryWrapper = new QueryWrapper<>();
+            thirtConfigAdvertiserQueryWrapper.eq("app_id", appId);
+            thirtConfigAdvertiserQueryWrapper.eq("advertiser_name", advertiserName);
+            thirtConfigAdvertiserQueryWrapper.last("limit 1");
+            ThirdConfigAdvertiser configAdvertiser = thirtConfigAdvertiserService.getOne(thirtConfigAdvertiserQueryWrapper);
+            if (Check.isNull(configAdvertiser)) {
+                throw new Exception("此appId下暂无此广告主信息");
+
+            }
+            String startDate = requestJson.getString("startDate");
+            if (Check.isNull(startDate)) {
+                throw new Exception("请输入查询开始时间");
+            }
+
+            String endDate = requestJson.getString("endDate");
+            if (Check.isNull(endDate)) {
+                throw new Exception("请输入查询结束时间");
+            }
+
+
+            List<JSONObject> costList = thirtConfigAdvertiserService.getAdvertiserCost(appId, advertiserName, startDate, endDate);
+            result.setResult(costList);
+        } catch (Exception e) {
+            result.setCode(-1);
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+        return result;
+    }
+
+}

+ 57 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/entity/ThirdConfig.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.third.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 java.util.Date;
+
+/**
+ * 对外配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-08-14
+ */
+@Data
+@TableName("ctop_thirt_config")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_thirt_config对象", description = "对外配置")
+public class ThirdConfig {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * appId
+     */
+    @Excel(name = "appId", width = 15)
+    @ApiModelProperty(value = "appId")
+    private Long appId;
+    /**
+     * secret
+     */
+    @Excel(name = "secret", width = 15)
+    @ApiModelProperty(value = "secret")
+    private String secret;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * update
+     */
+    @ApiModelProperty(value = "update")
+    private Date updateTime;
+}

+ 57 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/entity/ThirdConfigAdvertiser.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.third.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 java.util.Date;
+
+/**
+ * 对外配置关联广告主
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-08-14
+ */
+@Data
+@TableName("ctop_thirt_config_advertiser")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_thirt_config_advertiser对象", description = "对外配置关联广告主")
+public class ThirdConfigAdvertiser {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * appId
+     */
+    @Excel(name = "appId", width = 15)
+    @ApiModelProperty(value = "appId")
+    private Integer appId;
+    /**
+     * advertsierName
+     */
+    @Excel(name = "advertsierName", width = 15)
+    @ApiModelProperty(value = "advertiserName")
+    private String advertiserName;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * update
+     */
+    @ApiModelProperty(value = "update")
+    private Date updateTime;
+}

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/ThirtConfigAdvertiserMapper.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.thirt.mapper;
+package org.jeecg.modules.third.mapper;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.thirt.entity.ThirtConfigAdvertiser;
+import org.jeecg.modules.third.entity.ThirdConfigAdvertiser;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @date: 2020-08-14
  * @cersion: V1.0
  */
-public interface ThirtConfigAdvertiserMapper extends BaseMapper<ThirtConfigAdvertiser> {
+public interface ThirdConfigAdvertiserMapper extends BaseMapper<ThirdConfigAdvertiser> {
 
     List<JSONObject> getAdvertiserCost(@Param("appId") Long appId, @Param("advertiserName") String advertiserName, @Param("startDate") String startDate, @Param("endDate") String endDate);
 

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/ThirtConfigMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.thirt.mapper;
+package org.jeecg.modules.third.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.thirt.entity.ThirtConfig;
+import org.jeecg.modules.third.entity.ThirdConfig;
 
 /**
  * 对外配置
@@ -10,6 +10,6 @@ import org.jeecg.modules.thirt.entity.ThirtConfig;
  * @date: 2020-08-14
  * @cersion: V1.0
  */
-public interface ThirtConfigMapper extends BaseMapper<ThirtConfig> {
+public interface ThirdConfigMapper extends BaseMapper<ThirdConfig> {
 
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/xml/ThirtConfigAdvertiserMapper.xml

@@ -1,6 +1,6 @@
 <?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.thirt.mapper.ThirtConfigAdvertiserMapper">
+<mapper namespace="org.jeecg.modules.third.mapper.ThirdConfigAdvertiserMapper">
 
     <select id="getAdvertiserListByAppId" resultType="java.lang.String">
      select advertiser_name

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/mapper/xml/ThirtConfigMapper.xml

@@ -1,5 +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.thirt.mapper.ThirtConfigMapper">
+<mapper namespace="org.jeecg.modules.third.mapper.ThirdConfigMapper">
 
 </mapper>

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/IThirtConfigAdvertiserService.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.thirt.server;
+package org.jeecg.modules.third.server;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.thirt.entity.ThirtConfigAdvertiser;
+import org.jeecg.modules.third.entity.ThirdConfigAdvertiser;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @Date: 2020-08-14
  * @Version: V1.0
  */
-public interface IThirtConfigAdvertiserService extends IService<ThirtConfigAdvertiser> {
+public interface IThirdConfigAdvertiserService extends IService<ThirdConfigAdvertiser> {
 
     List<String> getAdvertiserListByAppId(Long appId);
 

+ 14 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/server/IThirdConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.third.server;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.third.entity.ThirdConfig;
+
+/**
+ * @Description: 对外配置
+ * @Author: jeecg-boot
+ * @Date: 2020-08-14
+ * @Version: V1.0
+ */
+public interface IThirdConfigService extends IService<ThirdConfig> {
+
+}

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/impl/ThirtConfigAdvertiserServiceImpl.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.thirt.server.impl;
+package org.jeecg.modules.third.server.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.thirt.entity.ThirtConfigAdvertiser;
-import org.jeecg.modules.thirt.mapper.ThirtConfigAdvertiserMapper;
-import org.jeecg.modules.thirt.server.IThirtConfigAdvertiserService;
+import org.jeecg.modules.third.entity.ThirdConfigAdvertiser;
+import org.jeecg.modules.third.mapper.ThirdConfigAdvertiserMapper;
+import org.jeecg.modules.third.server.IThirdConfigAdvertiserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,9 +18,9 @@ import java.util.List;
  * @date 2020-08-14
  */
 @Service
-public class ThirtConfigAdvertiserServiceImpl extends ServiceImpl<ThirtConfigAdvertiserMapper, ThirtConfigAdvertiser> implements IThirtConfigAdvertiserService {
+public class ThirdConfigAdvertiserServiceImpl extends ServiceImpl<ThirdConfigAdvertiserMapper, ThirdConfigAdvertiser> implements IThirdConfigAdvertiserService {
     @Autowired
-    private ThirtConfigAdvertiserMapper thirtConfigAdvertiserMapper;
+    private ThirdConfigAdvertiserMapper thirtConfigAdvertiserMapper;
 
 
     @Override

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/third/server/impl/ThirdConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.third.server.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.third.entity.ThirdConfig;
+import org.jeecg.modules.third.mapper.ThirdConfigMapper;
+import org.jeecg.modules.third.server.IThirdConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 对外配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-08-14
+ */
+@Service
+public class ThirdConfigServiceImpl extends ServiceImpl<ThirdConfigMapper, ThirdConfig> implements IThirdConfigService {
+
+}

+ 0 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/thirt/server/impl/ThirtConfigServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.thirt.server.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.thirt.entity.ThirtConfig;
-import org.jeecg.modules.thirt.mapper.ThirtConfigMapper;
-import org.jeecg.modules.thirt.server.IThirtConfigService;
-import org.springframework.stereotype.Service;
-
-/**
- * 对外配置
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-08-14
- */
-@Service
-public class ThirtConfigServiceImpl extends ServiceImpl<ThirtConfigMapper, ThirtConfig> implements IThirtConfigService {
-
-}