Browse Source

修改流程

yumeng 5 years ago
parent
commit
1e444828ac
17 changed files with 584 additions and 14 deletions
  1. 46 7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  2. 87 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  3. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java
  4. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  5. 37 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  6. 4 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  7. 9 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  8. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  9. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  10. 8 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java
  11. 103 5
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java
  12. 164 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouDirectionalTemplateController.java
  13. 59 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouDirectionalTemplate.java
  14. 15 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouDirectionalTemplateMapper.java
  15. 5 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouDirectionalTemplateMapper.xml
  16. 15 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouDirectionalTemplateService.java
  17. 19 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDirectionalTemplateServiceImpl.java

+ 46 - 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -25,6 +25,8 @@ import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectService;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.UserCompany;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -58,23 +60,60 @@ import java.util.*;
 public class ProjectController {
     @Autowired
     private IProjectService projectService;
-
     @Autowired
     private IProjectMemberService projectMemberService;
-
     @Autowired
     private ProjectMemberMapper projectMemberMapper;
-
-
     @Autowired
     private IAdvertiserService advertiserService;
-
-
     @Autowired
     private ProjectMapper projectMapper;
-
     @Autowired
     private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+    /**
+     * 公司下所有项目
+     *
+     * @param userId
+     * @return
+     */
+
+    @GetMapping(value = "/getProjectByCompany")
+    public Result<List<Project>> getProjectByCompany(String userId, String mediaId) {
+        Result<List<Project>> result = new Result<>();
+        try {
+            QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
+            List<Project> projects = new ArrayList<>();
+            String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
+            if (!"admin".equals(roleCode)) {
+                QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+                userCompanyQueryWrapper.eq("user_id", userId);
+                userCompanyQueryWrapper.orderByDesc("create_time");
+                userCompanyQueryWrapper.last("limit 1");
+                UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+                if (Check.isNull(userCompany)) {
+                    throw new Exception("公司信息为空");
+                }
+
+                queryWrapper.eq("media_id", mediaId);
+                queryWrapper.eq("company_id", userCompany.getCompanyId());
+                projects = projectMapper.selectList(queryWrapper);
+            } else {
+                queryWrapper.eq("media_id", mediaId);
+                projects = projectMapper.selectList(queryWrapper);
+
+            }
+            result.setSuccess(true);
+            result.setResult(projects);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+
+        }
+        return result;
+    }
 
 
     /**

+ 87 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -20,6 +20,9 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -61,6 +64,71 @@ public class UserAllocationController {
     private IProjectService projectService;
     @Autowired
     private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private ProjectMemberMapper memberMapper;
+    @Autowired
+    private IProjectMemberService projectMemberService;
+
+
+    @GetMapping(value = "/accountTurnProject")
+    public Result getAccountList(Long accountId, Long projectId) {
+        Result result = new Result<>();
+        try {
+            QueryWrapper<UserAllocation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("account_id", accountId);
+            queryWrapper.eq("account_status", 0);
+            queryWrapper.orderByDesc("create_time");
+            queryWrapper.last("limit 1");
+            UserAllocation userAllocations = userAllocationMapper.selectOne(queryWrapper);
+            if (Check.isNull(userAllocations)) {
+                throw new Exception("账号信息为空");
+            }
+            Project project = projectService.getById(projectId);
+            if (Check.isNull(project)) {
+                throw new Exception("项目信息为空");
+            }
+            QueryWrapper<UserAllocation> checkQueryWrapper = new QueryWrapper<>();
+            checkQueryWrapper.eq("account_id", accountId);
+            checkQueryWrapper.eq("project_id", projectId);
+            checkQueryWrapper.last("limit 1");
+            UserAllocation checkUserAllocation = userAllocationMapper.selectOne(checkQueryWrapper);
+            if (!Check.isNull(checkUserAllocation)) {
+                throw new Exception("该项目下已存在此账户");
+            }
+            userAllocations.setAccountStatus(1);
+            userAllocations.setProjectId(projectId);
+            userAllocations.setProjectName(project.getProjectName());
+            userAllocations.setMediaId(project.getMediaId());
+            userAllocations.setAdvertiserId(project.getAdvertiserId());
+            userAllocations.setAdvertiserName(project.getAdvertiserName());
+            userAllocationService.save(userAllocations);
+            QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
+            memberQueryWrapper.eq("user_id", userAllocations.getUserId());
+            memberQueryWrapper.eq("project_id", projectId);
+            memberQueryWrapper.last("limit 1");
+            ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
+            if (Check.isNull(member)) {
+                ProjectMember addMember = new ProjectMember();
+                addMember.setProjectId(projectId);
+                addMember.setProjectName(project.getProjectName());
+                addMember.setUserId(userAllocations.getUserId());
+                addMember.setUserName(userAllocations.getUserName());
+                String roleCode = materialReportMapper.getRoleCodeByUserId(userAllocations.getUserId());
+                if (!Check.isNull(roleCode)) {
+                    addMember.setRoleCode(roleCode);
+                }
+                projectMemberService.save(addMember);
+            }
+
+            result.setSuccess(true);
+        } catch (Exception e) {
+            result.setSuccess(false);
+            result.setMessage(e.getMessage());
+        }
+
+        return result;
+
+    }
 
 
     @GetMapping(value = "/getAccountList")
@@ -213,6 +281,25 @@ public class UserAllocationController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = userAllocationService.updateById(userAllocation);
+            QueryWrapper<ProjectMember> memberQueryWrapper = new QueryWrapper<>();
+            memberQueryWrapper.eq("user_id", userAllocation.getUserId());
+            memberQueryWrapper.eq("project_id", userAllocation.getProjectId());
+            memberQueryWrapper.last("limit 1");
+            ProjectMember member = memberMapper.selectOne(memberQueryWrapper);
+            if (Check.isNull(member)) {
+                ProjectMember addMember = new ProjectMember();
+                addMember.setProjectId(userAllocation.getProjectId());
+                addMember.setProjectName(userAllocation.getProjectName());
+                addMember.setUserId(userAllocation.getUserId());
+                addMember.setUserName(userAllocation.getUserName());
+                String roleCode = materialReportMapper.getRoleCodeByUserId(userAllocation.getUserId());
+                if (!Check.isNull(roleCode)) {
+                    addMember.setRoleCode(roleCode);
+                }
+                projectMemberService.save(addMember);
+            }
+
+
             if (ok) {
                 result.success("修改成功!");
             }

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java

@@ -17,5 +17,6 @@ import java.util.List;
 public interface IProjectMemberService extends IService<ProjectMember> {
     void addMember(SysUser sysUser, Project project);
 
+
     List<Long> selectProjectsByUserId(String userId);
 }

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -48,6 +48,7 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         this.save(member);
     }
 
+
     /**
      * 查询所有项目
      *
@@ -58,4 +59,5 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
     public List<Long> selectProjectsByUserId(String userId) {
         return memberMapper.selectProjectsByUserId(userId);
     }
+
 }

+ 37 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,6 +21,7 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
@@ -101,6 +103,41 @@ public class SysUserController {
     }
 
 
+    @Autowired
+    private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+    @RequestMapping(value = "/getAllUserListByCompany", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getAllUserListByCompany(String userId) {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+            List<SysUserVo> userList = new ArrayList<>();
+            String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
+            if (!"admin".equals(roleCode)) {
+                QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+                userCompanyQueryWrapper.eq("user_id", userId);
+                userCompanyQueryWrapper.orderByDesc("create_time");
+                userCompanyQueryWrapper.last("limit 1");
+                UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+                userList = sysUserService.getUserListByCompany(userCompany.getCompanyId());
+            } else {
+                userList = sysUserService.getAllUser();
+            }
+
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+
+        }
+
+        return result;
+    }
+
+
     @RequestMapping(value = "/getAllUserList", method = RequestMethod.GET)
     public Result<List<SysUserVo>> getAllList() {
         Result<List<SysUserVo>> result = new Result<>();

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -62,7 +62,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param phone
      * @return
      */
-     SysUser getUserByPhone(@Param("phone") String phone);
+    SysUser getUserByPhone(@Param("phone") String phone);
 
 
     /**
@@ -71,9 +71,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param email
      * @return
      */
-     SysUser getUserByEmail(@Param("email") String email);
+    SysUser getUserByEmail(@Param("email") String email);
 
     Map<String, Object> queryRoleCode(@Param("userId") String userId);
 
     List<SysUserVo> getAllUser();
+
+    List<SysUserVo> getUserListByCompany(@Param("companyId") String companyId);
 }

+ 9 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -81,4 +81,13 @@ SELECT
 </select>
 
 
+    <select id="getUserListByCompany" resultType="org.jeecg.modules.system.entity.SysUserVo">
+    FROM user_company t1 LEFT JOIN
+    sys_user t2 ON
+    t1.user_id = t2.id
+    LEFT JOIN sys_user_role t3 on t1.user_id = t3.user_id;
+    WHERE t1.company_id = #{companyId};
+    </select>
+
+
 </mapper>

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -128,4 +128,7 @@ public interface ISysUserService extends IService<SysUser> {
     Map<String, Object> queryRoleCode(String userId);
 
     List<SysUserVo> getAllUser();
+
+
+	List<SysUserVo> getUserListByCompany(String companyId);
 }

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -269,4 +269,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public List<SysUserVo> getAllUser() {
         return userMapper.getAllUser();
     }
+
+    @Override
+    public List<SysUserVo> getUserListByCompany(String companyId) {
+        return userMapper.getUserListByCompany(companyId);
+    }
+
+
 }

+ 8 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java

@@ -109,6 +109,14 @@ public class UserAllocation {
     @Excel(name = "授权名称", width = 15)
     @ApiModelProperty(value = "授权名称")
     private String authName;
+
+
+    /**
+     * 0 启动
+     * 1 禁用
+     */
+    private Integer accountStatus;
+
     /**
      * 修改时间
      */

+ 103 - 5
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/BatchController.java

@@ -9,7 +9,6 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.vo.SpendVo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCampaignMapper;
-import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouRegionListParentMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouTargetingTagsMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.*;
 import com.alibaba.fastjson.JSONArray;
@@ -18,8 +17,10 @@ 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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,8 +50,6 @@ public class BatchController {
     @Autowired
     private IKuaiShouGroupService kuaiShouGroupService;
     @Autowired
-    private KuaiShouRegionListParentMapper regionListParentMapper;
-    @Autowired
     private IKuaiShouAppListService kuaiShouAppListService;
     @Autowired
     private KuaiShouTargetingTagsMapper targetingTagsMapper;
@@ -64,6 +63,10 @@ public class BatchController {
     private KuaiShouCampaignMapper campaignMapper;
     @Autowired
     private IKuaiShouActionBarTextService actionBarTextService;
+    @Autowired
+    private IKuaiShouDirectionalTemplateService kuaiShouDirectionalTemplateService;
+    @Autowired
+    private IKuaiShouCreativeService kuaiShouCreativeService;
 
 
     /**
@@ -597,10 +600,18 @@ public class BatchController {
     }
 
 
-    @Autowired
-    private IKuaiShouCreativeService kuaiShouCreativeService;
 
 
+
+    /**
+     * 获取 创意列表
+     *
+     * @param kuaiShouCreative
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
     @GetMapping(value = "/getCreativeList")
     public Result<IPage<KuaiShouCreative>> getCreativeList(KuaiShouCreative kuaiShouCreative, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
@@ -983,4 +994,91 @@ public class BatchController {
         return result;
     }
 
+
+    /**
+     * 查询 定向模板
+     *
+     * @param kuaiShouDirectionalTemplate
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @GetMapping(value = "/getDirectionalTemplate")
+    public Result<List<KuaiShouDirectionalTemplate>> getDirectionalTemplate(KuaiShouDirectionalTemplate kuaiShouDirectionalTemplate,
+                                                                            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                                            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                                            HttpServletRequest req) {
+        Result<List<KuaiShouDirectionalTemplate>> result = new Result<>();
+        QueryWrapper<KuaiShouDirectionalTemplate> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouDirectionalTemplate, req.getParameterMap());
+
+        List<KuaiShouDirectionalTemplate> templates = kuaiShouDirectionalTemplateService.list(queryWrapper);
+        result.setSuccess(true);
+        result.setResult(templates);
+        return result;
+    }
+
+    /**
+     * 添加 快手-定向模板
+     *
+     * @return
+     */
+
+    @PostMapping(value = "/addDirectionalTemplate")
+    public Result<KuaiShouDirectionalTemplate> add(@RequestBody KuaiShouDirectionalTemplate kuaiShouDirectionalTemplate) {
+        Result<KuaiShouDirectionalTemplate> result = new Result<KuaiShouDirectionalTemplate>();
+        try {
+            kuaiShouDirectionalTemplateService.save(kuaiShouDirectionalTemplate);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+
+
+    /**
+     * 编辑 定向模板
+     *
+     * @param
+     * @return
+     */
+    @PutMapping(value = "/editDirectionalTemplate")
+    public Result<KuaiShouDirectionalTemplate> editDirectionalTemplate(@RequestBody KuaiShouDirectionalTemplate kuaiShouDirectionalTemplate) {
+        Result<KuaiShouDirectionalTemplate> result = new Result<KuaiShouDirectionalTemplate>();
+        KuaiShouDirectionalTemplate kuaiShouDirectionalTemplateEntity = kuaiShouDirectionalTemplateService.getById(kuaiShouDirectionalTemplate.getId());
+        if (kuaiShouDirectionalTemplateEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = kuaiShouDirectionalTemplateService.updateById(kuaiShouDirectionalTemplate);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除 定向模板
+     *
+     * @param id
+     * @return
+     */
+
+    @DeleteMapping(value = "/deleteeditDirectionalTemplate")
+    public Result<?> deleteeditDirectionalTemplate(@RequestParam(name = "id", required = true) String id) {
+        try {
+            kuaiShouDirectionalTemplateService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+
+
 }

+ 164 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouDirectionalTemplateController.java

@@ -0,0 +1,164 @@
+package cn.com.ctop.kuaishou.modules.batch.controller;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDirectionalTemplateService;
+import com.alibaba.fastjson.JSON;
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 快手-定向模板
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-01-07
+ */
+@Slf4j
+@Api(tags = "快手-定向模板")
+@RestController
+@RequestMapping("/test/kuaiShouDirectionalTemplate")
+public class KuaiShouDirectionalTemplateController {
+    @Autowired
+    private IKuaiShouDirectionalTemplateService kuaiShouDirectionalTemplateService;
+
+
+
+
+
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "快手-定向模板-批量删除")
+    @ApiOperation(value = "快手-定向模板-批量删除", notes = "快手-定向模板-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<KuaiShouDirectionalTemplate> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<KuaiShouDirectionalTemplate> result = new Result<KuaiShouDirectionalTemplate>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.kuaiShouDirectionalTemplateService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "快手-定向模板-通过id查询")
+    @ApiOperation(value = "快手-定向模板-通过id查询", notes = "快手-定向模板-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<KuaiShouDirectionalTemplate> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<KuaiShouDirectionalTemplate> result = new Result<KuaiShouDirectionalTemplate>();
+        KuaiShouDirectionalTemplate kuaiShouDirectionalTemplate = kuaiShouDirectionalTemplateService.getById(id);
+        if (kuaiShouDirectionalTemplate == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(kuaiShouDirectionalTemplate);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<KuaiShouDirectionalTemplate> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                KuaiShouDirectionalTemplate kuaiShouDirectionalTemplate = JSON.parseObject(deString, KuaiShouDirectionalTemplate.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouDirectionalTemplate, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<KuaiShouDirectionalTemplate> pageList = kuaiShouDirectionalTemplateService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "快手-定向模板列表");
+        mv.addObject(NormalExcelConstants.CLASS, KuaiShouDirectionalTemplate.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("快手-定向模板列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<KuaiShouDirectionalTemplate> listKuaiShouDirectionalTemplates = ExcelImportUtil.importExcel(file.getInputStream(), KuaiShouDirectionalTemplate.class, params);
+                kuaiShouDirectionalTemplateService.saveBatch(listKuaiShouDirectionalTemplates);
+                return Result.ok("文件导入成功!数据行数:" + listKuaiShouDirectionalTemplates.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 59 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouDirectionalTemplate.java

@@ -0,0 +1,59 @@
+package cn.com.ctop.kuaishou.modules.batch.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-01-07
+ */
+@Data
+@TableName("ctop_kuaishou_directional_template")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_kuaishou_directional_template对象", description = "快手-定向模板")
+public class KuaiShouDirectionalTemplate {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 账户ID
+     */
+    @Excel(name = "账户ID", width = 15)
+    @ApiModelProperty(value = "账户ID")
+    private Long accountId;
+
+    private String templateName;
+    /**
+     * 发送邮箱
+     */
+    @Excel(name = "发送邮箱", width = 15)
+    @ApiModelProperty(value = "发送邮箱")
+    private String templateContent ;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}

+ 15 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouDirectionalTemplateMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.batch.mapper;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 快手-定向模板
+ *
+ * @author: jeecg-boot
+ * @date: 2020-01-07
+ * @cersion: V1.0
+ */
+public interface KuaiShouDirectionalTemplateMapper extends BaseMapper<KuaiShouDirectionalTemplate> {
+
+}

+ 5 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouDirectionalTemplateMapper.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="cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouDirectionalTemplateMapper">
+
+</mapper>

+ 15 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/IKuaiShouDirectionalTemplateService.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.kuaishou.modules.batch.service;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 快手-定向模板
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-01-07
+ */
+public interface IKuaiShouDirectionalTemplateService extends IService<KuaiShouDirectionalTemplate> {
+
+}

+ 19 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouDirectionalTemplateServiceImpl.java

@@ -0,0 +1,19 @@
+package cn.com.ctop.kuaishou.modules.batch.service.impl;
+
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouDirectionalTemplate;
+import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouDirectionalTemplateMapper;
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDirectionalTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 快手-定向模板
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2020-01-07
+ */
+@Service
+public class KuaiShouDirectionalTemplateServiceImpl extends ServiceImpl<KuaiShouDirectionalTemplateMapper, KuaiShouDirectionalTemplate> implements IKuaiShouDirectionalTemplateService {
+
+}