Ver Fonte

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

yumeng há 4 anos atrás
pai
commit
be820458e3

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

@@ -1,6 +1,5 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.entity.Project;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.ISysRoleService;
@@ -11,7 +10,6 @@ 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.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -58,8 +56,6 @@ public class ProjectMemberController {
      * @param projectId
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/getMemberList")
     public Map<String, Object> getMemberList(String projectId) {
         Map<String, Object> map = new HashMap<>();
@@ -86,8 +82,6 @@ public class ProjectMemberController {
      * @param userId
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/participateList")
     public Map<String, Object> participateList(String userId) {
         Map<String, Object> map = new HashMap<>();
@@ -140,8 +134,6 @@ public class ProjectMemberController {
      * @param req
      * @return
      */
-    @AutoLog(value = "项目成员-分页列表查询")
-    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
     @GetMapping(value = "/list")
     public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -163,10 +155,6 @@ public class ProjectMemberController {
      * @param jsonObject
      * @return
      */
-
-
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/batchAdd")
     public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
         Result<ProjectMember> result = new Result<>();
@@ -221,8 +209,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @return
      */
-    @AutoLog(value = "项目成员-添加")
-    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/add")
     public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
@@ -242,8 +228,6 @@ public class ProjectMemberController {
      * @param projectMember
      * @return
      */
-    @AutoLog(value = "项目成员-编辑")
-    @ApiOperation(value = "项目成员-编辑", notes = "项目成员-编辑")
     @PutMapping(value = "/edit")
     public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
         Result<ProjectMember> result = new Result<>();
@@ -266,8 +250,6 @@ public class ProjectMemberController {
      * @param id
      * @return
      */
-    @AutoLog(value = "项目成员-通过id删除")
-    @ApiOperation(value = "项目成员-通过id删除", notes = "项目成员-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<Object> delete(@RequestParam(name = "id", required = true) String id) {
         try {
@@ -285,8 +267,6 @@ public class ProjectMemberController {
      * @param ids
      * @return
      */
-    @AutoLog(value = "项目成员-批量删除")
-    @ApiOperation(value = "项目成员-批量删除", notes = "项目成员-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         Result<ProjectMember> result = new Result<>();
@@ -305,8 +285,6 @@ public class ProjectMemberController {
      * @param id
      * @return
      */
-    @AutoLog(value = "项目成员-通过id查询")
-    @ApiOperation(value = "项目成员-通过id查询", notes = "项目成员-通过id查询")
     @GetMapping(value = "/queryById")
     public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
         Result<ProjectMember> result = new Result<>();
@@ -325,8 +303,6 @@ public class ProjectMemberController {
      *
      * @return
      */
-    @AutoLog(value = "头条视频报表-参与项目列表")
-    @ApiOperation(value = "头条视频报表-参与项目列表", notes = "头条视频报表-参与项目列表")
     @GetMapping(value = "/bytedanceProjectParticipateInList")
     public Result<List<ProjectMember>> bytedanceProjectParticipateInList() {
         Result<List<ProjectMember>> result = new Result<>();

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -42,7 +42,6 @@ public class DictAspect {
      * 定义切点Pointcut
      */
     @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))||execution(public * cn.com.ctop..*.*Controller.*(..))")
-//    @Pointcut(value = "@annotation(cn.com.ctop.common.module.annotation.Dict)")
     public void excudeService() {
     }
 

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

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -173,7 +172,6 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         FileDTO file = new FileDTO();
         BeanUtils.copyProperties(fileEntity,file);
         String url = fileEntity.getDownloadUrl();
-        url = URLEncoder.encode(url);
         file.setDownload_url(url);
         file.setUser_acl(userAcl);
         file.setWatermark(watermark);

+ 3 - 5
module-common/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -30,7 +30,6 @@ import java.util.Date;
 @Accessors(chain = true)
 @ApiModel(value = "ctop_project对象", description = "项目")
 public class Project {
-
     /**
      * id
      */
@@ -100,10 +99,11 @@ public class Project {
      */
     private Long maxBid;
 
-    //供应商
-    //  @Dict(dicCode = "supplier_code", dictTable = "ctop_supplier_list", dicText = "supplier_name")
     private String supplierCode;
 
+    /**
+     * 销售
+     */
     @TableField(exist = false)
     private String supplierCode_dictText;
 
@@ -131,9 +131,7 @@ public class Project {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-
     @TableField(exist = false)
     private Integer needExamine;
 
-
 }