Browse Source

2.0-任务查询bug-去掉shareKey的字段检验

master
陈裕财 2 years ago
parent
commit
f4b9a8a6db
  1. 3
      .idea/xm-backend.iml
  2. 41
      xm-bootstrap/xm-bootstrap.iml
  3. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  4. 38
      xm-core/src/test/java/com/xm/core/service/TestXmGroupService.java
  5. 38
      xm-core/src/test/java/com/xm/core/service/TestXmGroupStateService.java
  6. 38
      xm-core/src/test/java/com/xm/core/service/TestXmGroupUserService.java

3
.idea/xm-backend.iml

@ -115,7 +115,7 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" />
@ -124,7 +124,6 @@
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:2.0.0-RELEASE" level="project" />

41
xm-bootstrap/xm-bootstrap.iml

@ -10,6 +10,25 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="xm-core" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client-cloud:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" />
<orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-client:5.4.2" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
<orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:content-type:2.1" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.4.2" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.4.2" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-cloud-starter:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-cloud-starter:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.0" level="project" />
@ -94,25 +113,6 @@
<orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.1" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.4.1" level="project" />
<orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client-cloud:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" />
<orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-client:5.4.2" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
<orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:content-type:2.1" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.4.2" level="project" />
<orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.1.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.4.2" level="project" />
<orderEntry type="module" module-name="xm-core" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" />
@ -199,7 +199,7 @@
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-dao-mybatis:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" /> <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.3.1" level="project" />
@ -208,7 +208,6 @@
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" /> <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.10" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.7" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-spring-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-swagger-enhance:2.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:2.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-tomcat-enhance:2.0.0-RELEASE" level="project" />

2
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -456,7 +456,7 @@ public class XmTaskController {
@ApiOperation( value = "查询互联网开放的任务的信息详情,免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}") @ApiOperation( value = "查询互联网开放的任务的信息详情,免登录",notes="taskDetail,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
@ApiEntityParams(value = XmTask.class,props = {"id","shareKey"})
@ApiEntityParams(value = XmTask.class,props = {"id"})
@ApiResponses({ @ApiResponses({
@ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") @ApiResponse(code = 200,response= XmTask.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
}) })

38
xm-core/src/test/java/com/xm/core/service/TestXmGroupService.java

@ -0,0 +1,38 @@
package com.xm.core.service;
import java.util.*;
import java.text.SimpleDateFormat;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextHierarchy;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.mdp.core.utils.BaseUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.xm.core.service.XmGroupService;
import com.xm.core.entity.XmGroup;
import org.springframework.boot.test.context.SpringBootTest;
/**
* @author code-gen
* @since 2023-11-10
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestXmGroupService {
@Autowired
XmGroupService xmGroupService;
/**
* 新增一条数据
***/
@Test
public void insert() {
Map<String,Object> p=BaseUtils.map("id","PS0R","groupName","zjya","projectId","q50f","pgTypeId","qIVN","pgTypeName","v2Cg","leaderUserid","uhyX","leaderUsername","OfYq","ctime",new Date("2023-11-10 16:33:3"),"ltime",new Date("2023-11-10 16:33:3"),"productId","c40j","branchId","SOEs","pgClass","X","pgroupId","p0dQ","lvl",1521,"pidPaths","J5w5","isTpl","e","assUserid","9LlN","assUsername","emuI","childrenCnt",1697,"userCnt",8957,"qxCode","MnDD","calcWorkload","E","ntype","K","crowBranchId","DYQO","crowBranchName","lMyS","isCrow","9");
XmGroup xmGroup=BaseUtils.fromMap(p,XmGroup.class);
xmGroupService.save(xmGroup);
//Assert.assertEquals(1, result);
}
}

38
xm-core/src/test/java/com/xm/core/service/TestXmGroupStateService.java

@ -0,0 +1,38 @@
package com.xm.core.service;
import java.util.*;
import java.text.SimpleDateFormat;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextHierarchy;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.mdp.core.utils.BaseUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.xm.core.service.XmGroupStateService;
import com.xm.core.entity.XmGroupState;
import org.springframework.boot.test.context.SpringBootTest;
/**
* @author code-gen
* @since 2023-11-10
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestXmGroupStateService {
@Autowired
XmGroupStateService xmGroupStateService;
/**
* 新增一条数据
***/
@Test
public void insert() {
Map<String,Object> p=BaseUtils.map("planStartTime",new Date("2023-11-10 16:33:3"),"planEndTime",new Date("2023-11-10 16:33:3"),"actStartTime",new Date("2023-11-10 16:33:3"),"actEndTime",new Date("2023-11-10 16:33:3"),"planWorkload",1073.08,"actWorkload",7946.42,"planCostAmount",2655.46,"actCostAmount",2094.76,"finishRate",3413.5,"demandRate",7640.24,"designRate",9242.96,"devRate",8315.16,"uatRate",3971.94,"sitRate",2932.46,"ctime",new Date("2023-11-10 16:33:3"),"calcTime",new Date("2023-11-10 16:33:3"),"planWorkhours",756.86,"planWorkerCnt",6995.62,"closedBugs",939,"activeBugs",7671,"confirmedBugs",9137,"resolvedBugs",5801,"testCases",9705,"execCases",915,"designCases",1329,"finishCases",3450,"iterationCnt",1548,"taskCnt",7039,"finishTaskCnt",901,"bizDate","n1xJ","bugCnt",1553,"groupId","ki4Q","projectId","refF","projectName","8r4q","groupName","qmay");
XmGroupState xmGroupState=BaseUtils.fromMap(p,XmGroupState.class);
xmGroupStateService.save(xmGroupState);
//Assert.assertEquals(1, result);
}
}

38
xm-core/src/test/java/com/xm/core/service/TestXmGroupUserService.java

@ -0,0 +1,38 @@
package com.xm.core.service;
import java.util.*;
import java.text.SimpleDateFormat;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextHierarchy;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import com.mdp.core.utils.BaseUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.xm.core.service.XmGroupUserService;
import com.xm.core.entity.XmGroupUser;
import org.springframework.boot.test.context.SpringBootTest;
/**
* @author code-gen
* @since 2023-11-10
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestXmGroupUserService {
@Autowired
XmGroupUserService xmGroupUserService;
/**
* 新增一条数据
***/
@Test
public void insert() {
Map<String,Object> p=BaseUtils.map("joinTime",new Date("2023-11-10 16:33:3"),"groupId","i297","userid","ztct","username","FNbW","outTime",new Date("2023-11-10 16:33:3"),"status","f","obranchId","1zPT","isPri","F","seqNo",5179,"projectId","Y968","productId","80g5","pgClass","G","obranchName","R9eR");
XmGroupUser xmGroupUser=BaseUtils.fromMap(p,XmGroupUser.class);
xmGroupUserService.save(xmGroupUser);
//Assert.assertEquals(1, result);
}
}
Loading…
Cancel
Save