From 8931d36c1a454dc52777b532f8935ba69319b9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 4 Oct 2023 01:35:17 +0800 Subject: [PATCH] 2.0 --- .../src/test/java/com/WebSecurityConfig.java | 4 +- .../xm/core/TestXmProjectStateService.java | 48 ------------------- .../TestXmQuestionWorkloadService.java | 33 ------------- .../service/TestXmTaskWorkloadService.java | 33 ------------- .../com/xm/push/TestXmPushMsgService.java | 17 +++---- 5 files changed, 9 insertions(+), 126 deletions(-) delete mode 100644 xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java delete mode 100644 xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java delete mode 100644 xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java diff --git a/xm-core/src/test/java/com/WebSecurityConfig.java b/xm-core/src/test/java/com/WebSecurityConfig.java index 97f90672..5693d7b9 100644 --- a/xm-core/src/test/java/com/WebSecurityConfig.java +++ b/xm-core/src/test/java/com/WebSecurityConfig.java @@ -1,6 +1,6 @@ package com; -import com.mdp.oauth2.client.resource.MdpJwtAuthenticationConverter; +import com.mdp.safe.client.jwt.JwtAuthenticationConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; @@ -19,7 +19,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired - MdpJwtAuthenticationConverter jwtConverter; + JwtAuthenticationConverter jwtConverter; @Autowired diff --git a/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java b/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java deleted file mode 100644 index 153faa93..00000000 --- a/xm-core/src/test/java/com/xm/core/TestXmProjectStateService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.xm.core; - -import com.xm.core.service.XmProjectStateService; -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.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; -import org.springframework.boot.test.context.SpringBootTest; -/** - * XmProjectStateService的测试案例 - * 组织 com.qqkj
- * 顶级模块 oa
- * 大模块 xm
- * 小模块
- * 表 XM.xm_project_state 项目指标日统计表
- * 实体 XmProjectState
- * 表是指数据库结构中的表,实体是指java类型中的实体类
- * 当前实体所有属性名:
- * projectId,bizDate,totalFileCnt,totalBugCnt,totalTaskCnt,totalBudgetNouserAmount,projectName,id,totalStaffCnt,calCtime,calStatus,totalCostNouserAmount,totalClosedBugCnt,totalResolvedBugCnt,totalCompleteTaskCnt,totalPhaseCnt,totalCompletePhaseCnt,totalNeedPayAmount,totalFinishPayAmount,totalNeedColAmount,totalFinishColAmount,totalCostUserAmount,totalBudgetIuserAmount,totalPlanWorkload,totalRiskCnt,totalCompleteRiskCnt,branchId,branchName,totalBudgetOuserAmount,totalCompleteWorkload,todayNewBugCnt,todayResolvedBugCnt,todayClosedBugCnt,todayNewTaskCnt,todayCompleteTaskCnt,todayNewPhaseCnt,todayCompletePhaseCnt,todayNewStaffCnt,todaySubStaffCnt,todayNewPlanWorkload,todayNewActWorkload,todayNeedColAmount,todayFinishColAmount,todayCostUserAmount,todayCostIuserAmount,todayCostOuserAmount,todayCostNouserAmount,totalCostIuserAmount,totalCostOuserAmount,todayNeedPayAmount,todayFinishPayAmount,todayNewRiskCnt,todayCompleteRiskCnt,todayNewFileCnt,totalProgress,totalActiveBugCnt,totalConfirmedBugCnt,projectStatus,totalActWorkload,totalActOutWorkload,totalActInnerWorkload,totalTaskBudgetCostAt,totalTaskOutCnt,totalNeedPayCnt,totalFinishPayCnt,todayConfirmedBugCnt,todayActiveBugCnt,totalFinishPayUserCnt,totalNeedPayUserCnt,todayNeedPayUserCnt,todayFinishPayUserCnt;
- * 当前表的所有字段名:
- * project_id,biz_date,total_file_cnt,total_bug_cnt,total_task_cnt,total_budget_nouser_amount,project_name,id,total_staff_cnt,cal_ctime,cal_status,total_cost_nouser_amount,total_closed_bug_cnt,total_resolved_bug_cnt,total_complete_task_cnt,total_phase_cnt,total_complete_phase_cnt,total_need_pay_amount,total_finish_pay_amount,total_need_col_amount,total_finish_col_amount,total_cost_user_amount,total_budget_iuser_amount,total_plan_workload,total_risk_cnt,total_complete_risk_cnt,branch_id,branch_name,total_budget_ouser_amount,total_complete_workload,today_new_bug_cnt,today_resolved_bug_cnt,today_closed_bug_cnt,today_new_task_cnt,today_complete_task_cnt,today_new_phase_cnt,today_complete_phase_cnt,today_new_staff_cnt,today_sub_staff_cnt,today_new_plan_workload,today_new_act_workload,today_need_col_amount,today_finish_col_amount,today_cost_user_amount,today_cost_iuser_amount,today_cost_ouser_amount,today_cost_nouser_amount,total_cost_iuser_amount,total_cost_ouser_amount,today_need_pay_amount,today_finish_pay_amount,today_new_risk_cnt,today_complete_risk_cnt,today_new_file_cnt,total_progress,total_active_bug_cnt,total_confirmed_bug_cnt,project_status,total_act_workload,total_act_out_workload,total_act_inner_workload,total_task_budget_cost_at,total_task_out_cnt,total_need_pay_cnt,total_finish_pay_cnt,today_confirmed_bug_cnt,today_active_bug_cnt,total_finish_pay_user_cnt,total_need_pay_user_cnt,today_need_pay_user_cnt,today_finish_pay_user_cnt;
- * 当前主键(包括多主键):
- * id;
- ***/ - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestXmProjectStateService { - - @Autowired - XmProjectStateService xmProjectStateService; - @Test - public void loadTasksToXmProjectState( ) { - String projectId="qqkj-test-001"; - this.xmProjectStateService.loadTasksToXmProjectState(projectId); - } - @Test - public void loadTasksSettleToXmProjectState( ) { - String projectId="qqkj-test-001"; - this.xmProjectStateService.loadTasksSettleToXmProjectState(projectId); - } -} diff --git a/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java b/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java deleted file mode 100644 index ca4d593c..00000000 --- a/xm-core/src/test/java/com/xm/core/service/TestXmQuestionWorkloadService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.xm.core.service; - -import java.util.*; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -/** - * @author code-gen - * @since 2023-10-3 - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestXmQuestionWorkloadService { - - @Autowired - XmQuestionWorkloadService xmQuestionWorkloadService; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("userid","XGRb","username","jlKn","ctime",new Date("2023-10-03 4:17:28"),"bugId","h983","cuserid","","bizDate","wlIs","wstatus","v","remark","367b","ttype","F","id",6088,"sbillId","m4eW","stime",new Date("2023-10-03 4:17:28"),"sstatus","i","amt",6612.85,"samt",6616,"workload",459.03,"projectId","oaRb"); - XmQuestionWorkload xmQuestionWorkload=BaseUtils.fromMap(p,XmQuestionWorkload.class); - xmQuestionWorkloadService.save(xmQuestionWorkload); - //Assert.assertEquals(1, result); - } - -} diff --git a/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java b/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java deleted file mode 100644 index b794a8fd..00000000 --- a/xm-core/src/test/java/com/xm/core/service/TestXmTaskWorkloadService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.xm.core.service; - -import java.util.*; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.mdp.core.utils.BaseUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -/** - * @author code-gen - * @since 2023-10-3 - */ -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class TestXmTaskWorkloadService { - - @Autowired - XmTaskWorkloadService xmTaskWorkloadService; - - /** - * 新增一条数据 - ***/ - @Test - public void insert() { - Map p=BaseUtils.map("userid","7k10","username","S6BU","ctime",new Date("2023-10-03 4:17:30"),"taskId","39Y2","cuserid","5x3D","bizDate","x519","wstatus","6","remark","T004","ttype","Vz21","id","pQuQ","stime",new Date("2023-10-03 4:17:30"),"sstatus","4","workload",1131.99,"rworkload",3945.39,"cusername","iR4u","projectId","WnLi","branchId","wBMj","ubranchId","5NwO","sbillId","0Dbd","detailId","SlWH","menuId","OFIs","productId","Bc6z","caseId","hKdt","planId","P7Sy","bugId","l4Sz","bizType","6"); - XmTaskWorkload xmTaskWorkload=BaseUtils.fromMap(p,XmTaskWorkload.class); - xmTaskWorkloadService.save(xmTaskWorkload); - //Assert.assertEquals(1, result); - } - -} diff --git a/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java index cc615342..1a3300a4 100644 --- a/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java +++ b/xm-core/src/test/java/com/xm/push/TestXmPushMsgService.java @@ -1,19 +1,16 @@ package com.xm.push; -import java.util.*; - -import org.junit.Assert; +import com.xm.core.service.push.XmPushMsgService; 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.push.XmPushMsgService; -import com.mdp.mybatis.PageUtils; -import com.github.pagehelper.Page; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * XmProjectStateService的测试案例 * 组织 com.qqkj