syh 4 лет назад
Родитель
Сommit
5978a02d91

+ 0 - 37
pom.xml

@@ -25,12 +25,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>ch.qos.logback</groupId>-->
-<!--                    <artifactId>logback-classic</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -41,10 +35,6 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>${commons.version}</version>
@@ -129,11 +119,6 @@
             <artifactId>gson</artifactId>
         </dependency>
         <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>4.5.11</version>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
@@ -167,28 +152,6 @@
             <version>4.5</version>
         </dependency>
 
-        <!-- Swagger API文档 -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.9.3</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-bean-validators</artifactId>
-            <version>2.9.2</version>
-        </dependency>
-        <!--  -->
         <!-- Redis -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

+ 0 - 3
src/main/java/cn/com/ctop/okr/Application.java

@@ -19,9 +19,6 @@ public class Application {
     public static void main(String[] args) throws UnknownHostException {
         ConfigurableApplicationContext application = SpringApplication.run(Application.class, args);
         Environment env = application.getEnvironment();
-        String ip = InetAddress.getLocalHost().getHostAddress();
-        String port = env.getProperty("server.port");
-        String path = env.getProperty("server.servlet.context-path");
         log.info("\n----------------------------------------------------------\n\t" +
                 "okr service is running\n\t" +
                 "----------------------------------------------------------");

+ 17 - 2
src/main/java/cn/com/ctop/okr/controller/OkrKrController.java

@@ -1,8 +1,10 @@
 package cn.com.ctop.okr.controller;
 
 import cn.com.ctop.okr.entity.OkrKrInfo;
+import cn.com.ctop.okr.entity.QYWxUserInfo;
 import cn.com.ctop.okr.service.IKrAlignInfoService;
 import cn.com.ctop.okr.service.IKrInfoservice;
+import cn.com.ctop.okr.service.IQYWxUserInfoService;
 import cn.com.ctop.okr.utils.StringUtils;
 import cn.com.ctop.okr.vo.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,24 +15,28 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @RestController
 @RequestMapping("/kr")
 public class OkrKrController {
     @Autowired
+    private IQYWxUserInfoService qyWxUserInfoService;
+    @Autowired
     private IKrAlignInfoService alignInfoService;
     @Autowired
     private IKrInfoservice krInfoservice;
+
     @PostMapping("alignList")
     public Map<String,Object>alignList(Long originId){
         return alignInfoService.alignListByParams(originId);
     }
-
     @PostMapping("addAlign")
     public Map<String,Object>addAlign(Long originId, String alignId){
         return alignInfoService.addAlign(originId,alignId);
     }
+
     @PostMapping("deleteAlign")
     public Map<String,Object>deleteAlign(Long originId,Long alignId){
         return alignInfoService.deleteAlign(originId,alignId);
@@ -42,7 +48,6 @@ public class OkrKrController {
      * @param krInfo
      * @param pageNo
      * @param pageSize
-     * @param req
      * @return
      */
     @GetMapping(value = "/list")
@@ -58,6 +63,16 @@ public class OkrKrController {
         queryWrapper.eq("quarter",krInfo.getQuarter());
         Page<OkrKrInfo> page = new Page<>(pageNo, pageSize);
         IPage<OkrKrInfo> pageList = krInfoservice.page(page, queryWrapper);
+        List<OkrKrInfo>details = pageList.getRecords();
+        if(null!=details&&!details.isEmpty()){
+            details.forEach(detail->{
+                QYWxUserInfo userInfo = qyWxUserInfoService.getByOpenId(detail.getUserId());
+                if(null!=userInfo){
+                    detail.setUserName(userInfo.getName());
+                }
+            });
+            pageList.setRecords(details);
+        }
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

+ 2 - 0
src/main/java/cn/com/ctop/okr/entity/OkrKrInfo.java

@@ -40,5 +40,7 @@ public class OkrKrInfo {
     private List<RemindVO>remindVOS;
     @TableField(exist = false)
     private List<PublicVO>publicVOS;
+    @TableField(exist = false)
+    private String userName;
 
 }

+ 2 - 2
src/main/java/cn/com/ctop/okr/mapper/KrAlignInfoMapper.java

@@ -1,6 +1,5 @@
 package cn.com.ctop.okr.mapper;
 
-import cn.com.ctop.okr.entity.CorpUserInfo;
 import cn.com.ctop.okr.entity.KrAlignInfo;
 import cn.com.ctop.okr.entity.OkrKrInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -9,5 +8,6 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface KrAlignInfoMapper extends BaseMapper<KrAlignInfo> {
-    List<OkrKrInfo> selectByParams(@Param(value = "originId") Long originId);
+    List<OkrKrInfo> selectMyAlign(@Param(value = "originId") Long originId);
+    List<OkrKrInfo> selectOtherAligned(@Param(value = "alignId") Long alignId);
 }

+ 8 - 1
src/main/java/cn/com/ctop/okr/mapper/xml/KrAlignInfoMapper.xml

@@ -2,11 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.okr.mapper.KrAlignInfoMapper">
 
-    <select id="selectByParams" resultType="cn.com.ctop.okr.entity.OkrKrInfo">
+    <select id="selectMyAlign" resultType="cn.com.ctop.okr.entity.OkrKrInfo">
         select kr.* from okr_kr_align align left join okr_kr_info kr on align.align_kr = kr.id
         where align.status = 1
         <if test="originId!=null">
             and align.origin_kr = #{originId}
         </if>
     </select>
+    <select id="selectOtherAligned" resultType="cn.com.ctop.okr.entity.OkrKrInfo">
+        select kr.* from okr_kr_align align left join okr_kr_info kr on align.origin_kr = kr.id
+        where align.status = 1
+        <if test="alignId!=null">
+            and align.align_kr = #{alignId}
+        </if>
+    </select>
 </mapper>

+ 25 - 3
src/main/java/cn/com/ctop/okr/service/impl/KrAlignInfoServiceImpl.java

@@ -2,8 +2,10 @@ package cn.com.ctop.okr.service.impl;
 
 import cn.com.ctop.okr.entity.KrAlignInfo;
 import cn.com.ctop.okr.entity.OkrKrInfo;
+import cn.com.ctop.okr.entity.QYWxUserInfo;
 import cn.com.ctop.okr.mapper.KrAlignInfoMapper;
 import cn.com.ctop.okr.service.IKrAlignInfoService;
+import cn.com.ctop.okr.service.IQYWxUserInfoService;
 import cn.com.ctop.okr.utils.ResultMapUtils;
 import cn.com.ctop.okr.utils.StatusCode;
 import cn.com.ctop.okr.vo.Result;
@@ -22,6 +24,9 @@ import java.util.Map;
 public class KrAlignInfoServiceImpl extends ServiceImpl<KrAlignInfoMapper, KrAlignInfo> implements IKrAlignInfoService {
     @Autowired
     private KrAlignInfoMapper krAlignInfoMapper;
+    @Autowired
+    private IQYWxUserInfoService qyWxUserInfoService;
+
     @Override
     public Map<String, Object> addAlign(Long originId, String alignIds) {
         Map<String,Object>result = new HashMap<>();
@@ -68,7 +73,6 @@ public class KrAlignInfoServiceImpl extends ServiceImpl<KrAlignInfoMapper, KrAli
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
         return result;
     }
-
     @Override
     public Map<String, Object> alignListByParams(Long originId) {
         Map<String,Object>result = new HashMap<>();
@@ -76,9 +80,27 @@ public class KrAlignInfoServiceImpl extends ServiceImpl<KrAlignInfoMapper, KrAli
             ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
             return result;
         }
-        List<OkrKrInfo> krInfoList = krAlignInfoMapper.selectByParams(originId);
+        List<OkrKrInfo> myAligns = krAlignInfoMapper.selectMyAlign(originId);
+        if(null!=myAligns&&!myAligns.isEmpty()){
+            myAligns.forEach(detail->{
+                QYWxUserInfo userInfo = qyWxUserInfoService.getByOpenId(detail.getUserId());
+                if(null!=userInfo){
+                    detail.setUserName(userInfo.getName());
+                }
+            });
+        }
+        List<OkrKrInfo> otherAligneds = krAlignInfoMapper.selectOtherAligned(originId);
+        if(null!=otherAligneds&&!otherAligneds.isEmpty()){
+            otherAligneds.forEach(detail->{
+                QYWxUserInfo userInfo = qyWxUserInfoService.getByOpenId(detail.getUserId());
+                if(null!=userInfo){
+                    detail.setUserName(userInfo.getName());
+                }
+            });
+        }
         ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
-        result.put("data",krInfoList);
+        result.put("myAlign",myAligns);
+        result.put("otherAligned",otherAligneds);
         return result;
     }
 }

+ 1 - 0
src/main/resources/application.yml

@@ -76,6 +76,7 @@ spring:
         master:
           #prod
           url: jdbc:mysql://172.30.0.4:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          url: jdbc:mysql://139.186.27.96:4000/okr?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver