Merge pull request 'develop' (#23) from develop into master

Reviewed-on: #23

src/main/java/com/jsl/oa/config/startup/PermissionList.java

@@ -28,6 +28,7 @@ public class PermissionList {
         permissionPrincipal.add(new PermissionVO("info:get_header_image", "获取头部图片"));
         permissionPrincipal.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
         permissionPrincipal.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
+        permissionPrincipal.add(new PermissionVO("project:add", "增加项目"));
 
         permissionDeveloper.add(new PermissionVO("auth:change_password", "修改密码"));
         permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片"));

src/main/java/com/jsl/oa/controllers/ProjectController.java

@@ -1,5 +1,6 @@
 package com.jsl.oa.controllers;
 
+import com.jsl.oa.annotations.NeedPermission;
 import com.jsl.oa.model.vodata.ProjectEditVO;
 import com.jsl.oa.model.vodata.ProjectInfoVO;
 import com.jsl.oa.model.vodata.ProjectWorkVO;
@@ -248,6 +249,7 @@ public BaseResponse projectParticipateGet(
      */
 
     @PostMapping("/project/add")
+    @NeedPermission("project:add")
     public BaseResponse projectAdd(
             @RequestBody @Validated ProjectInfoVO projectInfoVO,
             @NotNull BindingResult bindingResult,
@@ -322,4 +324,12 @@ public BaseResponse projectParticipateGet(
     }
 
 
+    @GetMapping("/project/get/name")
+    public BaseResponse projectGetName(
+            @RequestParam String name,
+            HttpServletRequest request
+    ) {
+        return projectService.projectGetName(name, request);
+    }
+
 }

src/main/java/com/jsl/oa/mapper/ProjectMapper.java

@@ -106,7 +106,9 @@ public interface ProjectMapper {
             + "AND is_delete = 0")
     ProjectModuleDO getProjectWorkById(Long id);
 
-    @Select("select principal_id from organize_oa.oa_project_child where project_id=#{id}")
+    @Select("select principal_id from organize_oa.oa_project_child where project_id=#{id} union "
+            + "select principal_id from organize_oa.oa_project_modules where project_child_id in"
+            + "(select id from organize_oa.oa_project_child where project_id = #{id})")
     List <Long> getMemberByProjectId(Integer id);
 
     @Select("select principal_id from organize_oa.oa_project_modules where project_child_id=#{id}")
@@ -145,4 +147,7 @@ public interface ProjectMapper {
     void deleteProjectChild(Long id1);
 
     void deleteProjectModule(Long id1);
+
+    @Select("select * from organize_oa.oa_project where name like CONCAT('%',#{name},'%')")
+    List<ProjectDO> getByLikeName(String name);
 }

src/main/java/com/jsl/oa/model/dodata/ProjectDO.java

@@ -1,5 +1,6 @@
 package com.jsl.oa.model.dodata;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -17,6 +18,7 @@ import java.sql.Timestamp;
  */
 @Data
 @Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ProjectDO {
     /**
      * 主键

src/main/java/com/jsl/oa/model/vodata/ReturnGetVO.java

@@ -0,0 +1,23 @@
+package com.jsl.oa.model.vodata;
+
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+
+/**
+ * 模糊查询返回，系统/项目/模块 名字和id
+
+ */
+public class ReturnGetVO {
+    private String name;
+    private Long id;
+}

src/main/java/com/jsl/oa/services/ProjectService.java

@@ -67,4 +67,6 @@ public interface ProjectService {
     BaseResponse projectChildDelete(HttpServletRequest request, List<Long> id);
 
     BaseResponse projectModuleDelete(HttpServletRequest request, List<Long> id);
+
+    BaseResponse projectGetName(String name, HttpServletRequest request);
 }

src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java

@@ -157,6 +157,7 @@ public class MessageServiceImpl implements MessageService {
         String systemName = projectMapper.getWorkById(systemId).getName();
         // 添加消息
         MessageAddVO messageAddVO = new MessageAddVO();
+        messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
         messageAddVO.setUid(uid);
         messageAddVO.setTitle("审批消息");
         String moddleName = projectMapper.getModuleById(moddleId).getName();
@@ -193,16 +194,21 @@ public class MessageServiceImpl implements MessageService {
         for (Long uid : uidList) {
             MessageAddVO messageAddVO = new MessageAddVO();
             messageAddVO.setUid(uid);
+            messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
             messageAddVO.setTitle("项目变动消息");
             if (type == 3) {
                 messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人");
+                messageAddVO.setType("Project_child");
+                messageAddVO.setToId(systemId.longValue());
             } else if (type == 2) {
                 messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态");
+                messageAddVO.setType("Project");
+                messageAddVO.setToId(pId.longValue());
             } else if (type == 1) {
                 messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目");
+                messageAddVO.setType("Project");
+                messageAddVO.setToId(pId.longValue());
             }
-            messageAddVO.setType("Project");
-            messageAddVO.setToId(pId.longValue());
             messageMapper.messageAdd(messageAddVO);
         }
     }
@@ -233,6 +239,7 @@ public class MessageServiceImpl implements MessageService {
         if (type == 1) {
             MessageAddVO messageAddVO = new MessageAddVO();
             messageAddVO.setUid(projectMapper.getPid(moddleId));
+            messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
             messageAddVO.setTitle("子系统变动消息");
             messageAddVO.setText("项目经理" + senderName + "删除了" + projectName + "项目的"
                     + systemName + "系统的" + moddleName + "模块");
@@ -242,6 +249,7 @@ public class MessageServiceImpl implements MessageService {
             for (Long uid : uidList) {
                 MessageAddVO messageAddVO = new MessageAddVO();
                 messageAddVO.setUid(uid);
+                messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
                 messageAddVO.setTitle("子系统变动消息");
                 if (type == 2) {
                     messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
@@ -280,7 +288,7 @@ public class MessageServiceImpl implements MessageService {
         messageAddVO.setTitle("日报消息");
         messageAddVO.setText(projectName + "项目的" + systemName + "系统的" + moddleName + "模块负责人" + principalName
                 + "刚刚填写了日报");
-        messageAddVO.setType("跳转日报页");
+        messageAddVO.setType("Project_daily");
         messageMapper.messageAdd(messageAddVO);
     }
 

src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.gson.Gson;
 import com.jsl.oa.annotations.NeedPermission;
 import com.jsl.oa.dao.ProjectDAO;
 import com.jsl.oa.dao.RoleDAO;
@@ -31,10 +32,12 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
-import static java.lang.System.*;
+import static java.lang.System.currentTimeMillis;
+import static java.lang.System.out;
 
 /**
  * <h1>项目服务层实现类</h1>
@@ -58,6 +61,7 @@ public class ProjectServiceImpl implements ProjectService {
     private final ObjectMapper objectMapper;
     private final RoleDAO roleDAO;
     private final MessageService messageService;
+    private final Gson gson;
 
     @Override
     public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
@@ -71,18 +75,11 @@ public class ProjectServiceImpl implements ProjectService {
         } else {
             projectAdd.setDescription("{\"描述\":\" " + projectAdd.getDescription() + "\"}");
         }
-        String tags = projectAdd.getTags();
+
-        String[] split = tags.split(",");
+        HashMap<String, Object> tagMap = new HashMap<>();
-        String open = "{\"tags\":[\"";
+        tagMap.put("tags", projectAdd.getTags().split(","));
-        String close = "]}";
+        projectAdd.setTags(gson.toJson(tagMap));
-        StringBuilder tag = new StringBuilder();
+
-        for (String tag1 : split) {
-            tag.append(tag1).append("\",\"");
-        }
-        if (tag.length() > 0) {
-            tag = new StringBuilder(tag.substring(0, tag.length() - 2));
-        }
-        projectAdd.setTags(open + tag + close);
         projectAdd.setFiles("{\"URI\":\"" + projectAdd.getFiles() + "\"}");
 
 
@@ -241,6 +238,19 @@ public class ProjectServiceImpl implements ProjectService {
         return ResultUtil.success();
     }
 
+    @Override
+    public BaseResponse projectGetName(String name, HttpServletRequest request) {
+        List<ProjectDO> projectDOList = projectMapper.getByLikeName(name);
+
+        List<ReturnGetVO> returnGetVOList = new ArrayList<>();
+        for (ProjectDO projectDO : projectDOList) {
+            ReturnGetVO returnGetVO = new ReturnGetVO();
+            Processing.copyProperties(projectDO, returnGetVO);
+            returnGetVOList.add(returnGetVO);
+        }
+        return ResultUtil.success(returnGetVOList);
+    }
+
     @Override
     public BaseResponse getModuleById(Integer id) {
         ProjectModuleDO projectWorkSimpleVO = projectMapper.getModuleById(id);
@@ -260,9 +270,9 @@ public class ProjectServiceImpl implements ProjectService {
         }
         ProjectModuleSimpleVO projectModuleSimpleVO = new ProjectModuleSimpleVO();
         projectModuleSimpleVO.setPrincipalUser(userDAO.getUserById(projectMapper.getPid(id)).getUsername());
-        out.println("准备拷贝");
+
         Processing.copyProperties(projectWorkSimpleVO, projectModuleSimpleVO);
-        out.println("拷贝wan");
+
         return ResultUtil.success(projectModuleSimpleVO);
     }