接口修改

a38e9ea1 · 冯之健 · 74fa8830 · a38e9ea1 · a38e9ea1 · a38e9ea1
Commit a38e9ea1 authored Apr 22, 2020 by 冯之健
16 changed files
--- a/link-admin/src/test/java/com/link/BaseTest.java
+++ b/link-admin/src/test/java/com/link/BaseTest.java
@@ -8,12 +8,32 @@
 package com.link;
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.Quarter;
+import cn.hutool.core.date.format.DateParser;
+import com.alibaba.fastjson.JSON;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import java.text.DateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public abstract class BaseTest {
+    public static void main(String[] args) {
+        Quarter quarter = DateUtil.quarterEnum(new Date());
+        DateTime dateTime = DateUtil.beginOfQuarter(new Date());
+        String s = DateUtil.yearAndQuarter(new Date());
+        DateUtil.weekOfYear(DateUtil.parse("2019", "yyyy"));
+        System.out.println(s);
+    }
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/controller/ApiController.java
+++ b/link-api/src/main/java/com/link/controller/ApiController.java
--- a/link-api/src/main/java/com/link/controller/ApiLoginController.java
+++ b/link-api/src/main/java/com/link/controller/ApiLoginController.java
@@ -38,8 +38,8 @@ public class ApiLoginController {
    private TokenService tokenService;
-    @PostMapping("login")
+    @PostMapping("authorize")
-    @ApiOperation("登录")
+    @ApiOperation("用于数据接口访问前的授权操作")
    public Result<Map<String, Object>> login(@RequestBody LoginDTO dto){
        //表单校验
        ValidatorUtils.validateEntity(dto);

--- a/link-api/src/main/java/com/link/dao/OoziejobresultDao.java
+++ b/link-api/src/main/java/com/link/dao/OoziejobresultDao.java
@@ -6,6 +6,7 @@ import com.link.entity.OoziejobresultEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import java.util.List;
 import java.util.Map;
 /**
@@ -18,4 +19,6 @@ import java.util.Map;
 public interface OoziejobresultDao extends BaseDao<OoziejobresultEntity> {
    IPage<OoziejobresultEntity> getPage(IPage<OoziejobresultEntity> page,@Param("params") Map<String, Object> params);
+    List<OoziejobresultEntity> getJoinList(Map<String, Object> params);
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/dto/BdajobConfigDTO.java
+++ b/link-api/src/main/java/com/link/dto/BdajobConfigDTO.java
@@ -26,9 +26,15 @@ public class BdajobConfigDTO implements Serializable {
    @ApiModelProperty("字段名")
    private String fieldName;
+    @ApiModelProperty("字段编码")
+    private String fieldCode;
    @ApiModelProperty("字段描述")
    private String fieldDesc;
+    @ApiModelProperty("字段类型：0-草稿，1-正式")
+    private Integer fieldType;
    @ApiModelProperty("创建时间")
    private Date createTime;
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/dto/OoziejobresultDTO.java
+++ b/link-api/src/main/java/com/link/dto/OoziejobresultDTO.java
@@ -31,5 +31,8 @@ public class OoziejobresultDTO implements Serializable {
 	@ApiModelProperty(value = "创建时间")
 	private String createdtime;
+	@ApiModelProperty(value = "应用id")
+	private String jobId;
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/entity/BdajobConfigEntity.java
+++ b/link-api/src/main/java/com/link/entity/BdajobConfigEntity.java
 package com.link.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,10 +30,18 @@ public class BdajobConfigEntity {
     */
    private String fieldName;
    /**
+     * 字段编码
+     */
+    private String fieldCode;
+    /**
     * 字段描述
     */
    private String fieldDesc;
    /**
+     * 字段类型
+     */
+    private Integer fieldType;
+    /**
     * 创建时间
     */
    private Date createTime;

--- a/link-api/src/main/java/com/link/entity/OoziejobresultEntity.java
+++ b/link-api/src/main/java/com/link/entity/OoziejobresultEntity.java
@@ -35,4 +35,9 @@ public class OoziejobresultEntity {
     * 创建时间
     */
 	private String createdtime;
+	/**
+	 * 应用id
+	 */
+	private String jobId;
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/interceptor/AuthorizationInterceptor.java
+++ b/link-api/src/main/java/com/link/interceptor/AuthorizationInterceptor.java
@@ -61,7 +61,11 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
        //查询token信息
        TokenEntity tokenEntity = tokenService.getByToken(token);
-        if(tokenEntity == null || tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
+//        if(tokenEntity == null || tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
+//            throw new RenException(ErrorCode.TOKEN_INVALID);
+//        }
+        //设置token不过期
+        if(tokenEntity == null){
            throw new RenException(ErrorCode.TOKEN_INVALID);
        }

--- a/link-api/src/main/java/com/link/service/OoziejobresultService.java
+++ b/link-api/src/main/java/com/link/service/OoziejobresultService.java
@@ -7,6 +7,7 @@ import com.link.entity.OoziejobresultEntity;
 import com.link.dto.OoziejobresultDTO;
 import com.link.entity.OoziejobresultEntity;
+import java.util.List;
 import java.util.Map;
 /**
@@ -24,4 +25,11 @@ public interface OoziejobresultService extends CrudService<OoziejobresultEntity,
     */
    PageData<OoziejobresultDTO> getPage(Map<String,Object> params);
+    /**
+     *  @author Mr.Feng
+     *  @date 2020/4/17 11:30
+     *  @description 连接查询
+     */
+    List<OoziejobresultDTO> getJoinList(Map<String,Object> params);
 }
\ No newline at end of file
--- a/link-api/src/main/java/com/link/service/impl/AgentnodeServiceImpl.java
+++ b/link-api/src/main/java/com/link/service/impl/AgentnodeServiceImpl.java
@@ -15,11 +15,10 @@ import com.link.service.AgentnodeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import javax.swing.text.ComponentView;
 import java.util.Map;
 /**
- * 
- *
 * @author Mr.Feng zhijian.feng@hrtuoyu.com
 * @since 1.0.0 2020-04-13
 */
@@ -27,13 +26,15 @@ import java.util.Map;
 public class AgentnodeServiceImpl extends CrudServiceImpl<AgentnodeDao, AgentnodeEntity, AgentnodeDTO> implements AgentnodeService {
    @Override
-    public QueryWrapper<AgentnodeEntity> getWrapper(Map<String, Object> params){
+    public QueryWrapper<AgentnodeEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get("id");
+        String id = (String) params.get("id");
        String name = Convert.toStr(params.get("name"));
+        String nodeIds = Convert.toStr(params.get("nodeIds"));
        QueryWrapper<AgentnodeEntity> wrapper = new QueryWrapper<>();
        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
-        wrapper.eq(StrUtil.isNotBlank(name),"name",name);
+        wrapper.eq(StrUtil.isNotBlank(name), "name", name);
+        wrapper.inSql(StrUtil.isNotBlank(nodeIds), "id", nodeIds);
        return wrapper;
    }

--- a/link-api/src/main/java/com/link/service/impl/BdajobConfigServiceImpl.java
+++ b/link-api/src/main/java/com/link/service/impl/BdajobConfigServiceImpl.java
 package com.link.service.impl;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.link.common.service.impl.CrudServiceImpl;
@@ -28,10 +29,16 @@ public class BdajobConfigServiceImpl extends CrudServiceImpl<BdajobConfigDao, Bd
    public QueryWrapper<BdajobConfigEntity> getWrapper(Map<String, Object> params) {
        String id = (String) params.get("id");
        String jobId = Convert.toStr(params.get("jobId"));
+        String[] fieldCodeArr = (String[]) params.get("fieldCodeArr");
+        Integer fieldType = Convert.toInt(params.get("fieldType"));
        QueryWrapper<BdajobConfigEntity> wrapper = new QueryWrapper<>();
        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
        wrapper.eq(StrUtil.isNotBlank(jobId), "job_id", jobId);
+        if (ArrayUtil.isNotEmpty(fieldCodeArr)) {
+            wrapper.in("field_code", fieldCodeArr);
+        }
+        wrapper.eq(fieldType != null, "field_type", fieldType);
        return wrapper;
    }

--- a/link-api/src/main/java/com/link/service/impl/OoziejobresultServiceImpl.java
+++ b/link-api/src/main/java/com/link/service/impl/OoziejobresultServiceImpl.java
 package com.link.service.impl;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.link.common.constant.Constant;
 import com.link.common.page.PageData;
 import com.link.common.service.impl.CrudServiceImpl;
+import com.link.common.utils.ConvertUtils;
 import com.link.dao.OoziejobresultDao;
 import com.link.dto.OoziejobresultDTO;
 import com.link.entity.OoziejobresultEntity;
@@ -16,6 +18,7 @@ import com.link.service.OoziejobresultService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import java.util.List;
 import java.util.Map;
 /**
@@ -41,4 +44,10 @@ public class OoziejobresultServiceImpl extends CrudServiceImpl<OoziejobresultDao
        IPage<OoziejobresultEntity> page = baseDao.getPage(getPage(params, "createdtime", false), params);
        return getPageData(page, OoziejobresultDTO.class);
    }
+    @Override
+    public List<OoziejobresultDTO> getJoinList(Map<String, Object> params) {
+        List<OoziejobresultEntity> entityList = baseDao.getJoinList(params);
+        return ConvertUtils.sourceToTarget(entityList,OoziejobresultDTO.class);
+    }
 }
\ No newline at end of file
--- a/link-api/src/main/resources/application.yml
+++ b/link-api/src/main/resources/application.yml
@@ -4,7 +4,7 @@ server:
    uri-encoding: UTF-8
    max-threads: 1000
    min-spare-threads: 30
-  port: 8081
+  port: 8090
  servlet:
    context-path: /link-api

--- a/link-api/src/main/resources/mapper/OoziejobresultDao.xml
+++ b/link-api/src/main/resources/mapper/OoziejobresultDao.xml
@@ -6,7 +6,7 @@
    <select id="getPage" resultType="com.link.entity.OoziejobresultEntity">
        select t.*
        from ooziejobresult t
-        left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.id
+        left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.nodeid
        <where>
            <if test="params != null and params.nodeId != null and params.nodeId != ''">
                and t.nodeid = #{params.nodeId}
@@ -23,5 +23,39 @@
        </where>
    </select>
+    <select id="getJoinList" resultType="com.link.entity.OoziejobresultEntity">
+        select t.*,
+        ooziejob.jobid jobId
+        from ooziejobresult t
+        left join ooziejob ooziejob on t.apppath = ooziejob.path and t.nodeid = ooziejob.nodeid
+        <where>
+            <if test="nodeId != null and nodeId != ''">
+                and t.nodeid = #{nodeId}
+            </if>
+            <if test="jobId != null and jobId != ''">
+                and ooziejob.jobid = #{jobId}
+            </if>
+            <if test="beginTime != null and beginTime != ''">
+                and t.createdtime &gt;= #{beginTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and t.createdtime &lt;= #{endTime}
+            </if>
+            <if test="nodeIds != null and nodeIds != ''">
+                and t.nodeid in (${nodeIds})
+            </if>
+            <if test="jobIdList != null and jobIdList.size > 0">
+                and ooziejob.jobid in
+                <foreach collection="jobIdList" item="jobId" open="(" close=")" separator=",">
+                    #{jobId}
+                </foreach>
+            </if>
+        </where>
+        <if test="orderBy != null and orderBy != ''">
+            order by ${orderBy}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
        <hutool.version>5.1.2</hutool.version>
        <gson.version>2.8.6</gson.version>
        <jsoup.version>1.11.3</jsoup.version>
-        <knife4j.version>2.0.1</knife4j.version>
+        <knife4j.version>2.0.2</knife4j.version>
        <lombok.version>1.18.4</lombok.version>
        <docker.plugin.version>1.1.1</docker.plugin.version>
    </properties>