添加新项目时添加标签

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -160,7 +160,7 @@ public interface TallFeignClient {
     JsonResponse saveWpsFile(WpsDto.Business business);
 
     /**
-     * 保存WPS业务和文件记录
+     * 查询WPS业务和文件记录
      */
     @RequestMapping("/wps/visitUrls")
     List<String> queryVisitUrls(WpsDto.VisitWpsUrl visitWpsUrl);

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
+    active: dev
-    include: common, util-prod
+    include: common, util-dev

tall/src/main/java/com/ccsens/tall/bean/dto/ProjectDto.java

@@ -9,6 +9,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 public class ProjectDto {
     @Data
@@ -138,5 +139,7 @@ public class ProjectDto {
         private Long beginTime;
         @ApiModelProperty("结束时间")
         private Long endTime;
+        @ApiModelProperty("标签id")
+        private List<Long> labelList;
     }
 }

tall/src/main/java/com/ccsens/tall/bean/dto/RoleDto.java

@@ -42,4 +42,12 @@ public class RoleDto {
         @ApiModelProperty("成员Id")
         private Long memberId;
     }
+
+    @Data
+    @ApiModel("给角色添加成员")
+    public static class DeleteRole{
+        @NotNull(message = "角色Id不能为空")
+        @ApiModelProperty("角色id")
+        private Long roleId;
+    }
 }

tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@@ -168,6 +168,10 @@ public class ProjectVo {
         private Boolean isShow = true;
         @ApiModelProperty("是否是项目虚拟的角色 0否 1是")
         private byte projectRole = 0;
+        @ApiModelProperty("关联项目的id")
+        private Long relevanceProjectId;
+        @ApiModelProperty("关联项目的名称")
+        private String relevanceProjectName;
         @ApiModelProperty("成员信息")
         private List<ProMemberVo> members;
         @JsonIgnore

tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@@ -289,7 +289,7 @@ public class ExcelService implements IExcelService {
             String proRoleCell = ExcelUtil.getCellValue(row.getCell(1));
             String secondRoleCell = ExcelUtil.getCellValue(row.getCell(2));
             String memberCell = ExcelUtil.getCellValue(row.getCell(3));
-            String roleRelevanceProjectId = ExcelUtil.getCellValue(row.getCell(3));
+            String roleRelevanceProjectId = ExcelUtil.getCellValue(row.getCell(5));
             //添加一级角色
             if (StrUtil.isNotEmpty(proRoleCell)) {
                 ProRole role = new ProRole();

tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@@ -77,6 +77,8 @@ public class ProjectService implements IProjectService {
     private SysUserDao sysUserDao;
     @Resource
     private SysAuthDao sysAuthDao;
+    @Resource
+    private SysProjectLabelDao sysProjectLabelDao;
 
 
     @Override
@@ -1087,7 +1089,24 @@ public class ProjectService implements IProjectService {
         taskDetail.setExecutorRole(pmRole.getId());
         taskDetail.setCheckerRole(pmRole.getId());
         taskDetailDao.insertSelective(taskDetail);
-
+        //添加标签
+        if(CollectionUtil.isNotEmpty(createProject.getLabelList())){
+            createProject.getLabelList().forEach(labelId->{
+                SysLabel sysLabel = sysLabelDao.selectByPrimaryKey(labelId);
+                if(ObjectUtil.isNull(sysLabel)){
+                    throw new BaseException(CodeEnum.NOT_LABEL);
+                }
+                if(sysLabel.getUserId().longValue() != currentUserId){
+                    throw new BaseException(CodeEnum.NOT_LABEL);
+                }
+                //添加项目和标签的关联信息
+                SysProjectLabel sysProjectLabel = new SysProjectLabel();
+                sysProjectLabel.setId(snowflake.nextId());
+                sysProjectLabel.setProjectId(sysProject.getId());
+                sysProjectLabel.setLabelId(labelId);
+                sysProjectLabelDao.insertSelective(sysProjectLabel);
+            });
+        }
         return getProjectInfoById(currentUserId,sysProject.getId(),token);
     }
 }

tall/src/main/java/com/ccsens/tall/web/RoleController.java

@@ -26,13 +26,12 @@ public class RoleController {
 
     @ApiOperation(value = "删除角色",notes = "")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "roleId", value = "角色Id", required = true, paramType = "query")
     })
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse deleteTask(HttpServletRequest request,
-                                   @RequestParam(required = false)Long roleId) throws Exception {
+                                   @ApiParam @Validated @RequestBody RoleDto.DeleteRole deleteRole) throws Exception {
         Long currentUserId =  Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
-        proRoleService.deleteRole(currentUserId,roleId);
+        proRoleService.deleteRole(currentUserId,deleteRole.getRoleId());
         return JsonResponse.newInstance().ok();
     }
 

tall/src/main/resources/application-prod.yml

@@ -34,7 +34,8 @@ eureka:
   instance:
     # www.tall.wiki
 #    ip-address: 140.143.228.3
-    ip-address: 81.70.54.64
+#    ip-address: 81.70.54.64
+    ip-address: 192.144.182.42
 
 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/

tall/src/main/resources/mapper_dao/ProRoleDao.xml

@@ -65,7 +65,9 @@
         m.phone as mPhone,
         m.user_id as mUserId,
         m.stakeholder_id as stakeholderId,
-		if((SELECT `name` FROM t_pro_role WHERE id = pr.parent_id) = 'ProjectVirtualRole',1,0) as projectRole
+		if((SELECT `name` FROM t_pro_role WHERE id = pr.parent_id) = 'ProjectVirtualRole',1,0) as projectRole,
+		pr.relevance_project_id as relevanceProjectId,
+		(SELECT `name` FROM t_sys_project WHERE id = pr.relevance_project_id) as relevanceProjectName
         from
         t_pro_role pr LEFT JOIN t_pro_member_role mr ON mr.role_id = pr.id
         LEFT JOIN t_pro_member m ON mr.member_id = m.id

util/src/main/java/com/ccsens/util/PoiUtil.java

@@ -26,6 +26,7 @@ import java.util.Map;
 
 /**
  * 导入导出excel
+ * @author wu
  */
 @Slf4j
 @Component
@@ -33,8 +34,17 @@ public class PoiUtil {
 
     @Data
     public static class PoiUtilCell {
+        /**
+         * 单元格内容
+         */
         private String value = "";
+        /**
+         * 跨列
+         */
         private int colspan = 1;
+        /**
+         * 跨行
+         */
         private int rowspan = 1;
         /**
          * 水平居中
@@ -63,6 +73,7 @@ public class PoiUtil {
         private String function;
 
         public PoiUtilCell() {
+
         }
 
         public PoiUtilCell(String value) {
@@ -104,7 +115,7 @@ public class PoiUtil {
      * @param sheetName sheet名称
      * @param rows      行
      * @param wb        XSSFWorkbook对象  无则创建
-     * @return
+     * @return 返回生成的excel数据
      */
     public static Workbook exportWB(String sheetName, List<List<PoiUtilCell>> rows, Workbook wb) {
 
@@ -186,11 +197,10 @@ public class PoiUtil {
     /**
      * 合并单元格
      *
-     * @param sheet
+     * @param sheet 当前sheet
-     * @param rows
+     * @param rows 行数
-     * @param cols
+     * @param cols 列数
-     * @param cell
+     * @param cell 单元格信息
-     * @return
      */
     private static void mergedRegion(Sheet sheet, int rows, int cols, PoiUtilCell cell) {
 //
@@ -430,7 +440,6 @@ public class PoiUtil {
 
     /**
      * 生成sheet
-     *
      * @param file
      * @param index
      * @return
@@ -491,79 +500,15 @@ public class PoiUtil {
         anchor.setCol2(col2);
         // 插入图片
         Picture pict = drawing.createPicture(anchor, pictureIdx);
-
-//        FileOutputStream fileOut = null;
-//        fileOut = new FileOutputStream("D:/测试Excel.xlsx");
-//        // 写入excel文件
-//        wb.write(fileOut);
-//        System.out.println("----Excle文件已生成------");
         return wb;
     }
 
-    public static void main(String[] args) throws Exception {
-        InputStream inputStream = new FileInputStream("D:\\1.xlsx");
-        Workbook workbook = new XSSFWorkbook(inputStream);
-        XSSFSheet sheet = (XSSFSheet) workbook.getSheetAt(0);
-        XSSFRow row = sheet.getRow(6);
-        XSSFCell newCell = row.createCell(2);
-        XSSFCell newCell1 = row.createCell(3);
-        //添加公式
-        newCell.setCellFormula("A7+B7");
-        newCell1.setCellFormula("A8/B8");
-        //设置打印区域
-        workbook.setPrintArea(
-                0, //工作薄 下标0开始
-                0, //起始列 下标0开始
-                20, //终止列 下标0开始
-                0, //起始行 下标0开始
-                20  //终止行 下标0开始
-        );
-//        CellStyle style = workbook.createCellStyle();
-//        style.setFillBackgroundColor();
-
-        OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx"));
-        workbook.write(stream);
-        stream.close();
-
-//        List<List<PoiUtilCell>> list = new ArrayList<>();
-//        List<PoiUtilCell> cells = new ArrayList<>();
-//        cells.add(new PoiUtilCell("1", 2, 1));
-//        cells.add(new PoiUtilCell());
-//        cells.add(new PoiUtilCell());
-//        cells.add(new PoiUtilCell());
-//        cells.add(new PoiUtilCell());
-//        cells.add(new PoiUtilCell("2"));
-//        list.add(cells);
-//               List<PoiUtilCell> cells2 = new ArrayList<>();
-//        cells2.add(new PoiUtilCell("3", 1, 2));
-//        cells2.add(new PoiUtilCell("4"));
-//        cells2.add(new PoiUtilCell("",3,1));
-//        list.add(cells2);
-//        List<PoiUtilCell> cells3 = new ArrayList<>();
-//        cells3.add(new PoiUtilCell("5"));
-//        cells3.add(new PoiUtilCell("6"));
-//        list.add(cells3);
-//        List<PoiUtilCell> cells4 = new ArrayList<>();
-//        list.add(cells4);
-//        List<PoiUtilCell> cells5 = new ArrayList<>();
-//        cells5.add(new PoiUtilCell("9", 2, 2));
-//        cells5.add(new PoiUtilCell("9"));
-//        list.add(cells5);
-
-//        Workbook wbs = exportWB("wbs", list, workbook);
-//        OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx"));
-//        wbs.write(stream);
-//        stream.close();
-
-//        setImg("C:\\Users\\逗\\Desktop\\0cf3ffd8f0001c4310b02f706753721.png",1,2,1,2);
-
-    }
 
 
     /**
      * 获取excel的列号
      * @param num 第几列（从1开始）
-     * @return
+     * @return 返回列号
      */
     public static String toRadix(Integer num) throws Exception{
         String[] array = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"};
@@ -579,9 +524,63 @@ public class PoiUtil {
             out = array[num - 1];
         }
         return out;
-
     }
 
 
+    public static void main(String[] args) throws Exception {
+        InputStream inputStream = new FileInputStream("C:\\Users\\逗\\Desktop\\新建文件夹\\1.xlsx");
+        Workbook workbook = new XSSFWorkbook(inputStream);
+//        XSSFSheet sheet = (XSSFSheet) workbook.getSheetAt(0);
+//        XSSFRow row = sheet.getRow(6);
+//        XSSFCell newCell = row.createCell(2);
+//        XSSFCell newCell1 = row.createCell(3);
+//        //添加公式
+//        newCell.setCellFormula("A7+B7");
+//        newCell1.setCellFormula("A8/B8");
+//        //设置打印区域
+//        workbook.setPrintArea(
+//                0, //工作薄 下标0开始
+//                0, //起始列 下标0开始
+//                20, //终止列 下标0开始
+//                0, //起始行 下标0开始
+//                20  //终止行 下标0开始
+//        );
+////        CellStyle style = workbook.createCellStyle();
+////        style.setFillBackgroundColor();
+//
+//        OutputStream stream = new FileOutputStream(new File("D:\\1.xlsx"));
+//        workbook.write(stream);
+//        stream.close();
+        List<List<PoiUtilCell>> list = new ArrayList<>();
+
+        List<PoiUtilCell> cells = new ArrayList<>();
+        cells.add(new PoiUtilCell("不跨行不跨列"));
+        list.add(cells);
+
+        List<PoiUtilCell> cells1 = new ArrayList<>();
+        cells1.add(new PoiUtilCell("两列一行", 2, 1));
+        list.add(cells1);
+
+        List<PoiUtilCell> cells2 = new ArrayList<>();
+        cells2.add(new PoiUtilCell("一列两行", 1, 2));
+        list.add(cells2);
+//        List<PoiUtilCell> cells3 = new ArrayList<>();
+//        cells3.add(new PoiUtilCell("5"));
+//        cells3.add(new PoiUtilCell("6"));
+//        list.add(cells3);
+//        List<PoiUtilCell> cells4 = new ArrayList<>();
+//        list.add(cells4);
+//        List<PoiUtilCell> cells5 = new ArrayList<>();
+//        cells5.add(new PoiUtilCell("9", 2, 2));
+//        cells5.add(new PoiUtilCell("9"));
+//        list.add(cells5);
+
+        Workbook wbs = exportWB("Sheet1", list, workbook);
+        OutputStream stream = new FileOutputStream(new File("C:\\Users\\逗\\Desktop\\新建文件夹\\"+System.currentTimeMillis()+".xlsx"));
+        wbs.write(stream);
+        stream.close();
+
+
+    }
 
 }