diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java index 66c9baf..5eab3c6 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java @@ -212,21 +212,16 @@ public class FormDataController { **/ @RequestMapping(value="/processApprova",method=RequestMethod.POST) public Map processApprova( @RequestBody Map flowVars){ - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); - try{ - this.formDataService.processApprova(flowVars); logger.debug("procInstId====="+flowVars.get("procInstId")); + return Result.ok(); }catch (BizException e) { - tips=e.getTips(); logger.error("执行异常",e); + return Result.error(e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); logger.error("执行异常",e); + return Result.error(e.getMessage()); } - m.put("tips", tips); - return m; } } diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java index db4c278..37fd51a 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataTagController.java @@ -123,50 +123,6 @@ public class FormDataTagController { } } - @ApiOperation( value = "form_data_tag-批量删除",notes=" ") - @ApiResponses({ - @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") - }) - @RequestMapping(value="/batchDel",method=RequestMethod.POST) - public Result batchDelFormDataTag(@RequestBody List formDataTags) { - User user= LoginUtils.getCurrentUserInfo(); - try{ - if(formDataTags.size()<=0){ - return Result.error("formDataTag-batchDel-data-err-0","请上送待删除数据列表"); - } - List datasDb=formDataTagService.listByIds(formDataTags.stream().map(i-> i.getId() ).collect(Collectors.toList())); - - List can=new ArrayList<>(); - List no=new ArrayList<>(); - for (FormDataTag data : datasDb) { - if(true){ - can.add(data); - }else{ - no.add(data); - } - } - List msgs=new ArrayList<>(); - if(can.size()>0){ - formDataTagService.removeByIds(can); - msgs.add(LangTips.transMsg("del-ok-num","成功删除%s条数据.",can.size())); - } - - if(no.size()>0){ - msgs.add(LangTips.transMsg("not-allow-del-num","以下%s条数据不能删除:【%s】",no.size(),no.stream().map(i-> i.getId() ).collect(Collectors.joining(",")))); - } - if(can.size()>0){ - return Result.ok(msgs.stream().collect(Collectors.joining())); - }else { - return Result.error(msgs.stream().collect(Collectors.joining())); - } - }catch (BizException e) { - return Result.error(e); - }catch (Exception e) { - return Result.error(e); - } - - - } @ApiOperation( value = "form_data_tag-根据主键查询一条数据",notes=" ") @ApiResponses({ @@ -192,7 +148,6 @@ public class FormDataTagController { @RequestMapping(value="/batchInsertOrDeleteTags",method=RequestMethod.POST) public Map batchDelFormDataTag(@RequestBody List tagsVos) { Map m = new HashMap<>(); - Tips tips=new Tips("成功更新标签"); try{ if(tagsVos==null) { return Result.error("params-required","请上送参数列表"); @@ -217,14 +172,14 @@ public class FormDataTagController { formDataTagService.batchInsertOrDeleteTags(dataId,tags); } } + return Result.ok(); }catch (BizException e) { - tips=e.getTips(); logger.error("",e); + return Result.error(e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); logger.error("",e); + return Result.error(e.getMessage()); } - m.put("tips", tips); - return m; + } } diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java index 2189ae7..88025f4 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDefController.java @@ -84,35 +84,29 @@ public class FormDefController { } @RequestMapping(value="/addFormDefAndFields") public Map addFormDefAndFields(@RequestBody FormDefVo formDefVo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); try{ formDefService.addFormDefAndFields(formDefVo); + return Result.ok(); }catch (BizException e) { - tips=e.getTips(); logger.error("执行异常",e); + return Result.error(e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); logger.error("执行异常",e); + return Result.error(e.getMessage()); } - m.put("tips", tips); - return m; } @RequestMapping(value="/editFormDefAndFields") public Map editFormDefAndFields(@RequestBody FormDefVo formDefVo) { - Map m = new HashMap<>(); - Tips tips=new Tips("成功新增一条数据"); try{ formDefService.editFormDefAndFields(formDefVo); + return Result.ok(); }catch (BizException e) { - tips=e.getTips(); logger.error("执行异常",e); + return Result.error(e); }catch (Exception e) { - tips.setFailureMsg(e.getMessage()); logger.error("执行异常",e); + return Result.error(e.getMessage()); } - m.put("tips", tips); - return m; } @ApiOperation( value = "表单定义-删除",notes=" ") @ApiResponses({ @@ -122,12 +116,11 @@ public class FormDefController { public Result delFormDef(@RequestBody FormDef formDef){ Map p=new HashMap<>(); p.put("formId", formDef.getId()); - long count=formDataService.selectOne("countByFormId", p); + long count=formDataService.countByFormId(formDef.getId()); if(count>0) { - tips.setFailureMsg("has-form-data-001","该表单下还有"+count+"条数据，请先删除数据 后删除表单"); + return Result.error("has-form-data-001","该表单下还有%s条数据，请先删除数据 后删除表单",count); }else { int i =formDefService.deleteByPk(formDef); - tips.setOkMsg("成功删除"+i+"张表单"); } formDefService.removeById(formDef); return Result.ok("del-ok","删除成功！"); diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java index fb40372..a811e42 100644 --- a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java +++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java @@ -393,5 +393,11 @@ public class FormDataService extends BaseService { return null; } } + + public long countByFormId(String formId) { + QueryWrapper qw=new QueryWrapper<>(); + qw.eq("form_id",formId); + return super.count(qw); + } } diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml deleted file mode 100644 index 708c1ad..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataMapper.xml +++ /dev/null @@ -1,389 +0,0 @@ - - - - - - - - - and (res.id) in - - ( #{item}) - - - and res.cuserid in - - #{item} - - - and res.flow_state in - - #{item} - - - and res.deptid in - - #{item} - - - and res.create_time between #{fromStartTime} and #{toStartTime} - and res.cuserid in - - #{item} - - - and res.userid in - - #{item} - - - and exists ( select 1 from form.form_data_tag tag where tag.data_id = res.id and tag.tag_id in - - #{item} - ) - - and exists(select 1 from form.form_data_process_approva app where app.proc_inst_id=#{procInstId} and res.id=app.form_data_id ) - - - - - - update form_data - set tag_ids=#{tagIds},tag_names=#{tagNames} where id=#{id} - - - - - - - update form_data set - two = #{item.two}, - three = #{item.three}, - four = #{item.four}, - five = #{item.five}, - six = #{item.six}, - seven = #{item.seven}, - eight = #{item.eight}, - nine = #{item.nine}, - ten = #{item.ten}, - last_time = #{item.lastTime}, - one = #{item.one}, - zero = #{item.zero}, - remark = #{item.remark}, - form_id = #{item.formId}, - userid = #{item.userid}, - eleven = #{item.eleven}, - twelve = #{item.twelve}, - thirteen = #{item.thirteen}, - fourteen = #{item.fourteen}, - fifteen = #{item.fifteen}, - attachment_urls = #{item.attachmentUrls}, - attachment_names = #{item.attachmentNames}, - branch_id = #{item.branchId}, - biz_key = #{item.bizKey}, - deptid = #{item.deptid}, - create_time = #{item.createTime}, - dqx_code = #{item.dqxCode}, - cuserid = #{item.cuserid}, - tag_ids = #{item.tagIds}, - tag_names = #{item.tagNames}, - cusername = #{item.cusername}, - dept_name = #{item.deptName} - where id = #{item.id} - - - - - - update form_data res,form_data_process_approva app set res.flow_state=#{flowState},res.last_time=now(),app.flow_state=#{flowState},app.flow_last_time=now() - ,app.end_time=now() - where res.form_id=#{formId} and app.form_data_id=res.id and app.proc_inst_id=#{procInstId} - - - - update form_data res - - - - where EXISTS ( SELECT 1 FROM form_data_process_approva a where a.proc_inst_id = #{procInstId} AND a.form_data_id = res.id ) - - - - - - - - - - - - - - - - - - - - - insert into form_data( - - ) values ( - #{id},#{two},#{three},#{four},#{five},#{six},#{seven},#{eight},#{nine},#{ten},#{lastTime},#{one},#{zero},#{remark},#{formId},#{userid},#{eleven},#{twelve},#{thirteen},#{fourteen},#{fifteen},#{attachmentUrls},#{attachmentNames},#{branchId},#{bizKey},#{deptid},#{flowState},#{createTime},#{dqxCode},#{cuserid},#{tagIds},#{tagNames},#{cusername},#{deptName} - ) - - - - - delete from form_data res - - - - - - - - delete from form_data - where id = #{id} - - - - - update form_data - - - - where id = #{id} - - - - - update form_data - - - - where id = #{id} - - - - - - - - update form_data - set - - where id = #{item.id} - - - - - - update form_data - - - - where (id) in - - ( #{item}) - - - - - delete from form_data - where - (id) in - - ( #{item.id} ) - - - - - - - id,two,three,four,five,six,seven,eight,nine,ten,last_time,one,zero,remark,form_id,userid,eleven,twelve,thirteen,fourteen,fifteen,attachment_urls,attachment_names,branch_id,biz_key,deptid,flow_state,create_time,dqx_code,cuserid,tag_ids,tag_names,cusername,dept_name - - - - - and res.id = #{id} - and res.two = #{two} - and res.three = #{three} - and res.four = #{four} - and res.five = #{five} - and res.six = #{six} - and res.seven = #{seven} - and res.eight = #{eight} - and res.nine = #{nine} - and res.ten = #{ten} - and date_format(res.last_time,'%Y-%m-%d') = date_format(#{lastTime},'%Y-%m-%d') - and res.one = #{one} - and res.zero = #{zero} - and res.remark = #{remark} - and res.form_id = #{formId} - and res.userid = #{userid} - and res.eleven = #{eleven} - and res.twelve = #{twelve} - and res.thirteen = #{thirteen} - and res.fourteen = #{fourteen} - and res.fifteen = #{fifteen} - and res.attachment_urls = #{attachmentUrls} - and res.attachment_names = #{attachmentNames} - and res.branch_id = #{branchId} - and res.biz_key = #{bizKey} - and res.deptid = #{deptid} - and res.flow_state = #{flowState} - and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') - and res.dqx_code = #{dqxCode} - and res.cuserid = #{cuserid} - and res.tag_ids = #{tagIds} - and res.tag_names = #{tagNames} - and res.cusername = #{cusername} - and res.dept_name = #{deptName} - - - - two = #{two}, - three = #{three}, - four = #{four}, - five = #{five}, - six = #{six}, - seven = #{seven}, - eight = #{eight}, - nine = #{nine}, - ten = #{ten}, - last_time = #{lastTime}, - one = #{one}, - zero = #{zero}, - remark = #{remark}, - form_id = #{formId}, - userid = #{userid}, - eleven = #{eleven}, - twelve = #{twelve}, - thirteen = #{thirteen}, - fourteen = #{fourteen}, - fifteen = #{fifteen}, - attachment_urls = #{attachmentUrls}, - attachment_names = #{attachmentNames}, - branch_id = #{branchId}, - biz_key = #{bizKey}, - deptid = #{deptid}, - flow_state = #{flowState}, - create_time = #{createTime}, - dqx_code = #{dqxCode}, - cuserid = #{cuserid}, - tag_ids = #{tagIds}, - tag_names = #{tagNames}, - cusername = #{cusername}, - dept_name = #{deptName} - - - two = #{two}, - three = #{three}, - four = #{four}, - five = #{five}, - six = #{six}, - seven = #{seven}, - eight = #{eight}, - nine = #{nine}, - ten = #{ten}, - last_time = #{lastTime}, - one = #{one}, - zero = #{zero}, - remark = #{remark}, - form_id = #{formId}, - userid = #{userid}, - eleven = #{eleven}, - twelve = #{twelve}, - thirteen = #{thirteen}, - fourteen = #{fourteen}, - fifteen = #{fifteen}, - attachment_urls = #{attachmentUrls}, - attachment_names = #{attachmentNames}, - branch_id = #{branchId}, - biz_key = #{bizKey}, - deptid = #{deptid}, - flow_state = #{flowState}, - create_time = #{createTime}, - dqx_code = #{dqxCode}, - cuserid = #{cuserid}, - tag_ids = #{tagIds}, - tag_names = #{tagNames}, - cusername = #{cusername}, - dept_name = #{deptName}, - - - - two = #{item.two}, - three = #{item.three}, - four = #{item.four}, - five = #{item.five}, - six = #{item.six}, - seven = #{item.seven}, - eight = #{item.eight}, - nine = #{item.nine}, - ten = #{item.ten}, - last_time = #{item.lastTime}, - one = #{item.one}, - zero = #{item.zero}, - remark = #{item.remark}, - form_id = #{item.formId}, - userid = #{item.userid}, - eleven = #{item.eleven}, - twelve = #{item.twelve}, - thirteen = #{item.thirteen}, - fourteen = #{item.fourteen}, - fifteen = #{item.fifteen}, - attachment_urls = #{item.attachmentUrls}, - attachment_names = #{item.attachmentNames}, - branch_id = #{item.branchId}, - biz_key = #{item.bizKey}, - deptid = #{item.deptid}, - flow_state = #{item.flowState}, - create_time = #{item.createTime}, - dqx_code = #{item.dqxCode}, - cuserid = #{item.cuserid}, - tag_ids = #{item.tagIds}, - tag_names = #{item.tagNames}, - cusername = #{item.cusername}, - dept_name = #{item.deptName} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataProcessApprovaMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataProcessApprovaMapper.xml deleted file mode 100644 index 6521631..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataProcessApprovaMapper.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into FORM.form_data_process_approva( - - ) values ( - #{branchId},#{procInstId},#{agree},#{assignee},#{mainTitle},#{actId},#{taskName},#{commentMsg},#{id},#{eventName},#{bizKey},#{modelKey},#{flowLastTime},#{flowBranchId},#{flowState},#{startUserid},#{procDefId},#{modelName},#{formId},#{formDataId} - ) - - - - - delete from FORM.form_data_process_approva res - - - - - - - - delete from FORM.form_data_process_approva - where id = #{id} - - - - - update FORM.form_data_process_approva - - - - where id = #{id} - - - - - update FORM.form_data_process_approva - - - - where id = #{id} - - - - - - - - update FORM.form_data_process_approva - set - - where id = #{item.id} - - - - - delete from FORM.form_data_process_approva - where id in - - #{item.id } - - - - - - - branch_id,proc_inst_id,agree,assignee,main_title,act_id,task_name,comment_msg,id,event_name,biz_key,model_key,flow_last_time,flow_branch_id,flow_state,start_userid,proc_def_id,model_name,form_id,form_data_id - - - - - and res.branch_id = #{branchId} - and res.proc_inst_id = #{procInstId} - and res.agree = #{agree} - and res.assignee = #{assignee} - and res.main_title = #{mainTitle} - and res.act_id = #{actId} - and res.task_name = #{taskName} - and res.comment_msg = #{commentMsg} - and res.id = #{id} - and res.event_name = #{eventName} - and res.biz_key = #{bizKey} - and res.model_key = #{modelKey} - and TO_CHAR(res.flow_last_time,'YYYY-MM-DD') = TO_CHAR(#{flowLastTime},'YYYY-MM-DD') - and res.flow_branch_id = #{flowBranchId} - and res.flow_state = #{flowState} - and res.start_userid = #{startUserid} - and res.proc_def_id = #{procDefId} - and res.model_name = #{modelName} - and res.form_id = #{formId} - and res.form_data_id = #{formDataId} - - - - branch_id = #{branchId}, - proc_inst_id = #{procInstId}, - agree = #{agree}, - assignee = #{assignee}, - main_title = #{mainTitle}, - act_id = #{actId}, - task_name = #{taskName}, - comment_msg = #{commentMsg}, - event_name = #{eventName}, - biz_key = #{bizKey}, - model_key = #{modelKey}, - flow_last_time = #{flowLastTime}, - flow_branch_id = #{flowBranchId}, - flow_state = #{flowState}, - start_userid = #{startUserid}, - proc_def_id = #{procDefId}, - model_name = #{modelName}, - form_id = #{formId}, - form_data_id = #{formDataId} - - - branch_id = #{branchId}, - proc_inst_id = #{procInstId}, - agree = #{agree}, - assignee = #{assignee}, - main_title = #{mainTitle}, - act_id = #{actId}, - task_name = #{taskName}, - comment_msg = #{commentMsg}, - event_name = #{eventName}, - biz_key = #{bizKey}, - model_key = #{modelKey}, - flow_last_time = #{flowLastTime}, - flow_branch_id = #{flowBranchId}, - flow_state = #{flowState}, - start_userid = #{startUserid}, - proc_def_id = #{procDefId}, - model_name = #{modelName}, - form_id = #{formId}, - form_data_id = #{formDataId}, - - - - branch_id = #{item.branchId}, - proc_inst_id = #{item.procInstId}, - agree = #{item.agree}, - assignee = #{item.assignee}, - main_title = #{item.mainTitle}, - act_id = #{item.actId}, - task_name = #{item.taskName}, - comment_msg = #{item.commentMsg}, - event_name = #{item.eventName}, - biz_key = #{item.bizKey}, - model_key = #{item.modelKey}, - flow_last_time = #{item.flowLastTime}, - flow_branch_id = #{item.flowBranchId}, - flow_state = #{item.flowState}, - start_userid = #{item.startUserid}, - proc_def_id = #{item.procDefId}, - model_name = #{item.modelName}, - form_id = #{item.formId}, - form_data_id = #{item.formDataId} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataTagMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataTagMapper.xml deleted file mode 100644 index 7073411..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDataTagMapper.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - and (res.id) in - - ( #{item}) - - - - - - - - - - - - - - - - - - - - - - - - - - insert into form_data_tag( - - ) values ( - #{dataId},#{tagId},#{tagName},#{id},#{createTime} - ) - - - - - delete from form_data_tag res - - - - - - - - delete from form_data_tag - where id = #{id} - - - - - update form_data_tag - - - - where id = #{id} - - - - - update form_data_tag - - - - where id = #{id} - - - - - - - - update form_data_tag - set - - where id = #{item.id} - - - - - - update form_data_tag - - - - where (id) in - - ( #{item}) - - - - - delete from form_data_tag - where - (id) in - - ( #{item.id} ) - - - - - - - data_id,tag_id,tag_name,id,create_time - - - - - and res.data_id = #{dataId} - and res.tag_id = #{tagId} - and res.tag_name = #{tagName} - and res.id = #{id} - and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') - - - - data_id = #{dataId}, - tag_id = #{tagId}, - tag_name = #{tagName}, - create_time = #{createTime} - - - data_id = #{dataId}, - tag_id = #{tagId}, - tag_name = #{tagName}, - create_time = #{createTime}, - - - - data_id = #{item.dataId}, - tag_id = #{item.tagId}, - tag_name = #{item.tagName}, - create_time = #{item.createTime} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml deleted file mode 100644 index 581b16f..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefMapper.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - and (res.id) in - - ( #{item}) - - - and res.category_id in - - #{item} - - - and exists ( select 1 from form.form_def_tag tag where tag.form_id = res.id and tag.tag_id in - - #{item} - ) - - and res.form_name like #{key} - - - - update FORM.form_def - set tag_ids=#{tagIds},tag_names=#{tagNames} where id=#{id} - - - - - - - - - - - - - - - - - - - - - insert into form_def( - - ) values ( - #{id},#{tableName},#{tableOwner},#{isCreateTable},#{formName},#{userid},#{deptid},#{formType},#{isTemplate},#{bizType},#{ctime},#{branchId},#{categoryId},#{tagIds},#{tagNames},#{username},#{deptName},#{groupsJson},#{pks} - ) - - - - - delete from form_def res - - - - - - - - delete from form_def - where id = #{id} - - - - - update form_def - - - - where id = #{id} - - - - - update form_def - - - - where id = #{id} - - - - - - - - update form_def - set - - where id = #{item.id} - - - - - - update form_def - - - - where (id) in - - ( #{item}) - - - - - delete from form_def - where - (id) in - - ( #{item.id} ) - - - - - - - id,table_name,table_owner,is_create_table,form_name,userid,deptid,form_type,is_template,biz_type,ctime,branch_id,category_id,tag_ids,tag_names,username,dept_name,groups_json,pks - - - - - and res.id = #{id} - and res.table_name = #{tableName} - and res.table_owner = #{tableOwner} - and res.is_create_table = #{isCreateTable} - and res.form_name = #{formName} - and res.userid = #{userid} - and res.deptid = #{deptid} - and res.form_type = #{formType} - and res.is_template = #{isTemplate} - and res.biz_type = #{bizType} - and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') - and res.branch_id = #{branchId} - and res.category_id = #{categoryId} - and res.tag_ids = #{tagIds} - and res.tag_names = #{tagNames} - and res.username = #{username} - and res.dept_name = #{deptName} - and res.groups_json = #{groupsJson} - and res.pks = #{pks} - - - - table_name = #{tableName}, - table_owner = #{tableOwner}, - is_create_table = #{isCreateTable}, - form_name = #{formName}, - userid = #{userid}, - deptid = #{deptid}, - form_type = #{formType}, - is_template = #{isTemplate}, - biz_type = #{bizType}, - ctime = #{ctime}, - branch_id = #{branchId}, - category_id = #{categoryId}, - tag_ids = #{tagIds}, - tag_names = #{tagNames}, - username = #{username}, - dept_name = #{deptName}, - groups_json = #{groupsJson}, - pks = #{pks} - - - table_name = #{tableName}, - table_owner = #{tableOwner}, - is_create_table = #{isCreateTable}, - form_name = #{formName}, - userid = #{userid}, - deptid = #{deptid}, - form_type = #{formType}, - is_template = #{isTemplate}, - biz_type = #{bizType}, - ctime = #{ctime}, - branch_id = #{branchId}, - category_id = #{categoryId}, - tag_ids = #{tagIds}, - tag_names = #{tagNames}, - username = #{username}, - dept_name = #{deptName}, - groups_json = #{groupsJson}, - pks = #{pks}, - - - - table_name = #{item.tableName}, - table_owner = #{item.tableOwner}, - is_create_table = #{item.isCreateTable}, - form_name = #{item.formName}, - userid = #{item.userid}, - deptid = #{item.deptid}, - form_type = #{item.formType}, - is_template = #{item.isTemplate}, - biz_type = #{item.bizType}, - ctime = #{item.ctime}, - branch_id = #{item.branchId}, - category_id = #{item.categoryId}, - tag_ids = #{item.tagIds}, - tag_names = #{item.tagNames}, - username = #{item.username}, - dept_name = #{item.deptName}, - groups_json = #{item.groupsJson}, - pks = #{item.pks} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefTagMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefTagMapper.xml deleted file mode 100644 index daf81e1..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormDefTagMapper.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into FORM.form_def_tag( - - ) values ( - #{formId},#{tagId},#{tagName},#{id},#{createTime} - ) - - - - - delete from FORM.form_def_tag res - - - - - - - - delete from FORM.form_def_tag - where id = #{id} - - - - - update FORM.form_def_tag - - - - where id = #{id} - - - - - update FORM.form_def_tag - - - - where id = #{id} - - - - - - - begin - - update FORM.form_def_tag - set - - where id = #{item.id} - - ;end; - - - - delete from FORM.form_def_tag - where id in - - #{item.id } - - - - - - - form_id,tag_id,tag_name,id,create_time - - - - - and res.form_id = #{formId} - and res.tag_id = #{tagId} - and res.tag_name = #{tagName} - and res.id = #{id} - and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') - - - - form_id = #{formId}, - tag_id = #{tagId}, - tag_name = #{tagName}, - create_time = #{createTime} - - - form_id = #{formId}, - tag_id = #{tagId}, - tag_name = #{tagName}, - create_time = #{createTime}, - - - - form_id = #{item.formId}, - tag_id = #{item.tagId}, - tag_name = #{item.tagName}, - create_time = #{item.createTime} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormFieldMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormFieldMapper.xml deleted file mode 100644 index 04b24e3..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormFieldMapper.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - and (res.id) in - - ( #{item}) - - - - - - delete from FORM.form_field where form_id=#{formId} - - - - - - - - - - - - - - - - - - - - - - - insert into form_field( - - ) values ( - #{formId},#{id},#{fieldId},#{fieldTitle},#{dictCode},#{fieldType},#{fieldLength},#{defaultValue},#{isMultiple},#{placeholder},#{isRequired},#{isDict},#{fieldIdCamel},#{remark},#{extFieldType},#{toFlow},#{flowFieldId},#{isBizKey},#{seqNo},#{groupId} - ) - - - - - delete from form_field res - - - - - - - - delete from form_field - where id = #{id} - - - - - update form_field - - - - where id = #{id} - - - - - update form_field - - - - where id = #{id} - - - - - - - - update form_field - set - - where id = #{item.id} - - - - - - update form_field - - - - where (id) in - - ( #{item}) - - - - - delete from form_field - where - (id) in - - ( #{item.id} ) - - - - - - - form_id,id,field_id,field_title,dict_code,field_type,field_length,default_value,is_multiple,placeholder,is_required,is_dict,field_id_camel,remark,ext_field_type,to_flow,flow_field_id,is_biz_key,seq_no,group_id - - - - - and res.form_id = #{formId} - and res.id = #{id} - and res.field_id = #{fieldId} - and res.field_title = #{fieldTitle} - and res.dict_code = #{dictCode} - and res.field_type = #{fieldType} - and res.field_length = #{fieldLength} - and res.default_value = #{defaultValue} - and res.is_multiple = #{isMultiple} - and res.placeholder = #{placeholder} - and res.is_required = #{isRequired} - and res.is_dict = #{isDict} - and res.field_id_camel = #{fieldIdCamel} - and res.remark = #{remark} - and res.ext_field_type = #{extFieldType} - and res.to_flow = #{toFlow} - and res.flow_field_id = #{flowFieldId} - and res.is_biz_key = #{isBizKey} - and res.seq_no = #{seqNo} - and res.group_id = #{groupId} - - - - form_id = #{formId}, - field_id = #{fieldId}, - field_title = #{fieldTitle}, - dict_code = #{dictCode}, - field_type = #{fieldType}, - field_length = #{fieldLength}, - default_value = #{defaultValue}, - is_multiple = #{isMultiple}, - placeholder = #{placeholder}, - is_required = #{isRequired}, - is_dict = #{isDict}, - field_id_camel = #{fieldIdCamel}, - remark = #{remark}, - ext_field_type = #{extFieldType}, - to_flow = #{toFlow}, - flow_field_id = #{flowFieldId}, - is_biz_key = #{isBizKey}, - seq_no = #{seqNo}, - group_id = #{groupId} - - - form_id = #{formId}, - field_id = #{fieldId}, - field_title = #{fieldTitle}, - dict_code = #{dictCode}, - field_type = #{fieldType}, - field_length = #{fieldLength}, - default_value = #{defaultValue}, - is_multiple = #{isMultiple}, - placeholder = #{placeholder}, - is_required = #{isRequired}, - is_dict = #{isDict}, - field_id_camel = #{fieldIdCamel}, - remark = #{remark}, - ext_field_type = #{extFieldType}, - to_flow = #{toFlow}, - flow_field_id = #{flowFieldId}, - is_biz_key = #{isBizKey}, - seq_no = #{seqNo}, - group_id = #{groupId}, - - - - form_id = #{item.formId}, - field_id = #{item.fieldId}, - field_title = #{item.fieldTitle}, - dict_code = #{item.dictCode}, - field_type = #{item.fieldType}, - field_length = #{item.fieldLength}, - default_value = #{item.defaultValue}, - is_multiple = #{item.isMultiple}, - placeholder = #{item.placeholder}, - is_required = #{item.isRequired}, - is_dict = #{item.isDict}, - field_id_camel = #{item.fieldIdCamel}, - remark = #{item.remark}, - ext_field_type = #{item.extFieldType}, - to_flow = #{item.toFlow}, - flow_field_id = #{item.flowFieldId}, - is_biz_key = #{item.isBizKey}, - seq_no = #{item.seqNo}, - group_id = #{item.groupId} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormQxMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormQxMapper.xml deleted file mode 100644 index 65b5b2c..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormQxMapper.xml +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - and (res.form_id) in - - ( #{item}) - - - - - - - - - - - - - - - - - - - - - - - - - - insert into form_qx( - - ) values ( - #{formId},#{allowQueryRoleids},#{allowQueryDeptids},#{allowQueryUserids},#{notQueryRoleids},#{notQueryDeptids},#{notQueryUserids},#{allowOtherQuery},#{allowOtherEdit},#{allowOtherDel},#{doDeptLvlCheck},#{deptLvlQx} - ) - - - - - delete from form_qx res - - - - - - - - delete from form_qx - where form_id = #{formId} - - - - - update form_qx - - - - where form_id = #{formId} - - - - - update form_qx - - - - where form_id = #{formId} - - - - - - - - update form_qx - set - - where form_id = #{item.formId} - - - - - - update form_qx - - - - where (form_id) in - - ( #{item}) - - - - - delete from form_qx - where - (form_id) in - - ( #{item.formId} ) - - - - - - - form_id,allow_query_roleids,allow_query_deptids,allow_query_userids,not_query_roleids,not_query_deptids,not_query_userids,allow_other_query,allow_other_edit,allow_other_del,do_dept_lvl_check,dept_lvl_qx - - - - - and res.form_id = #{formId} - and res.allow_query_roleids = #{allowQueryRoleids} - and res.allow_query_deptids = #{allowQueryDeptids} - and res.allow_query_userids = #{allowQueryUserids} - and res.not_query_roleids = #{notQueryRoleids} - and res.not_query_deptids = #{notQueryDeptids} - and res.not_query_userids = #{notQueryUserids} - and res.allow_other_query = #{allowOtherQuery} - and res.allow_other_edit = #{allowOtherEdit} - and res.allow_other_del = #{allowOtherDel} - and res.do_dept_lvl_check = #{doDeptLvlCheck} - and res.dept_lvl_qx = #{deptLvlQx} - - - - allow_query_roleids = #{allowQueryRoleids}, - allow_query_deptids = #{allowQueryDeptids}, - allow_query_userids = #{allowQueryUserids}, - not_query_roleids = #{notQueryRoleids}, - not_query_deptids = #{notQueryDeptids}, - not_query_userids = #{notQueryUserids}, - allow_other_query = #{allowOtherQuery}, - allow_other_edit = #{allowOtherEdit}, - allow_other_del = #{allowOtherDel}, - do_dept_lvl_check = #{doDeptLvlCheck}, - dept_lvl_qx = #{deptLvlQx} - - - allow_query_roleids = #{allowQueryRoleids}, - allow_query_deptids = #{allowQueryDeptids}, - allow_query_userids = #{allowQueryUserids}, - not_query_roleids = #{notQueryRoleids}, - not_query_deptids = #{notQueryDeptids}, - not_query_userids = #{notQueryUserids}, - allow_other_query = #{allowOtherQuery}, - allow_other_edit = #{allowOtherEdit}, - allow_other_del = #{allowOtherDel}, - do_dept_lvl_check = #{doDeptLvlCheck}, - dept_lvl_qx = #{deptLvlQx}, - - - - allow_query_roleids = #{item.allowQueryRoleids}, - allow_query_deptids = #{item.allowQueryDeptids}, - allow_query_userids = #{item.allowQueryUserids}, - not_query_roleids = #{item.notQueryRoleids}, - not_query_deptids = #{item.notQueryDeptids}, - not_query_userids = #{item.notQueryUserids}, - allow_other_query = #{item.allowOtherQuery}, - allow_other_edit = #{item.allowOtherEdit}, - allow_other_del = #{item.allowOtherDel}, - do_dept_lvl_check = #{item.doDeptLvlCheck}, - dept_lvl_qx = #{item.deptLvlQx} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormViewMapper.xml b/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormViewMapper.xml deleted file mode 100644 index 93ccdc1..0000000 --- a/mdp-form/src/main/resources/mybatis/mapper/mdp/form/dao/FormViewMapper.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - and (res.id) in - - ( #{item}) - - - - - - - - - - - - - - - - - - - - - - - - - - insert into form_view( - - ) values ( - #{formId},#{id},#{viewContext},#{bizId} - ) - - - - - delete from form_view res - - - - - - - - delete from form_view - where id = #{id} - - - - - update form_view - - - - where id = #{id} - - - - - update form_view - - - - where id = #{id} - - - - - - - - update form_view - set - - where id = #{item.id} - - - - - - update form_view - - - - where (id) in - - ( #{item}) - - - - - delete from form_view - where - (id) in - - ( #{item.id} ) - - - - - - - form_id,id,view_context,biz_id - - - - - and res.form_id = #{formId} - and res.id = #{id} - and res.view_context = #{viewContext} - and res.biz_id = #{bizId} - - - - form_id = #{formId}, - view_context = #{viewContext}, - biz_id = #{bizId} - - - form_id = #{formId}, - view_context = #{viewContext}, - biz_id = #{bizId}, - - - - form_id = #{item.formId}, - view_context = #{item.viewContext}, - biz_id = #{item.bizId} - - \ No newline at end of file diff --git a/mdp-form/src/main/resources/mybatis/mybatis-config.xml b/mdp-form/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index 6dbc255..0000000 --- a/mdp-form/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataProcessApprovaService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataProcessApprovaService.java index 0165be2..50c64a4 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataProcessApprovaService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataProcessApprovaService.java @@ -1,31 +1,31 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormDataProcessApprova; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormDataProcessApprovaService; +import com.mdp.form.entity.FormDataProcessApprova; import org.springframework.boot.test.context.SpringBootTest; /** * FormDataProcessApprovaService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_data_process_approva form_data_process_approva
+ * 表 form_data_process_approva 企业入驻审核流程
* 实体 FormDataProcessApprova
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
- * branchId,procInstId,agree,assignee,mainTitle,actId,taskName,commentMsg,id,eventName,bizKey,modelKey,flowLastTime,flowBranchId,flowState,startUserid,procDefId,modelName,formId,formDataId;
+ * branchId,procInstId,agree,assignee,mainTitle,actId,taskName,commentMsg,id,eventName,bizKey,modelKey,flowLastTime,flowBranchId,flowState,startUserid,procDefId,modelName,formId,formDataId,endTime;
* 当前表的所有字段名:
- * branch_id,proc_inst_id,agree,assignee,main_title,act_id,task_name,comment_msg,id,event_name,biz_key,model_key,flow_last_time,flow_branch_id,flow_state,start_userid,proc_def_id,model_name,form_id,form_data_id;
+ * branch_id,proc_inst_id,agree,assignee,main_title,act_id,task_name,comment_msg,id,event_name,biz_key,model_key,flow_last_time,flow_branch_id,flow_state,start_userid,proc_def_id,model_name,form_id,form_data_id,end_time;
* 当前主键(包括多主键):
* id;
***/ @@ -42,273 +42,10 @@ public class TestFormDataProcessApprovaService { ***/ @Test public void insert() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","id","Dfh2","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - formDataProcessApprovaService.insert(formDataProcessApprova); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - formDataProcessApprovaService.deleteByWhere(formDataProcessApprova); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","Dfh2"); + Map p=BaseUtils.map("branchId","WGSq","procInstId","eQK3","agree","6","assignee","0vIQ","mainTitle","awHr","actId","x2f6","taskName","dw4q","commentMsg","hC1V","id","ZHsg","eventName","Op4b","bizKey","AtXc","modelKey","Bqw2","flowLastTime",new Date("2023-08-25 1:33:44"),"flowBranchId","um80","flowState","wx","startUserid","y3fy","procDefId","9Nj7","modelName","AjWI","formId","Fki1","formDataId","T9eg","endTime",new Date("2023-08-25 1:33:44")); FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - formDataProcessApprovaService.deleteByPk(formDataProcessApprova); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(where,FormDataProcessApprova.class); - formDataProcessApprovaService.updateSomeFieldByPk(formDataProcessApprova); + formDataProcessApprovaService.save(formDataProcessApprova); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","Dfh2"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - formDataProcessApprovaService.updateByPk(formDataProcessApprova); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","id","Dfh2","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - formDataProcessApprovaService.insertOrUpdate(formDataProcessApprova); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","id","Dfh2","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova0=BaseUtils.fromMap(p0,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova0); - Map p1=BaseUtils.map("branchId","ovEQ","procInstId","8Uxf","agree","J","assignee","4N7Z","mainTitle","sh76","actId","1n2Z","taskName","cI9m","commentMsg","57Tn","id","Ng3q","eventName","e5x5","bizKey","b0H2","modelKey","d5TK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","zky0","flowState","p2","startUserid","1kGh","procDefId","2hWV","modelName","2570","formId","BklR","formDataId","iqc8"); - FormDataProcessApprova formDataProcessApprova1=BaseUtils.fromMap(p1,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova1); - Map p2=BaseUtils.map("branchId","813K","procInstId","WSty","agree","D","assignee","oVcx","mainTitle","G96k","actId","dSVG","taskName","tzPr","commentMsg","29SP","id","W8JP","eventName","bQiI","bizKey","09xG","modelKey","sTYq","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","64ei","flowState","sG","startUserid","ECqh","procDefId","4SA7","modelName","DP15","formId","GWC4","formDataId","Q0x6"); - FormDataProcessApprova formDataProcessApprova2=BaseUtils.fromMap(p2,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova2); - Map p3=BaseUtils.map("branchId","8Wwc","procInstId","MR28","agree","n","assignee","3wW3","mainTitle","owlJ","actId","K76s","taskName","6RV4","commentMsg","S504","id","9LfV","eventName","4MQ4","bizKey","ITnm","modelKey","rYO6","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","lXz7","flowState","dl","startUserid","ukfG","procDefId","xcWZ","modelName","8yHf","formId","qm89","formDataId","adOb"); - FormDataProcessApprova formDataProcessApprova3=BaseUtils.fromMap(p3,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova3); - Map p4=BaseUtils.map("branchId","3pEA","procInstId","dDwb","agree","D","assignee","V0Kv","mainTitle","9zHc","actId","1y74","taskName","xTww","commentMsg","snO5","id","I1Nd","eventName","swEY","bizKey","v4Hz","modelKey","3QWc","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","nVxp","flowState","3G","startUserid","yqk4","procDefId","hYUI","modelName","Lc9v","formId","5A9A","formDataId","vS89"); - FormDataProcessApprova formDataProcessApprova4=BaseUtils.fromMap(p4,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova4); - Map p5=BaseUtils.map("branchId","20S7","procInstId","SCYr","agree","F","assignee","1dB5","mainTitle","EgRS","actId","72j5","taskName","PH73","commentMsg","xkjl","id","v2b6","eventName","XH3M","bizKey","V2k9","modelKey","F8VY","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","u2O0","flowState","ii","startUserid","iEyL","procDefId","Nw4l","modelName","sbYq","formId","QSXu","formDataId","3LNK"); - FormDataProcessApprova formDataProcessApprova5=BaseUtils.fromMap(p5,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova5); - Map p6=BaseUtils.map("branchId","ylMV","procInstId","YSm7","agree","2","assignee","c8jc","mainTitle","glDK","actId","e7wi","taskName","GEbh","commentMsg","7o4N","id","2IYr","eventName","0vr7","bizKey","b89h","modelKey","gM6Y","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","SCPC","flowState","2G","startUserid","W7pZ","procDefId","Q8fl","modelName","M2Ja","formId","jDcJ","formDataId","020p"); - FormDataProcessApprova formDataProcessApprova6=BaseUtils.fromMap(p6,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova6); - Map p7=BaseUtils.map("branchId","31Xm","procInstId","Z1vk","agree","V","assignee","44PN","mainTitle","PUM7","actId","owOE","taskName","RGXy","commentMsg","h0YY","id","qe07","eventName","eGWu","bizKey","6L2n","modelKey","LO49","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","Dd5S","flowState","QI","startUserid","8wrW","procDefId","V9e8","modelName","01C5","formId","5She","formDataId","0GQ0"); - FormDataProcessApprova formDataProcessApprova7=BaseUtils.fromMap(p7,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova7); - formDataProcessApprovaService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","id","Dfh2","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova0=BaseUtils.fromMap(p0,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova0); - Map p1=BaseUtils.map("branchId","ovEQ","procInstId","8Uxf","agree","J","assignee","4N7Z","mainTitle","sh76","actId","1n2Z","taskName","cI9m","commentMsg","57Tn","id","Ng3q","eventName","e5x5","bizKey","b0H2","modelKey","d5TK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","zky0","flowState","p2","startUserid","1kGh","procDefId","2hWV","modelName","2570","formId","BklR","formDataId","iqc8"); - FormDataProcessApprova formDataProcessApprova1=BaseUtils.fromMap(p1,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova1); - Map p2=BaseUtils.map("branchId","813K","procInstId","WSty","agree","D","assignee","oVcx","mainTitle","G96k","actId","dSVG","taskName","tzPr","commentMsg","29SP","id","W8JP","eventName","bQiI","bizKey","09xG","modelKey","sTYq","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","64ei","flowState","sG","startUserid","ECqh","procDefId","4SA7","modelName","DP15","formId","GWC4","formDataId","Q0x6"); - FormDataProcessApprova formDataProcessApprova2=BaseUtils.fromMap(p2,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova2); - Map p3=BaseUtils.map("branchId","8Wwc","procInstId","MR28","agree","n","assignee","3wW3","mainTitle","owlJ","actId","K76s","taskName","6RV4","commentMsg","S504","id","9LfV","eventName","4MQ4","bizKey","ITnm","modelKey","rYO6","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","lXz7","flowState","dl","startUserid","ukfG","procDefId","xcWZ","modelName","8yHf","formId","qm89","formDataId","adOb"); - FormDataProcessApprova formDataProcessApprova3=BaseUtils.fromMap(p3,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova3); - Map p4=BaseUtils.map("branchId","3pEA","procInstId","dDwb","agree","D","assignee","V0Kv","mainTitle","9zHc","actId","1y74","taskName","xTww","commentMsg","snO5","id","I1Nd","eventName","swEY","bizKey","v4Hz","modelKey","3QWc","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","nVxp","flowState","3G","startUserid","yqk4","procDefId","hYUI","modelName","Lc9v","formId","5A9A","formDataId","vS89"); - FormDataProcessApprova formDataProcessApprova4=BaseUtils.fromMap(p4,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova4); - Map p5=BaseUtils.map("branchId","20S7","procInstId","SCYr","agree","F","assignee","1dB5","mainTitle","EgRS","actId","72j5","taskName","PH73","commentMsg","xkjl","id","v2b6","eventName","XH3M","bizKey","V2k9","modelKey","F8VY","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","u2O0","flowState","ii","startUserid","iEyL","procDefId","Nw4l","modelName","sbYq","formId","QSXu","formDataId","3LNK"); - FormDataProcessApprova formDataProcessApprova5=BaseUtils.fromMap(p5,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova5); - Map p6=BaseUtils.map("branchId","ylMV","procInstId","YSm7","agree","2","assignee","c8jc","mainTitle","glDK","actId","e7wi","taskName","GEbh","commentMsg","7o4N","id","2IYr","eventName","0vr7","bizKey","b89h","modelKey","gM6Y","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","SCPC","flowState","2G","startUserid","W7pZ","procDefId","Q8fl","modelName","M2Ja","formId","jDcJ","formDataId","020p"); - FormDataProcessApprova formDataProcessApprova6=BaseUtils.fromMap(p6,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova6); - Map p7=BaseUtils.map("branchId","31Xm","procInstId","Z1vk","agree","V","assignee","44PN","mainTitle","PUM7","actId","owOE","taskName","RGXy","commentMsg","h0YY","id","qe07","eventName","eGWu","bizKey","6L2n","modelKey","LO49","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","Dd5S","flowState","QI","startUserid","8wrW","procDefId","V9e8","modelName","01C5","formId","5She","formDataId","0GQ0"); - FormDataProcessApprova formDataProcessApprova7=BaseUtils.fromMap(p7,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova7); - formDataProcessApprovaService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","id","Dfh2","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova0=BaseUtils.fromMap(p0,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova0); - Map p1=BaseUtils.map("branchId","ovEQ","procInstId","8Uxf","agree","J","assignee","4N7Z","mainTitle","sh76","actId","1n2Z","taskName","cI9m","commentMsg","57Tn","id","Ng3q","eventName","e5x5","bizKey","b0H2","modelKey","d5TK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","zky0","flowState","p2","startUserid","1kGh","procDefId","2hWV","modelName","2570","formId","BklR","formDataId","iqc8"); - FormDataProcessApprova formDataProcessApprova1=BaseUtils.fromMap(p1,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova1); - Map p2=BaseUtils.map("branchId","813K","procInstId","WSty","agree","D","assignee","oVcx","mainTitle","G96k","actId","dSVG","taskName","tzPr","commentMsg","29SP","id","W8JP","eventName","bQiI","bizKey","09xG","modelKey","sTYq","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","64ei","flowState","sG","startUserid","ECqh","procDefId","4SA7","modelName","DP15","formId","GWC4","formDataId","Q0x6"); - FormDataProcessApprova formDataProcessApprova2=BaseUtils.fromMap(p2,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova2); - Map p3=BaseUtils.map("branchId","8Wwc","procInstId","MR28","agree","n","assignee","3wW3","mainTitle","owlJ","actId","K76s","taskName","6RV4","commentMsg","S504","id","9LfV","eventName","4MQ4","bizKey","ITnm","modelKey","rYO6","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","lXz7","flowState","dl","startUserid","ukfG","procDefId","xcWZ","modelName","8yHf","formId","qm89","formDataId","adOb"); - FormDataProcessApprova formDataProcessApprova3=BaseUtils.fromMap(p3,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova3); - Map p4=BaseUtils.map("branchId","3pEA","procInstId","dDwb","agree","D","assignee","V0Kv","mainTitle","9zHc","actId","1y74","taskName","xTww","commentMsg","snO5","id","I1Nd","eventName","swEY","bizKey","v4Hz","modelKey","3QWc","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","nVxp","flowState","3G","startUserid","yqk4","procDefId","hYUI","modelName","Lc9v","formId","5A9A","formDataId","vS89"); - FormDataProcessApprova formDataProcessApprova4=BaseUtils.fromMap(p4,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova4); - Map p5=BaseUtils.map("branchId","20S7","procInstId","SCYr","agree","F","assignee","1dB5","mainTitle","EgRS","actId","72j5","taskName","PH73","commentMsg","xkjl","id","v2b6","eventName","XH3M","bizKey","V2k9","modelKey","F8VY","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","u2O0","flowState","ii","startUserid","iEyL","procDefId","Nw4l","modelName","sbYq","formId","QSXu","formDataId","3LNK"); - FormDataProcessApprova formDataProcessApprova5=BaseUtils.fromMap(p5,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova5); - Map p6=BaseUtils.map("branchId","ylMV","procInstId","YSm7","agree","2","assignee","c8jc","mainTitle","glDK","actId","e7wi","taskName","GEbh","commentMsg","7o4N","id","2IYr","eventName","0vr7","bizKey","b89h","modelKey","gM6Y","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","SCPC","flowState","2G","startUserid","W7pZ","procDefId","Q8fl","modelName","M2Ja","formId","jDcJ","formDataId","020p"); - FormDataProcessApprova formDataProcessApprova6=BaseUtils.fromMap(p6,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova6); - Map p7=BaseUtils.map("branchId","31Xm","procInstId","Z1vk","agree","V","assignee","44PN","mainTitle","PUM7","actId","owOE","taskName","RGXy","commentMsg","h0YY","id","qe07","eventName","eGWu","bizKey","6L2n","modelKey","LO49","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","Dd5S","flowState","QI","startUserid","8wrW","procDefId","V9e8","modelName","01C5","formId","5She","formDataId","0GQ0"); - FormDataProcessApprova formDataProcessApprova7=BaseUtils.fromMap(p7,FormDataProcessApprova.class); - batchValues.add(formDataProcessApprova7); - formDataProcessApprovaService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","Dfh2"); - Map result=this.formDataProcessApprovaService.selectOne(FormDataProcessApprova.class.getName()+".selectOneMap",p); - Assert.assertEquals("Dfh2", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - long result=formDataProcessApprovaService.countByWhere(formDataProcessApprova); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - List result=formDataProcessApprovaService.selectListByWhere(formDataProcessApprova); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - FormDataProcessApprova formDataProcessApprova=BaseUtils.fromMap(p,FormDataProcessApprova.class); - List result=formDataProcessApprovaService.selectListByWhere(formDataProcessApprova); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - List> result=formDataProcessApprovaService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("branchId","AbLo","procInstId","Ff0N","agree","2","assignee","wm1n","mainTitle","Up53","actId","68Xh","taskName","D5px","commentMsg","zarz","eventName","YIf6","bizKey","2PXq","modelKey","5fuK","flowLastTime",parse("2020-03-29 20:43:44"),"flowBranchId","EswY","flowState","3U","startUserid","3kqZ","procDefId","wIPQ","modelName","dkqt","formId","9Tsi","formDataId","vag1"); - List> result=formDataProcessApprovaService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormDataProcessApprova - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","Dfh2"); - - FormDataProcessApprova formDataProcessApprova1=BaseUtils.fromMap(p,FormDataProcessApprova.class); - FormDataProcessApprova formDataProcessApprova=formDataProcessApprovaService.selectOneObject(formDataProcessApprova1); - Assert.assertEquals("Dfh2", formDataProcessApprova.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataService.java index d4e37a5..85b26d5 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataService.java @@ -1,25 +1,25 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormData; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormDataService; +import com.mdp.form.entity.FormData; import org.springframework.boot.test.context.SpringBootTest; /** * FormDataService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_data form_data
+ * 表 form_data 表单数据表
* 实体 FormData
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
@@ -42,273 +42,10 @@ public class TestFormDataService { ***/ @Test public void insert() { - Map p=BaseUtils.map("id","1N13","two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - formDataService.insert(formData); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - formDataService.deleteByWhere(formData); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","1N13"); + Map p=BaseUtils.map("id","GVsA","two","sfxp","three","3f5P","four","8G5p","five","zPfX","six","uqSI","seven","AEdb","eight","cUB0","nine","QkZ4","ten","B9d7","lastTime",new Date("2023-08-25 1:33:43"),"one","UlB1","zero","0k31","remark","6n4B","formId","7K1i","userid","ryy6","eleven","0y8H","twelve","wGMb","thirteen","U32F","fourteen","yb6C","fifteen","M182","attachmentUrls","ldss","attachmentNames","7l20","branchId","HK1s","bizKey","9hHD","deptid","JkFg","flowState","4","createTime",new Date("2023-08-25 1:33:43"),"dqxCode","JxaN","cuserid","LHFH","tagIds","KvIQ","tagNames","hTvc","cusername","oHiv","deptName","O2YE"); FormData formData=BaseUtils.fromMap(p,FormData.class); - formDataService.deleteByPk(formData); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(where,FormData.class); - formDataService.updateSomeFieldByPk(formData); + formDataService.save(formData); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","1N13"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - formDataService.updateByPk(formData); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("id","1N13","two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - formDataService.insertOrUpdate(formData); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","1N13","two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData0=BaseUtils.fromMap(p0,FormData.class); - batchValues.add(formData0); - Map p1=BaseUtils.map("id","8F5A","two","axG0","three","vRoJ","four","NbY2","five","7MuL","six","jfmr","seven","dwO1","eight","15o7","nine","PpI8","ten","BD2j","lastTime",parse("2020-03-16 23:28:18"),"one","nDQ7","zero","5FFo","remark","1rdn","formId","46WN","userid","7Oqi","eleven","iawa","twelve","hCTV","thirteen","8MS9","fourteen","vQ7W","fifteen","k2Pd","attachmentUrls","1967","attachmentNames","7817","branchId","BTM0","bizKey","lT0s","deptid","vofa","flowState","0","createTime",parse("2020-03-16 23:28:18"),"dqxCode","JWaK","cuserid","","tagIds","y44k","tagNames","8hr5","cusername","80K5","deptName","H5in"); - FormData formData1=BaseUtils.fromMap(p1,FormData.class); - batchValues.add(formData1); - Map p2=BaseUtils.map("id","v987","two","oWPO","three","D2xm","four","wAbG","five","2DZo","six","pBHg","seven","WMgQ","eight","yvfU","nine","Txbv","ten","G0YC","lastTime",parse("2020-03-16 23:28:18"),"one","Ec7q","zero","BM3V","remark","r35q","formId","Xc9I","userid","0zOf","eleven","2D3l","twelve","CU6e","thirteen","14T6","fourteen","k7NU","fifteen","YJBh","attachmentUrls","4EwZ","attachmentNames","c2N2","branchId","pCDc","bizKey","QQ39","deptid","kemy","flowState","v","createTime",parse("2020-03-16 23:28:18"),"dqxCode","r6ad","cuserid","","tagIds","7F3Q","tagNames","Hs6e","cusername","O7us","deptName","Ww5m"); - FormData formData2=BaseUtils.fromMap(p2,FormData.class); - batchValues.add(formData2); - Map p3=BaseUtils.map("id","2m64","two","Ls5s","three","SdXp","four","vE6U","five","5z0p","six","Ty0u","seven","nw52","eight","3430","nine","D559","ten","vldy","lastTime",parse("2020-03-16 23:28:18"),"one","X9kF","zero","8KAD","remark","bEtW","formId","azBG","userid","wjcO","eleven","aGRH","twelve","5S7P","thirteen","6Im3","fourteen","OX1d","fifteen","y9jw","attachmentUrls","kK3U","attachmentNames","7JG6","branchId","Ts6V","bizKey","LZCB","deptid","Agyl","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","1AAy","cuserid","","tagIds","TFET","tagNames","J45r","cusername","2jpI","deptName","1Ir5"); - FormData formData3=BaseUtils.fromMap(p3,FormData.class); - batchValues.add(formData3); - Map p4=BaseUtils.map("id","0O1H","two","naNb","three","974F","four","SsHa","five","nvZc","six","i7wB","seven","BKSv","eight","3emj","nine","vxo8","ten","F7Z2","lastTime",parse("2020-03-16 23:28:18"),"one","k5ZW","zero","4qS6","remark","PFM4","formId","oNB1","userid","dtpB","eleven","j30R","twelve","F82L","thirteen","733o","fourteen","67RN","fifteen","qons","attachmentUrls","0jnD","attachmentNames","urRJ","branchId","lRgv","bizKey","65XJ","deptid","BsCI","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","pnmA","cuserid","","tagIds","sP97","tagNames","8d2v","cusername","Qnd1","deptName","8zao"); - FormData formData4=BaseUtils.fromMap(p4,FormData.class); - batchValues.add(formData4); - Map p5=BaseUtils.map("id","MrL5","two","vcC4","three","szst","four","455j","five","XdtI","six","mR6Q","seven","HcRN","eight","oJhW","nine","kydj","ten","l40j","lastTime",parse("2020-03-16 23:28:18"),"one","btU0","zero","38c8","remark","3Qqg","formId","0TJ5","userid","uUP0","eleven","Si0i","twelve","nHUo","thirteen","QFXm","fourteen","8ZBa","fifteen","f6w5","attachmentUrls","811U","attachmentNames","Yzdk","branchId","2518","bizKey","39CX","deptid","5g6q","flowState","I","createTime",parse("2020-03-16 23:28:18"),"dqxCode","c9tP","cuserid","","tagIds","3F91","tagNames","iq21","cusername","Qq03","deptName","lnGM"); - FormData formData5=BaseUtils.fromMap(p5,FormData.class); - batchValues.add(formData5); - Map p6=BaseUtils.map("id","ZE7M","two","k9tp","three","D9Ur","four","vnJa","five","Y3No","six","CWx4","seven","mQ5w","eight","7BVb","nine","l6HY","ten","ou4J","lastTime",parse("2020-03-16 23:28:18"),"one","ZcMl","zero","uBFa","remark","br58","formId","zZb4","userid","biY8","eleven","k8Pb","twelve","LUAh","thirteen","J6EO","fourteen","N0Dg","fifteen","SwJI","attachmentUrls","Q6Tr","attachmentNames","k59i","branchId","Eo5K","bizKey","5vb7","deptid","u79D","flowState","3","createTime",parse("2020-03-16 23:28:18"),"dqxCode","ZTiF","cuserid","","tagIds","3WaX","tagNames","lS90","cusername","MkKG","deptName","a007"); - FormData formData6=BaseUtils.fromMap(p6,FormData.class); - batchValues.add(formData6); - Map p7=BaseUtils.map("id","42U7","two","V2EI","three","eckz","four","aj8c","five","5soT","six","xiGe","seven","YHi2","eight","cPJK","nine","GkfB","ten","G38c","lastTime",parse("2020-03-16 23:28:18"),"one","077d","zero","JHlc","remark","mc9o","formId","HBAq","userid","zjuR","eleven","9t71","twelve","sh7b","thirteen","27h2","fourteen","w61U","fifteen","AFtg","attachmentUrls","iD2H","attachmentNames","8TIl","branchId","91BS","bizKey","H9v8","deptid","Mx71","flowState","r","createTime",parse("2020-03-16 23:28:18"),"dqxCode","wEai","cuserid","","tagIds","bSvu","tagNames","2W2U","cusername","B5V4","deptName","9Q6C"); - FormData formData7=BaseUtils.fromMap(p7,FormData.class); - batchValues.add(formData7); - formDataService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","1N13","two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData0=BaseUtils.fromMap(p0,FormData.class); - batchValues.add(formData0); - Map p1=BaseUtils.map("id","8F5A","two","axG0","three","vRoJ","four","NbY2","five","7MuL","six","jfmr","seven","dwO1","eight","15o7","nine","PpI8","ten","BD2j","lastTime",parse("2020-03-16 23:28:18"),"one","nDQ7","zero","5FFo","remark","1rdn","formId","46WN","userid","7Oqi","eleven","iawa","twelve","hCTV","thirteen","8MS9","fourteen","vQ7W","fifteen","k2Pd","attachmentUrls","1967","attachmentNames","7817","branchId","BTM0","bizKey","lT0s","deptid","vofa","flowState","0","createTime",parse("2020-03-16 23:28:18"),"dqxCode","JWaK","cuserid","","tagIds","y44k","tagNames","8hr5","cusername","80K5","deptName","H5in"); - FormData formData1=BaseUtils.fromMap(p1,FormData.class); - batchValues.add(formData1); - Map p2=BaseUtils.map("id","v987","two","oWPO","three","D2xm","four","wAbG","five","2DZo","six","pBHg","seven","WMgQ","eight","yvfU","nine","Txbv","ten","G0YC","lastTime",parse("2020-03-16 23:28:18"),"one","Ec7q","zero","BM3V","remark","r35q","formId","Xc9I","userid","0zOf","eleven","2D3l","twelve","CU6e","thirteen","14T6","fourteen","k7NU","fifteen","YJBh","attachmentUrls","4EwZ","attachmentNames","c2N2","branchId","pCDc","bizKey","QQ39","deptid","kemy","flowState","v","createTime",parse("2020-03-16 23:28:18"),"dqxCode","r6ad","cuserid","","tagIds","7F3Q","tagNames","Hs6e","cusername","O7us","deptName","Ww5m"); - FormData formData2=BaseUtils.fromMap(p2,FormData.class); - batchValues.add(formData2); - Map p3=BaseUtils.map("id","2m64","two","Ls5s","three","SdXp","four","vE6U","five","5z0p","six","Ty0u","seven","nw52","eight","3430","nine","D559","ten","vldy","lastTime",parse("2020-03-16 23:28:18"),"one","X9kF","zero","8KAD","remark","bEtW","formId","azBG","userid","wjcO","eleven","aGRH","twelve","5S7P","thirteen","6Im3","fourteen","OX1d","fifteen","y9jw","attachmentUrls","kK3U","attachmentNames","7JG6","branchId","Ts6V","bizKey","LZCB","deptid","Agyl","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","1AAy","cuserid","","tagIds","TFET","tagNames","J45r","cusername","2jpI","deptName","1Ir5"); - FormData formData3=BaseUtils.fromMap(p3,FormData.class); - batchValues.add(formData3); - Map p4=BaseUtils.map("id","0O1H","two","naNb","three","974F","four","SsHa","five","nvZc","six","i7wB","seven","BKSv","eight","3emj","nine","vxo8","ten","F7Z2","lastTime",parse("2020-03-16 23:28:18"),"one","k5ZW","zero","4qS6","remark","PFM4","formId","oNB1","userid","dtpB","eleven","j30R","twelve","F82L","thirteen","733o","fourteen","67RN","fifteen","qons","attachmentUrls","0jnD","attachmentNames","urRJ","branchId","lRgv","bizKey","65XJ","deptid","BsCI","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","pnmA","cuserid","","tagIds","sP97","tagNames","8d2v","cusername","Qnd1","deptName","8zao"); - FormData formData4=BaseUtils.fromMap(p4,FormData.class); - batchValues.add(formData4); - Map p5=BaseUtils.map("id","MrL5","two","vcC4","three","szst","four","455j","five","XdtI","six","mR6Q","seven","HcRN","eight","oJhW","nine","kydj","ten","l40j","lastTime",parse("2020-03-16 23:28:18"),"one","btU0","zero","38c8","remark","3Qqg","formId","0TJ5","userid","uUP0","eleven","Si0i","twelve","nHUo","thirteen","QFXm","fourteen","8ZBa","fifteen","f6w5","attachmentUrls","811U","attachmentNames","Yzdk","branchId","2518","bizKey","39CX","deptid","5g6q","flowState","I","createTime",parse("2020-03-16 23:28:18"),"dqxCode","c9tP","cuserid","","tagIds","3F91","tagNames","iq21","cusername","Qq03","deptName","lnGM"); - FormData formData5=BaseUtils.fromMap(p5,FormData.class); - batchValues.add(formData5); - Map p6=BaseUtils.map("id","ZE7M","two","k9tp","three","D9Ur","four","vnJa","five","Y3No","six","CWx4","seven","mQ5w","eight","7BVb","nine","l6HY","ten","ou4J","lastTime",parse("2020-03-16 23:28:18"),"one","ZcMl","zero","uBFa","remark","br58","formId","zZb4","userid","biY8","eleven","k8Pb","twelve","LUAh","thirteen","J6EO","fourteen","N0Dg","fifteen","SwJI","attachmentUrls","Q6Tr","attachmentNames","k59i","branchId","Eo5K","bizKey","5vb7","deptid","u79D","flowState","3","createTime",parse("2020-03-16 23:28:18"),"dqxCode","ZTiF","cuserid","","tagIds","3WaX","tagNames","lS90","cusername","MkKG","deptName","a007"); - FormData formData6=BaseUtils.fromMap(p6,FormData.class); - batchValues.add(formData6); - Map p7=BaseUtils.map("id","42U7","two","V2EI","three","eckz","four","aj8c","five","5soT","six","xiGe","seven","YHi2","eight","cPJK","nine","GkfB","ten","G38c","lastTime",parse("2020-03-16 23:28:18"),"one","077d","zero","JHlc","remark","mc9o","formId","HBAq","userid","zjuR","eleven","9t71","twelve","sh7b","thirteen","27h2","fourteen","w61U","fifteen","AFtg","attachmentUrls","iD2H","attachmentNames","8TIl","branchId","91BS","bizKey","H9v8","deptid","Mx71","flowState","r","createTime",parse("2020-03-16 23:28:18"),"dqxCode","wEai","cuserid","","tagIds","bSvu","tagNames","2W2U","cusername","B5V4","deptName","9Q6C"); - FormData formData7=BaseUtils.fromMap(p7,FormData.class); - batchValues.add(formData7); - formDataService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","1N13","two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData0=BaseUtils.fromMap(p0,FormData.class); - batchValues.add(formData0); - Map p1=BaseUtils.map("id","8F5A","two","axG0","three","vRoJ","four","NbY2","five","7MuL","six","jfmr","seven","dwO1","eight","15o7","nine","PpI8","ten","BD2j","lastTime",parse("2020-03-16 23:28:18"),"one","nDQ7","zero","5FFo","remark","1rdn","formId","46WN","userid","7Oqi","eleven","iawa","twelve","hCTV","thirteen","8MS9","fourteen","vQ7W","fifteen","k2Pd","attachmentUrls","1967","attachmentNames","7817","branchId","BTM0","bizKey","lT0s","deptid","vofa","flowState","0","createTime",parse("2020-03-16 23:28:18"),"dqxCode","JWaK","cuserid","","tagIds","y44k","tagNames","8hr5","cusername","80K5","deptName","H5in"); - FormData formData1=BaseUtils.fromMap(p1,FormData.class); - batchValues.add(formData1); - Map p2=BaseUtils.map("id","v987","two","oWPO","three","D2xm","four","wAbG","five","2DZo","six","pBHg","seven","WMgQ","eight","yvfU","nine","Txbv","ten","G0YC","lastTime",parse("2020-03-16 23:28:18"),"one","Ec7q","zero","BM3V","remark","r35q","formId","Xc9I","userid","0zOf","eleven","2D3l","twelve","CU6e","thirteen","14T6","fourteen","k7NU","fifteen","YJBh","attachmentUrls","4EwZ","attachmentNames","c2N2","branchId","pCDc","bizKey","QQ39","deptid","kemy","flowState","v","createTime",parse("2020-03-16 23:28:18"),"dqxCode","r6ad","cuserid","","tagIds","7F3Q","tagNames","Hs6e","cusername","O7us","deptName","Ww5m"); - FormData formData2=BaseUtils.fromMap(p2,FormData.class); - batchValues.add(formData2); - Map p3=BaseUtils.map("id","2m64","two","Ls5s","three","SdXp","four","vE6U","five","5z0p","six","Ty0u","seven","nw52","eight","3430","nine","D559","ten","vldy","lastTime",parse("2020-03-16 23:28:18"),"one","X9kF","zero","8KAD","remark","bEtW","formId","azBG","userid","wjcO","eleven","aGRH","twelve","5S7P","thirteen","6Im3","fourteen","OX1d","fifteen","y9jw","attachmentUrls","kK3U","attachmentNames","7JG6","branchId","Ts6V","bizKey","LZCB","deptid","Agyl","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","1AAy","cuserid","","tagIds","TFET","tagNames","J45r","cusername","2jpI","deptName","1Ir5"); - FormData formData3=BaseUtils.fromMap(p3,FormData.class); - batchValues.add(formData3); - Map p4=BaseUtils.map("id","0O1H","two","naNb","three","974F","four","SsHa","five","nvZc","six","i7wB","seven","BKSv","eight","3emj","nine","vxo8","ten","F7Z2","lastTime",parse("2020-03-16 23:28:18"),"one","k5ZW","zero","4qS6","remark","PFM4","formId","oNB1","userid","dtpB","eleven","j30R","twelve","F82L","thirteen","733o","fourteen","67RN","fifteen","qons","attachmentUrls","0jnD","attachmentNames","urRJ","branchId","lRgv","bizKey","65XJ","deptid","BsCI","flowState","8","createTime",parse("2020-03-16 23:28:18"),"dqxCode","pnmA","cuserid","","tagIds","sP97","tagNames","8d2v","cusername","Qnd1","deptName","8zao"); - FormData formData4=BaseUtils.fromMap(p4,FormData.class); - batchValues.add(formData4); - Map p5=BaseUtils.map("id","MrL5","two","vcC4","three","szst","four","455j","five","XdtI","six","mR6Q","seven","HcRN","eight","oJhW","nine","kydj","ten","l40j","lastTime",parse("2020-03-16 23:28:18"),"one","btU0","zero","38c8","remark","3Qqg","formId","0TJ5","userid","uUP0","eleven","Si0i","twelve","nHUo","thirteen","QFXm","fourteen","8ZBa","fifteen","f6w5","attachmentUrls","811U","attachmentNames","Yzdk","branchId","2518","bizKey","39CX","deptid","5g6q","flowState","I","createTime",parse("2020-03-16 23:28:18"),"dqxCode","c9tP","cuserid","","tagIds","3F91","tagNames","iq21","cusername","Qq03","deptName","lnGM"); - FormData formData5=BaseUtils.fromMap(p5,FormData.class); - batchValues.add(formData5); - Map p6=BaseUtils.map("id","ZE7M","two","k9tp","three","D9Ur","four","vnJa","five","Y3No","six","CWx4","seven","mQ5w","eight","7BVb","nine","l6HY","ten","ou4J","lastTime",parse("2020-03-16 23:28:18"),"one","ZcMl","zero","uBFa","remark","br58","formId","zZb4","userid","biY8","eleven","k8Pb","twelve","LUAh","thirteen","J6EO","fourteen","N0Dg","fifteen","SwJI","attachmentUrls","Q6Tr","attachmentNames","k59i","branchId","Eo5K","bizKey","5vb7","deptid","u79D","flowState","3","createTime",parse("2020-03-16 23:28:18"),"dqxCode","ZTiF","cuserid","","tagIds","3WaX","tagNames","lS90","cusername","MkKG","deptName","a007"); - FormData formData6=BaseUtils.fromMap(p6,FormData.class); - batchValues.add(formData6); - Map p7=BaseUtils.map("id","42U7","two","V2EI","three","eckz","four","aj8c","five","5soT","six","xiGe","seven","YHi2","eight","cPJK","nine","GkfB","ten","G38c","lastTime",parse("2020-03-16 23:28:18"),"one","077d","zero","JHlc","remark","mc9o","formId","HBAq","userid","zjuR","eleven","9t71","twelve","sh7b","thirteen","27h2","fourteen","w61U","fifteen","AFtg","attachmentUrls","iD2H","attachmentNames","8TIl","branchId","91BS","bizKey","H9v8","deptid","Mx71","flowState","r","createTime",parse("2020-03-16 23:28:18"),"dqxCode","wEai","cuserid","","tagIds","bSvu","tagNames","2W2U","cusername","B5V4","deptName","9Q6C"); - FormData formData7=BaseUtils.fromMap(p7,FormData.class); - batchValues.add(formData7); - formDataService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","1N13"); - Map result=this.formDataService.selectOne(FormData.class.getName()+".selectOneMap",p); - Assert.assertEquals("1N13", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - long result=formDataService.countByWhere(formData); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormData formData=BaseUtils.fromMap(p,FormData.class); - List result=formDataService.selectListByWhere(formData); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - FormData formData=BaseUtils.fromMap(p,FormData.class); - List result=formDataService.selectListByWhere(formData); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - List> result=formDataService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("two","28Z2","three","LaYj","four","G837","five","Y7ed","six","5w9y","seven","7I03","eight","DqjP","nine","kafw","ten","p5t6","lastTime",parse("2020-03-16 23:28:18"),"one","M3gU","zero","dLpD","remark","o4z3","formId","f57i","userid","T3y2","eleven","D8HY","twelve","0XHC","thirteen","2JeD","fourteen","4u09","fifteen","IM91","attachmentUrls","BlFB","attachmentNames","7kil","branchId","enpT","bizKey","T21q","deptid","LgTi","flowState","i","createTime",parse("2020-03-16 23:28:18"),"dqxCode","5OQJ","cuserid","","tagIds","wu1U","tagNames","Qs02","cusername","5RxL","deptName","M2IL"); - List> result=formDataService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormData - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","1N13"); - - FormData formData1=BaseUtils.fromMap(p,FormData.class); - FormData formData=formDataService.selectOneObject(formData1); - Assert.assertEquals("1N13", formData.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataTagService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataTagService.java index efecddd..55ff90f 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormDataTagService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormDataTagService.java @@ -1,25 +1,25 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormDataTag; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormDataTagService; +import com.mdp.form.entity.FormDataTag; import org.springframework.boot.test.context.SpringBootTest; /** * FormDataTagService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_data_tag form_data_tag
+ * 表 form_data_tag form_data_tag
* 实体 FormDataTag
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
@@ -42,273 +42,10 @@ public class TestFormDataTagService { ***/ @Test public void insert() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","id","kz13","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - formDataTagService.insert(formDataTag); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - formDataTagService.deleteByWhere(formDataTag); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","kz13"); + Map p=BaseUtils.map("dataId","c3i2","tagId","tQ8w","tagName","HPss","id","f06A","createTime",new Date("2023-08-25 1:33:44")); FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - formDataTagService.deleteByPk(formDataTag); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(where,FormDataTag.class); - formDataTagService.updateSomeFieldByPk(formDataTag); + formDataTagService.save(formDataTag); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","kz13"); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - formDataTagService.updateByPk(formDataTag); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","id","kz13","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - formDataTagService.insertOrUpdate(formDataTag); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","id","kz13","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag0=BaseUtils.fromMap(p0,FormDataTag.class); - batchValues.add(formDataTag0); - Map p1=BaseUtils.map("dataId","Bx6U","tagId","e8M6","tagName","18q9","id","1jQq","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag1=BaseUtils.fromMap(p1,FormDataTag.class); - batchValues.add(formDataTag1); - Map p2=BaseUtils.map("dataId","ZC6A","tagId","wTkq","tagName","31ux","id","4z5h","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag2=BaseUtils.fromMap(p2,FormDataTag.class); - batchValues.add(formDataTag2); - Map p3=BaseUtils.map("dataId","JSm7","tagId","LK3G","tagName","o7ym","id","2n6D","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag3=BaseUtils.fromMap(p3,FormDataTag.class); - batchValues.add(formDataTag3); - Map p4=BaseUtils.map("dataId","Tio0","tagId","KU2j","tagName","q54w","id","deCs","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag4=BaseUtils.fromMap(p4,FormDataTag.class); - batchValues.add(formDataTag4); - Map p5=BaseUtils.map("dataId","jlsD","tagId","p8Wl","tagName","Fol6","id","OYFF","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag5=BaseUtils.fromMap(p5,FormDataTag.class); - batchValues.add(formDataTag5); - Map p6=BaseUtils.map("dataId","XUOD","tagId","yZZI","tagName","N28k","id","uYEJ","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag6=BaseUtils.fromMap(p6,FormDataTag.class); - batchValues.add(formDataTag6); - Map p7=BaseUtils.map("dataId","6HpM","tagId","wYyc","tagName","xEh3","id","YlXb","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag7=BaseUtils.fromMap(p7,FormDataTag.class); - batchValues.add(formDataTag7); - formDataTagService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","id","kz13","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag0=BaseUtils.fromMap(p0,FormDataTag.class); - batchValues.add(formDataTag0); - Map p1=BaseUtils.map("dataId","Bx6U","tagId","e8M6","tagName","18q9","id","1jQq","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag1=BaseUtils.fromMap(p1,FormDataTag.class); - batchValues.add(formDataTag1); - Map p2=BaseUtils.map("dataId","ZC6A","tagId","wTkq","tagName","31ux","id","4z5h","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag2=BaseUtils.fromMap(p2,FormDataTag.class); - batchValues.add(formDataTag2); - Map p3=BaseUtils.map("dataId","JSm7","tagId","LK3G","tagName","o7ym","id","2n6D","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag3=BaseUtils.fromMap(p3,FormDataTag.class); - batchValues.add(formDataTag3); - Map p4=BaseUtils.map("dataId","Tio0","tagId","KU2j","tagName","q54w","id","deCs","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag4=BaseUtils.fromMap(p4,FormDataTag.class); - batchValues.add(formDataTag4); - Map p5=BaseUtils.map("dataId","jlsD","tagId","p8Wl","tagName","Fol6","id","OYFF","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag5=BaseUtils.fromMap(p5,FormDataTag.class); - batchValues.add(formDataTag5); - Map p6=BaseUtils.map("dataId","XUOD","tagId","yZZI","tagName","N28k","id","uYEJ","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag6=BaseUtils.fromMap(p6,FormDataTag.class); - batchValues.add(formDataTag6); - Map p7=BaseUtils.map("dataId","6HpM","tagId","wYyc","tagName","xEh3","id","YlXb","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag7=BaseUtils.fromMap(p7,FormDataTag.class); - batchValues.add(formDataTag7); - formDataTagService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","id","kz13","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag0=BaseUtils.fromMap(p0,FormDataTag.class); - batchValues.add(formDataTag0); - Map p1=BaseUtils.map("dataId","Bx6U","tagId","e8M6","tagName","18q9","id","1jQq","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag1=BaseUtils.fromMap(p1,FormDataTag.class); - batchValues.add(formDataTag1); - Map p2=BaseUtils.map("dataId","ZC6A","tagId","wTkq","tagName","31ux","id","4z5h","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag2=BaseUtils.fromMap(p2,FormDataTag.class); - batchValues.add(formDataTag2); - Map p3=BaseUtils.map("dataId","JSm7","tagId","LK3G","tagName","o7ym","id","2n6D","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag3=BaseUtils.fromMap(p3,FormDataTag.class); - batchValues.add(formDataTag3); - Map p4=BaseUtils.map("dataId","Tio0","tagId","KU2j","tagName","q54w","id","deCs","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag4=BaseUtils.fromMap(p4,FormDataTag.class); - batchValues.add(formDataTag4); - Map p5=BaseUtils.map("dataId","jlsD","tagId","p8Wl","tagName","Fol6","id","OYFF","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag5=BaseUtils.fromMap(p5,FormDataTag.class); - batchValues.add(formDataTag5); - Map p6=BaseUtils.map("dataId","XUOD","tagId","yZZI","tagName","N28k","id","uYEJ","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag6=BaseUtils.fromMap(p6,FormDataTag.class); - batchValues.add(formDataTag6); - Map p7=BaseUtils.map("dataId","6HpM","tagId","wYyc","tagName","xEh3","id","YlXb","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag7=BaseUtils.fromMap(p7,FormDataTag.class); - batchValues.add(formDataTag7); - formDataTagService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","kz13"); - Map result=this.formDataTagService.selectOne(FormDataTag.class.getName()+".selectOneMap",p); - Assert.assertEquals("kz13", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - long result=formDataTagService.countByWhere(formDataTag); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - List result=formDataTagService.selectListByWhere(formDataTag); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - FormDataTag formDataTag=BaseUtils.fromMap(p,FormDataTag.class); - List result=formDataTagService.selectListByWhere(formDataTag); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - List> result=formDataTagService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("dataId","5IKG","tagId","XMYF","tagName","0Gru","createTime",parse("2020-03-16 14:50:26")); - List> result=formDataTagService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormDataTag - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","kz13"); - - FormDataTag formDataTag1=BaseUtils.fromMap(p,FormDataTag.class); - FormDataTag formDataTag=formDataTagService.selectOneObject(formDataTag1); - Assert.assertEquals("kz13", formDataTag.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormDefService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormDefService.java index 00506d9..f97db7c 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormDefService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormDefService.java @@ -1,31 +1,31 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormDef; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormDefService; +import com.mdp.form.entity.FormDef; import org.springframework.boot.test.context.SpringBootTest; /** * FormDefService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_def form_def
+ * 表 form_def 表单定义
* 实体 FormDef
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
- * id,tableName,tableOwner,isCreateTable,formName,userid,deptid,formType,isTemplate,bizType,ctime,branchId,categoryId,tagIds,tagNames,username,deptName;
+ * id,tableName,tableOwner,isCreateTable,formName,userid,deptid,formType,isTemplate,bizType,ctime,branchId,categoryId,tagIds,tagNames,username,deptName,groupsJson,pks;
* 当前表的所有字段名:
- * id,table_name,table_owner,is_create_table,form_name,userid,deptid,form_type,is_template,biz_type,ctime,branch_id,category_id,tag_ids,tag_names,username,dept_name;
+ * id,table_name,table_owner,is_create_table,form_name,userid,deptid,form_type,is_template,biz_type,ctime,branch_id,category_id,tag_ids,tag_names,username,dept_name,groups_json,pks;
* 当前主键(包括多主键):
* id;
***/ @@ -42,273 +42,10 @@ public class TestFormDefService { ***/ @Test public void insert() { - Map p=BaseUtils.map("id","Ohi6","tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - formDefService.insert(formDef); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - formDefService.deleteByWhere(formDef); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","Ohi6"); + Map p=BaseUtils.map("id","3Elg","tableName","gILy","tableOwner","83qK","isCreateTable","Z","formName","n7av","userid","bbY1","deptid","38fU","formType","P","isTemplate","Y","bizType","h6Nb","ctime",new Date("2023-08-25 1:33:44"),"branchId","WoEw","categoryId","73NX","tagIds","U4nt","tagNames","SiXx","username","p972","deptName","0bMQ","groupsJson","oMT3","pks","i1V3"); FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - formDefService.deleteByPk(formDef); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(where,FormDef.class); - formDefService.updateSomeFieldByPk(formDef); + formDefService.save(formDef); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","Ohi6"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - formDefService.updateByPk(formDef); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("id","Ohi6","tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - formDefService.insertOrUpdate(formDef); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","Ohi6","tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef0=BaseUtils.fromMap(p0,FormDef.class); - batchValues.add(formDef0); - Map p1=BaseUtils.map("id","lnRj","tableName","eRWP","tableOwner","yZp9","isCreateTable","0","formName","eXEl","userid","3as1","deptid","27yP","formType","Z","isTemplate","1","bizType","C5Vm","ctime",parse("2020-03-16 23:28:15"),"branchId","ioGy","categoryId","VyR4","tagIds","1H1G","tagNames","Ud84","username","FVpk","deptName","1723"); - FormDef formDef1=BaseUtils.fromMap(p1,FormDef.class); - batchValues.add(formDef1); - Map p2=BaseUtils.map("id","UfB7","tableName","H9wc","tableOwner","59gk","isCreateTable","4","formName","Qw29","userid","51f6","deptid","ssG0","formType","c","isTemplate","4","bizType","19Fu","ctime",parse("2020-03-16 23:28:15"),"branchId","KvR4","categoryId","5324","tagIds","MRUd","tagNames","a7iH","username","XTj3","deptName","K4Mt"); - FormDef formDef2=BaseUtils.fromMap(p2,FormDef.class); - batchValues.add(formDef2); - Map p3=BaseUtils.map("id","zEsO","tableName","sTa3","tableOwner","KnE7","isCreateTable","u","formName","BJQi","userid","VI7W","deptid","UAJt","formType","u","isTemplate","p","bizType","CtDb","ctime",parse("2020-03-16 23:28:15"),"branchId","sG0t","categoryId","JZ60","tagIds","S6KO","tagNames","G4Q6","username","sKCp","deptName","fgH8"); - FormDef formDef3=BaseUtils.fromMap(p3,FormDef.class); - batchValues.add(formDef3); - Map p4=BaseUtils.map("id","L42O","tableName","ScXQ","tableOwner","JYaz","isCreateTable","8","formName","2x8f","userid","07yx","deptid","Cc5c","formType","6","isTemplate","V","bizType","a3ys","ctime",parse("2020-03-16 23:28:15"),"branchId","Gu9R","categoryId","Vero","tagIds","4f7R","tagNames","H42f","username","Om6X","deptName","kr60"); - FormDef formDef4=BaseUtils.fromMap(p4,FormDef.class); - batchValues.add(formDef4); - Map p5=BaseUtils.map("id","4C7f","tableName","8S4M","tableOwner","FU9H","isCreateTable","7","formName","sonf","userid","iV0P","deptid","8UE3","formType","f","isTemplate","R","bizType","3NxZ","ctime",parse("2020-03-16 23:28:15"),"branchId","SZmx","categoryId","QboM","tagIds","H6VU","tagNames","OcR5","username","890u","deptName","5ZM1"); - FormDef formDef5=BaseUtils.fromMap(p5,FormDef.class); - batchValues.add(formDef5); - Map p6=BaseUtils.map("id","ck8F","tableName","59Mz","tableOwner","hCaY","isCreateTable","B","formName","86FO","userid","47n3","deptid","tq59","formType","h","isTemplate","1","bizType","U7X0","ctime",parse("2020-03-16 23:28:15"),"branchId","dcu3","categoryId","XDZf","tagIds","5Ef8","tagNames","FDaq","username","6R4D","deptName","S45f"); - FormDef formDef6=BaseUtils.fromMap(p6,FormDef.class); - batchValues.add(formDef6); - Map p7=BaseUtils.map("id","7oH8","tableName","85bg","tableOwner","HG51","isCreateTable","h","formName","OJW4","userid","H7AL","deptid","LCzF","formType","x","isTemplate","7","bizType","Uw3P","ctime",parse("2020-03-16 23:28:15"),"branchId","2y0e","categoryId","Vz7z","tagIds","yd9Q","tagNames","HfFl","username","JP7K","deptName","wUyZ"); - FormDef formDef7=BaseUtils.fromMap(p7,FormDef.class); - batchValues.add(formDef7); - formDefService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","Ohi6","tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef0=BaseUtils.fromMap(p0,FormDef.class); - batchValues.add(formDef0); - Map p1=BaseUtils.map("id","lnRj","tableName","eRWP","tableOwner","yZp9","isCreateTable","0","formName","eXEl","userid","3as1","deptid","27yP","formType","Z","isTemplate","1","bizType","C5Vm","ctime",parse("2020-03-16 23:28:15"),"branchId","ioGy","categoryId","VyR4","tagIds","1H1G","tagNames","Ud84","username","FVpk","deptName","1723"); - FormDef formDef1=BaseUtils.fromMap(p1,FormDef.class); - batchValues.add(formDef1); - Map p2=BaseUtils.map("id","UfB7","tableName","H9wc","tableOwner","59gk","isCreateTable","4","formName","Qw29","userid","51f6","deptid","ssG0","formType","c","isTemplate","4","bizType","19Fu","ctime",parse("2020-03-16 23:28:15"),"branchId","KvR4","categoryId","5324","tagIds","MRUd","tagNames","a7iH","username","XTj3","deptName","K4Mt"); - FormDef formDef2=BaseUtils.fromMap(p2,FormDef.class); - batchValues.add(formDef2); - Map p3=BaseUtils.map("id","zEsO","tableName","sTa3","tableOwner","KnE7","isCreateTable","u","formName","BJQi","userid","VI7W","deptid","UAJt","formType","u","isTemplate","p","bizType","CtDb","ctime",parse("2020-03-16 23:28:15"),"branchId","sG0t","categoryId","JZ60","tagIds","S6KO","tagNames","G4Q6","username","sKCp","deptName","fgH8"); - FormDef formDef3=BaseUtils.fromMap(p3,FormDef.class); - batchValues.add(formDef3); - Map p4=BaseUtils.map("id","L42O","tableName","ScXQ","tableOwner","JYaz","isCreateTable","8","formName","2x8f","userid","07yx","deptid","Cc5c","formType","6","isTemplate","V","bizType","a3ys","ctime",parse("2020-03-16 23:28:15"),"branchId","Gu9R","categoryId","Vero","tagIds","4f7R","tagNames","H42f","username","Om6X","deptName","kr60"); - FormDef formDef4=BaseUtils.fromMap(p4,FormDef.class); - batchValues.add(formDef4); - Map p5=BaseUtils.map("id","4C7f","tableName","8S4M","tableOwner","FU9H","isCreateTable","7","formName","sonf","userid","iV0P","deptid","8UE3","formType","f","isTemplate","R","bizType","3NxZ","ctime",parse("2020-03-16 23:28:15"),"branchId","SZmx","categoryId","QboM","tagIds","H6VU","tagNames","OcR5","username","890u","deptName","5ZM1"); - FormDef formDef5=BaseUtils.fromMap(p5,FormDef.class); - batchValues.add(formDef5); - Map p6=BaseUtils.map("id","ck8F","tableName","59Mz","tableOwner","hCaY","isCreateTable","B","formName","86FO","userid","47n3","deptid","tq59","formType","h","isTemplate","1","bizType","U7X0","ctime",parse("2020-03-16 23:28:15"),"branchId","dcu3","categoryId","XDZf","tagIds","5Ef8","tagNames","FDaq","username","6R4D","deptName","S45f"); - FormDef formDef6=BaseUtils.fromMap(p6,FormDef.class); - batchValues.add(formDef6); - Map p7=BaseUtils.map("id","7oH8","tableName","85bg","tableOwner","HG51","isCreateTable","h","formName","OJW4","userid","H7AL","deptid","LCzF","formType","x","isTemplate","7","bizType","Uw3P","ctime",parse("2020-03-16 23:28:15"),"branchId","2y0e","categoryId","Vz7z","tagIds","yd9Q","tagNames","HfFl","username","JP7K","deptName","wUyZ"); - FormDef formDef7=BaseUtils.fromMap(p7,FormDef.class); - batchValues.add(formDef7); - formDefService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("id","Ohi6","tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef0=BaseUtils.fromMap(p0,FormDef.class); - batchValues.add(formDef0); - Map p1=BaseUtils.map("id","lnRj","tableName","eRWP","tableOwner","yZp9","isCreateTable","0","formName","eXEl","userid","3as1","deptid","27yP","formType","Z","isTemplate","1","bizType","C5Vm","ctime",parse("2020-03-16 23:28:15"),"branchId","ioGy","categoryId","VyR4","tagIds","1H1G","tagNames","Ud84","username","FVpk","deptName","1723"); - FormDef formDef1=BaseUtils.fromMap(p1,FormDef.class); - batchValues.add(formDef1); - Map p2=BaseUtils.map("id","UfB7","tableName","H9wc","tableOwner","59gk","isCreateTable","4","formName","Qw29","userid","51f6","deptid","ssG0","formType","c","isTemplate","4","bizType","19Fu","ctime",parse("2020-03-16 23:28:15"),"branchId","KvR4","categoryId","5324","tagIds","MRUd","tagNames","a7iH","username","XTj3","deptName","K4Mt"); - FormDef formDef2=BaseUtils.fromMap(p2,FormDef.class); - batchValues.add(formDef2); - Map p3=BaseUtils.map("id","zEsO","tableName","sTa3","tableOwner","KnE7","isCreateTable","u","formName","BJQi","userid","VI7W","deptid","UAJt","formType","u","isTemplate","p","bizType","CtDb","ctime",parse("2020-03-16 23:28:15"),"branchId","sG0t","categoryId","JZ60","tagIds","S6KO","tagNames","G4Q6","username","sKCp","deptName","fgH8"); - FormDef formDef3=BaseUtils.fromMap(p3,FormDef.class); - batchValues.add(formDef3); - Map p4=BaseUtils.map("id","L42O","tableName","ScXQ","tableOwner","JYaz","isCreateTable","8","formName","2x8f","userid","07yx","deptid","Cc5c","formType","6","isTemplate","V","bizType","a3ys","ctime",parse("2020-03-16 23:28:15"),"branchId","Gu9R","categoryId","Vero","tagIds","4f7R","tagNames","H42f","username","Om6X","deptName","kr60"); - FormDef formDef4=BaseUtils.fromMap(p4,FormDef.class); - batchValues.add(formDef4); - Map p5=BaseUtils.map("id","4C7f","tableName","8S4M","tableOwner","FU9H","isCreateTable","7","formName","sonf","userid","iV0P","deptid","8UE3","formType","f","isTemplate","R","bizType","3NxZ","ctime",parse("2020-03-16 23:28:15"),"branchId","SZmx","categoryId","QboM","tagIds","H6VU","tagNames","OcR5","username","890u","deptName","5ZM1"); - FormDef formDef5=BaseUtils.fromMap(p5,FormDef.class); - batchValues.add(formDef5); - Map p6=BaseUtils.map("id","ck8F","tableName","59Mz","tableOwner","hCaY","isCreateTable","B","formName","86FO","userid","47n3","deptid","tq59","formType","h","isTemplate","1","bizType","U7X0","ctime",parse("2020-03-16 23:28:15"),"branchId","dcu3","categoryId","XDZf","tagIds","5Ef8","tagNames","FDaq","username","6R4D","deptName","S45f"); - FormDef formDef6=BaseUtils.fromMap(p6,FormDef.class); - batchValues.add(formDef6); - Map p7=BaseUtils.map("id","7oH8","tableName","85bg","tableOwner","HG51","isCreateTable","h","formName","OJW4","userid","H7AL","deptid","LCzF","formType","x","isTemplate","7","bizType","Uw3P","ctime",parse("2020-03-16 23:28:15"),"branchId","2y0e","categoryId","Vz7z","tagIds","yd9Q","tagNames","HfFl","username","JP7K","deptName","wUyZ"); - FormDef formDef7=BaseUtils.fromMap(p7,FormDef.class); - batchValues.add(formDef7); - formDefService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","Ohi6"); - Map result=this.formDefService.selectOne(FormDef.class.getName()+".selectOneMap",p); - Assert.assertEquals("Ohi6", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - long result=formDefService.countByWhere(formDef); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - List result=formDefService.selectListByWhere(formDef); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - FormDef formDef=BaseUtils.fromMap(p,FormDef.class); - List result=formDefService.selectListByWhere(formDef); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - List> result=formDefService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("tableName","rMaQ","tableOwner","2Hz4","isCreateTable","V","formName","8gp6","userid","NKUh","deptid","7SMx","formType","n","isTemplate","C","bizType","2N7H","ctime",parse("2020-03-16 23:28:15"),"branchId","h0b0","categoryId","5LwF","tagIds","jXSn","tagNames","71bt","username","qJF0","deptName","8TYz"); - List> result=formDefService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormDef - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","Ohi6"); - - FormDef formDef1=BaseUtils.fromMap(p,FormDef.class); - FormDef formDef=formDefService.selectOneObject(formDef1); - Assert.assertEquals("Ohi6", formDef.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormDefTagService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormDefTagService.java index f010d52..25d6482 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormDefTagService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormDefTagService.java @@ -1,25 +1,25 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormDefTag; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormDefTagService; +import com.mdp.form.entity.FormDefTag; import org.springframework.boot.test.context.SpringBootTest; /** * FormDefTagService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_def_tag form_def_tag
+ * 表 form_def_tag form_def_tag
* 实体 FormDefTag
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
@@ -42,273 +42,10 @@ public class TestFormDefTagService { ***/ @Test public void insert() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","id","F9B1","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - formDefTagService.insert(formDefTag); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - formDefTagService.deleteByWhere(formDefTag); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","F9B1"); + Map p=BaseUtils.map("formId","N8Wi","tagId","mp13","tagName","uCfn","id","a934","createTime",new Date("2023-08-25 1:33:44")); FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - formDefTagService.deleteByPk(formDefTag); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(where,FormDefTag.class); - formDefTagService.updateSomeFieldByPk(formDefTag); + formDefTagService.save(formDefTag); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","F9B1"); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - formDefTagService.updateByPk(formDefTag); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","id","F9B1","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - formDefTagService.insertOrUpdate(formDefTag); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","id","F9B1","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag0=BaseUtils.fromMap(p0,FormDefTag.class); - batchValues.add(formDefTag0); - Map p1=BaseUtils.map("formId","5Ip5","tagId","6nnt","tagName","DmdU","id","O5bx","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag1=BaseUtils.fromMap(p1,FormDefTag.class); - batchValues.add(formDefTag1); - Map p2=BaseUtils.map("formId","3qMb","tagId","FKw4","tagName","i3UN","id","KJcu","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag2=BaseUtils.fromMap(p2,FormDefTag.class); - batchValues.add(formDefTag2); - Map p3=BaseUtils.map("formId","MmpX","tagId","S4F8","tagName","71ZL","id","8gi3","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag3=BaseUtils.fromMap(p3,FormDefTag.class); - batchValues.add(formDefTag3); - Map p4=BaseUtils.map("formId","00Xz","tagId","Kkyn","tagName","2I7i","id","1MYN","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag4=BaseUtils.fromMap(p4,FormDefTag.class); - batchValues.add(formDefTag4); - Map p5=BaseUtils.map("formId","O4Pm","tagId","3VxG","tagName","6W3U","id","LQPw","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag5=BaseUtils.fromMap(p5,FormDefTag.class); - batchValues.add(formDefTag5); - Map p6=BaseUtils.map("formId","9PXc","tagId","E7HL","tagName","LxS6","id","W76y","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag6=BaseUtils.fromMap(p6,FormDefTag.class); - batchValues.add(formDefTag6); - Map p7=BaseUtils.map("formId","mIkA","tagId","RZI3","tagName","yw3S","id","u59f","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag7=BaseUtils.fromMap(p7,FormDefTag.class); - batchValues.add(formDefTag7); - formDefTagService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","id","F9B1","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag0=BaseUtils.fromMap(p0,FormDefTag.class); - batchValues.add(formDefTag0); - Map p1=BaseUtils.map("formId","5Ip5","tagId","6nnt","tagName","DmdU","id","O5bx","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag1=BaseUtils.fromMap(p1,FormDefTag.class); - batchValues.add(formDefTag1); - Map p2=BaseUtils.map("formId","3qMb","tagId","FKw4","tagName","i3UN","id","KJcu","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag2=BaseUtils.fromMap(p2,FormDefTag.class); - batchValues.add(formDefTag2); - Map p3=BaseUtils.map("formId","MmpX","tagId","S4F8","tagName","71ZL","id","8gi3","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag3=BaseUtils.fromMap(p3,FormDefTag.class); - batchValues.add(formDefTag3); - Map p4=BaseUtils.map("formId","00Xz","tagId","Kkyn","tagName","2I7i","id","1MYN","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag4=BaseUtils.fromMap(p4,FormDefTag.class); - batchValues.add(formDefTag4); - Map p5=BaseUtils.map("formId","O4Pm","tagId","3VxG","tagName","6W3U","id","LQPw","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag5=BaseUtils.fromMap(p5,FormDefTag.class); - batchValues.add(formDefTag5); - Map p6=BaseUtils.map("formId","9PXc","tagId","E7HL","tagName","LxS6","id","W76y","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag6=BaseUtils.fromMap(p6,FormDefTag.class); - batchValues.add(formDefTag6); - Map p7=BaseUtils.map("formId","mIkA","tagId","RZI3","tagName","yw3S","id","u59f","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag7=BaseUtils.fromMap(p7,FormDefTag.class); - batchValues.add(formDefTag7); - formDefTagService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","id","F9B1","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag0=BaseUtils.fromMap(p0,FormDefTag.class); - batchValues.add(formDefTag0); - Map p1=BaseUtils.map("formId","5Ip5","tagId","6nnt","tagName","DmdU","id","O5bx","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag1=BaseUtils.fromMap(p1,FormDefTag.class); - batchValues.add(formDefTag1); - Map p2=BaseUtils.map("formId","3qMb","tagId","FKw4","tagName","i3UN","id","KJcu","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag2=BaseUtils.fromMap(p2,FormDefTag.class); - batchValues.add(formDefTag2); - Map p3=BaseUtils.map("formId","MmpX","tagId","S4F8","tagName","71ZL","id","8gi3","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag3=BaseUtils.fromMap(p3,FormDefTag.class); - batchValues.add(formDefTag3); - Map p4=BaseUtils.map("formId","00Xz","tagId","Kkyn","tagName","2I7i","id","1MYN","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag4=BaseUtils.fromMap(p4,FormDefTag.class); - batchValues.add(formDefTag4); - Map p5=BaseUtils.map("formId","O4Pm","tagId","3VxG","tagName","6W3U","id","LQPw","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag5=BaseUtils.fromMap(p5,FormDefTag.class); - batchValues.add(formDefTag5); - Map p6=BaseUtils.map("formId","9PXc","tagId","E7HL","tagName","LxS6","id","W76y","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag6=BaseUtils.fromMap(p6,FormDefTag.class); - batchValues.add(formDefTag6); - Map p7=BaseUtils.map("formId","mIkA","tagId","RZI3","tagName","yw3S","id","u59f","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag7=BaseUtils.fromMap(p7,FormDefTag.class); - batchValues.add(formDefTag7); - formDefTagService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","F9B1"); - Map result=this.formDefTagService.selectOne(FormDefTag.class.getName()+".selectOneMap",p); - Assert.assertEquals("F9B1", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - long result=formDefTagService.countByWhere(formDefTag); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - List result=formDefTagService.selectListByWhere(formDefTag); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - FormDefTag formDefTag=BaseUtils.fromMap(p,FormDefTag.class); - List result=formDefTagService.selectListByWhere(formDefTag); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - List> result=formDefTagService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("formId","4eu8","tagId","zZ3c","tagName","JXVZ","createTime",parse("2020-03-16 14:50:25")); - List> result=formDefTagService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormDefTag - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","F9B1"); - - FormDefTag formDefTag1=BaseUtils.fromMap(p,FormDefTag.class); - FormDefTag formDefTag=formDefTagService.selectOneObject(formDefTag1); - Assert.assertEquals("F9B1", formDefTag.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormFieldService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormFieldService.java index 96d5301..be11b36 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormFieldService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormFieldService.java @@ -1,31 +1,31 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormField; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormFieldService; +import com.mdp.form.entity.FormField; import org.springframework.boot.test.context.SpringBootTest; /** * FormFieldService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_field form_field
+ * 表 form_field 表单字段定义
* 实体 FormField
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
- * formId,id,fieldId,fieldTitle,secondCodeRow,fieldType,fieldLength,defaultValue,isMultiple,placeholder,isRequired,isFromBaseData,fieldIdCamel,remark,extFieldType,isCloneToFlow,flowFieldId,isBizKey,seqNo;
+ * formId,id,fieldId,fieldTitle,dictCode,fieldType,fieldLength,defaultValue,isMultiple,placeholder,isRequired,isDict,fieldIdCamel,remark,extFieldType,toFlow,flowFieldId,isBizKey,seqNo,groupId;
* 当前表的所有字段名:
- * form_id,id,field_id,field_title,second_code_row,field_type,field_length,default_value,is_multiple,placeholder,is_required,is_from_base_data,field_id_camel,remark,ext_field_type,is_clone_to_flow,flow_field_id,is_biz_key,seq_no;
+ * form_id,id,field_id,field_title,dict_code,field_type,field_length,default_value,is_multiple,placeholder,is_required,is_dict,field_id_camel,remark,ext_field_type,to_flow,flow_field_id,is_biz_key,seq_no,group_id;
* 当前主键(包括多主键):
* id;
***/ @@ -42,273 +42,10 @@ public class TestFormFieldService { ***/ @Test public void insert() { - Map p=BaseUtils.map("formId","Oj5r","id","U54V","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(p,FormField.class); - formFieldService.insert(formField); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(p,FormField.class); - formFieldService.deleteByWhere(formField); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("id","U54V"); + Map p=BaseUtils.map("formId","6TM0","id","QIgM","fieldId","6EUc","fieldTitle","IB4C","dictCode","pC5H","fieldType","7pp9","fieldLength",646.45,"defaultValue","p7aV","isMultiple","8","placeholder","n5UW","isRequired","T","isDict","k","fieldIdCamel","kCOB","remark","DJ57","extFieldType","9jyc","toFlow","4","flowFieldId","d04b","isBizKey","T1Rt","seqNo",7194.33,"groupId","6iXR"); FormField formField=BaseUtils.fromMap(p,FormField.class); - formFieldService.deleteByPk(formField); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(where,FormField.class); - formFieldService.updateSomeFieldByPk(formField); + formFieldService.save(formField); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("id","U54V"); - FormField formField=BaseUtils.fromMap(p,FormField.class); - formFieldService.updateByPk(formField); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("formId","Oj5r","id","U54V","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(p,FormField.class); - formFieldService.insertOrUpdate(formField); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","Oj5r","id","U54V","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField0=BaseUtils.fromMap(p0,FormField.class); - batchValues.add(formField0); - Map p1=BaseUtils.map("formId","OglH","id","y415","fieldId","NbAT","fieldTitle","cMB6","secondCodeRow","sj7n","fieldType","Psul","fieldLength",642.916,"defaultValue","XC8v","isMultiple","R","placeholder","nU3c","isRequired","D","isFromBaseData","E","fieldIdCamel","WLDd","remark","uXiu","extFieldType","7kf3","isCloneToFlow","y","flowFieldId","pCHR","isBizKey","c","seqNo",7911.336); - FormField formField1=BaseUtils.fromMap(p1,FormField.class); - batchValues.add(formField1); - Map p2=BaseUtils.map("formId","z679","id","FNov","fieldId","NjQ4","fieldTitle","u5Z2","secondCodeRow","qvDr","fieldType","cg00","fieldLength",6453.823,"defaultValue","O68h","isMultiple","W","placeholder","1t0P","isRequired","l","isFromBaseData","P","fieldIdCamel","9ASC","remark","6z8H","extFieldType","9T7G","isCloneToFlow","e","flowFieldId","inQ2","isBizKey","1","seqNo",4028.162); - FormField formField2=BaseUtils.fromMap(p2,FormField.class); - batchValues.add(formField2); - Map p3=BaseUtils.map("formId","LQFd","id","GZPO","fieldId","n422","fieldTitle","ZkKC","secondCodeRow","MLNm","fieldType","9CwI","fieldLength",1215.544,"defaultValue","KsP1","isMultiple","6","placeholder","AjUP","isRequired","Q","isFromBaseData","K","fieldIdCamel","gg80","remark","G3HP","extFieldType","QmXM","isCloneToFlow","2","flowFieldId","Tpnw","isBizKey","p","seqNo",414.528); - FormField formField3=BaseUtils.fromMap(p3,FormField.class); - batchValues.add(formField3); - Map p4=BaseUtils.map("formId","MNJ5","id","h9PG","fieldId","S1Wh","fieldTitle","mJtt","secondCodeRow","vmqy","fieldType","NAWS","fieldLength",7734.941,"defaultValue","EsA2","isMultiple","K","placeholder","yoDf","isRequired","k","isFromBaseData","p","fieldIdCamel","PG9y","remark","nmQc","extFieldType","lSlA","isCloneToFlow","j","flowFieldId","epW5","isBizKey","1","seqNo",2161.171); - FormField formField4=BaseUtils.fromMap(p4,FormField.class); - batchValues.add(formField4); - Map p5=BaseUtils.map("formId","5bgn","id","aJTL","fieldId","1pb4","fieldTitle","71hg","secondCodeRow","AIoP","fieldType","mRtJ","fieldLength",3511.665,"defaultValue","9gdx","isMultiple","e","placeholder","i5iF","isRequired","k","isFromBaseData","I","fieldIdCamel","FAKF","remark","k9p6","extFieldType","2274","isCloneToFlow","1","flowFieldId","5RFi","isBizKey","9","seqNo",2280.077); - FormField formField5=BaseUtils.fromMap(p5,FormField.class); - batchValues.add(formField5); - Map p6=BaseUtils.map("formId","PvNA","id","pg11","fieldId","I3Lr","fieldTitle","QYrt","secondCodeRow","Qw8t","fieldType","qceu","fieldLength",6115.082,"defaultValue","Gl0w","isMultiple","R","placeholder","oe1f","isRequired","E","isFromBaseData","z","fieldIdCamel","5h1a","remark","H603","extFieldType","OHn5","isCloneToFlow","a","flowFieldId","zErw","isBizKey","y","seqNo",7052.098); - FormField formField6=BaseUtils.fromMap(p6,FormField.class); - batchValues.add(formField6); - Map p7=BaseUtils.map("formId","z7p0","id","d2a7","fieldId","N7s7","fieldTitle","i5R8","secondCodeRow","35sh","fieldType","ffRw","fieldLength",5765.669,"defaultValue","qO3b","isMultiple","4","placeholder","O1h6","isRequired","K","isFromBaseData","a","fieldIdCamel","H35l","remark","1Fms","extFieldType","fAa6","isCloneToFlow","6","flowFieldId","06bT","isBizKey","S","seqNo",1350.034); - FormField formField7=BaseUtils.fromMap(p7,FormField.class); - batchValues.add(formField7); - formFieldService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","Oj5r","id","U54V","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField0=BaseUtils.fromMap(p0,FormField.class); - batchValues.add(formField0); - Map p1=BaseUtils.map("formId","OglH","id","y415","fieldId","NbAT","fieldTitle","cMB6","secondCodeRow","sj7n","fieldType","Psul","fieldLength",642.916,"defaultValue","XC8v","isMultiple","R","placeholder","nU3c","isRequired","D","isFromBaseData","E","fieldIdCamel","WLDd","remark","uXiu","extFieldType","7kf3","isCloneToFlow","y","flowFieldId","pCHR","isBizKey","c","seqNo",7911.336); - FormField formField1=BaseUtils.fromMap(p1,FormField.class); - batchValues.add(formField1); - Map p2=BaseUtils.map("formId","z679","id","FNov","fieldId","NjQ4","fieldTitle","u5Z2","secondCodeRow","qvDr","fieldType","cg00","fieldLength",6453.823,"defaultValue","O68h","isMultiple","W","placeholder","1t0P","isRequired","l","isFromBaseData","P","fieldIdCamel","9ASC","remark","6z8H","extFieldType","9T7G","isCloneToFlow","e","flowFieldId","inQ2","isBizKey","1","seqNo",4028.162); - FormField formField2=BaseUtils.fromMap(p2,FormField.class); - batchValues.add(formField2); - Map p3=BaseUtils.map("formId","LQFd","id","GZPO","fieldId","n422","fieldTitle","ZkKC","secondCodeRow","MLNm","fieldType","9CwI","fieldLength",1215.544,"defaultValue","KsP1","isMultiple","6","placeholder","AjUP","isRequired","Q","isFromBaseData","K","fieldIdCamel","gg80","remark","G3HP","extFieldType","QmXM","isCloneToFlow","2","flowFieldId","Tpnw","isBizKey","p","seqNo",414.528); - FormField formField3=BaseUtils.fromMap(p3,FormField.class); - batchValues.add(formField3); - Map p4=BaseUtils.map("formId","MNJ5","id","h9PG","fieldId","S1Wh","fieldTitle","mJtt","secondCodeRow","vmqy","fieldType","NAWS","fieldLength",7734.941,"defaultValue","EsA2","isMultiple","K","placeholder","yoDf","isRequired","k","isFromBaseData","p","fieldIdCamel","PG9y","remark","nmQc","extFieldType","lSlA","isCloneToFlow","j","flowFieldId","epW5","isBizKey","1","seqNo",2161.171); - FormField formField4=BaseUtils.fromMap(p4,FormField.class); - batchValues.add(formField4); - Map p5=BaseUtils.map("formId","5bgn","id","aJTL","fieldId","1pb4","fieldTitle","71hg","secondCodeRow","AIoP","fieldType","mRtJ","fieldLength",3511.665,"defaultValue","9gdx","isMultiple","e","placeholder","i5iF","isRequired","k","isFromBaseData","I","fieldIdCamel","FAKF","remark","k9p6","extFieldType","2274","isCloneToFlow","1","flowFieldId","5RFi","isBizKey","9","seqNo",2280.077); - FormField formField5=BaseUtils.fromMap(p5,FormField.class); - batchValues.add(formField5); - Map p6=BaseUtils.map("formId","PvNA","id","pg11","fieldId","I3Lr","fieldTitle","QYrt","secondCodeRow","Qw8t","fieldType","qceu","fieldLength",6115.082,"defaultValue","Gl0w","isMultiple","R","placeholder","oe1f","isRequired","E","isFromBaseData","z","fieldIdCamel","5h1a","remark","H603","extFieldType","OHn5","isCloneToFlow","a","flowFieldId","zErw","isBizKey","y","seqNo",7052.098); - FormField formField6=BaseUtils.fromMap(p6,FormField.class); - batchValues.add(formField6); - Map p7=BaseUtils.map("formId","z7p0","id","d2a7","fieldId","N7s7","fieldTitle","i5R8","secondCodeRow","35sh","fieldType","ffRw","fieldLength",5765.669,"defaultValue","qO3b","isMultiple","4","placeholder","O1h6","isRequired","K","isFromBaseData","a","fieldIdCamel","H35l","remark","1Fms","extFieldType","fAa6","isCloneToFlow","6","flowFieldId","06bT","isBizKey","S","seqNo",1350.034); - FormField formField7=BaseUtils.fromMap(p7,FormField.class); - batchValues.add(formField7); - formFieldService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","Oj5r","id","U54V","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField0=BaseUtils.fromMap(p0,FormField.class); - batchValues.add(formField0); - Map p1=BaseUtils.map("formId","OglH","id","y415","fieldId","NbAT","fieldTitle","cMB6","secondCodeRow","sj7n","fieldType","Psul","fieldLength",642.916,"defaultValue","XC8v","isMultiple","R","placeholder","nU3c","isRequired","D","isFromBaseData","E","fieldIdCamel","WLDd","remark","uXiu","extFieldType","7kf3","isCloneToFlow","y","flowFieldId","pCHR","isBizKey","c","seqNo",7911.336); - FormField formField1=BaseUtils.fromMap(p1,FormField.class); - batchValues.add(formField1); - Map p2=BaseUtils.map("formId","z679","id","FNov","fieldId","NjQ4","fieldTitle","u5Z2","secondCodeRow","qvDr","fieldType","cg00","fieldLength",6453.823,"defaultValue","O68h","isMultiple","W","placeholder","1t0P","isRequired","l","isFromBaseData","P","fieldIdCamel","9ASC","remark","6z8H","extFieldType","9T7G","isCloneToFlow","e","flowFieldId","inQ2","isBizKey","1","seqNo",4028.162); - FormField formField2=BaseUtils.fromMap(p2,FormField.class); - batchValues.add(formField2); - Map p3=BaseUtils.map("formId","LQFd","id","GZPO","fieldId","n422","fieldTitle","ZkKC","secondCodeRow","MLNm","fieldType","9CwI","fieldLength",1215.544,"defaultValue","KsP1","isMultiple","6","placeholder","AjUP","isRequired","Q","isFromBaseData","K","fieldIdCamel","gg80","remark","G3HP","extFieldType","QmXM","isCloneToFlow","2","flowFieldId","Tpnw","isBizKey","p","seqNo",414.528); - FormField formField3=BaseUtils.fromMap(p3,FormField.class); - batchValues.add(formField3); - Map p4=BaseUtils.map("formId","MNJ5","id","h9PG","fieldId","S1Wh","fieldTitle","mJtt","secondCodeRow","vmqy","fieldType","NAWS","fieldLength",7734.941,"defaultValue","EsA2","isMultiple","K","placeholder","yoDf","isRequired","k","isFromBaseData","p","fieldIdCamel","PG9y","remark","nmQc","extFieldType","lSlA","isCloneToFlow","j","flowFieldId","epW5","isBizKey","1","seqNo",2161.171); - FormField formField4=BaseUtils.fromMap(p4,FormField.class); - batchValues.add(formField4); - Map p5=BaseUtils.map("formId","5bgn","id","aJTL","fieldId","1pb4","fieldTitle","71hg","secondCodeRow","AIoP","fieldType","mRtJ","fieldLength",3511.665,"defaultValue","9gdx","isMultiple","e","placeholder","i5iF","isRequired","k","isFromBaseData","I","fieldIdCamel","FAKF","remark","k9p6","extFieldType","2274","isCloneToFlow","1","flowFieldId","5RFi","isBizKey","9","seqNo",2280.077); - FormField formField5=BaseUtils.fromMap(p5,FormField.class); - batchValues.add(formField5); - Map p6=BaseUtils.map("formId","PvNA","id","pg11","fieldId","I3Lr","fieldTitle","QYrt","secondCodeRow","Qw8t","fieldType","qceu","fieldLength",6115.082,"defaultValue","Gl0w","isMultiple","R","placeholder","oe1f","isRequired","E","isFromBaseData","z","fieldIdCamel","5h1a","remark","H603","extFieldType","OHn5","isCloneToFlow","a","flowFieldId","zErw","isBizKey","y","seqNo",7052.098); - FormField formField6=BaseUtils.fromMap(p6,FormField.class); - batchValues.add(formField6); - Map p7=BaseUtils.map("formId","z7p0","id","d2a7","fieldId","N7s7","fieldTitle","i5R8","secondCodeRow","35sh","fieldType","ffRw","fieldLength",5765.669,"defaultValue","qO3b","isMultiple","4","placeholder","O1h6","isRequired","K","isFromBaseData","a","fieldIdCamel","H35l","remark","1Fms","extFieldType","fAa6","isCloneToFlow","6","flowFieldId","06bT","isBizKey","S","seqNo",1350.034); - FormField formField7=BaseUtils.fromMap(p7,FormField.class); - batchValues.add(formField7); - formFieldService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("id","U54V"); - Map result=this.formFieldService.selectOne(FormField.class.getName()+".selectOneMap",p); - Assert.assertEquals("U54V", result.get("id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(p,FormField.class); - long result=formFieldService.countByWhere(formField); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormField formField=BaseUtils.fromMap(p,FormField.class); - List result=formFieldService.selectListByWhere(formField); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - FormField formField=BaseUtils.fromMap(p,FormField.class); - List result=formFieldService.selectListByWhere(formField); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - List> result=formFieldService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("formId","Oj5r","fieldId","jOBG","fieldTitle","5VpR","secondCodeRow","5ObO","fieldType","kNGG","fieldLength",2866.439,"defaultValue","JpQ6","isMultiple","u","placeholder","9q9n","isRequired","g","isFromBaseData","M","fieldIdCamel","nHOV","remark","iHtf","extFieldType","3IL3","isCloneToFlow","4","flowFieldId","lDQJ","isBizKey","X","seqNo",2119.375); - List> result=formFieldService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormField - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("id","U54V"); - - FormField formField1=BaseUtils.fromMap(p,FormField.class); - FormField formField=formFieldService.selectOneObject(formField1); - Assert.assertEquals("U54V", formField.getId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + } diff --git a/mdp-form/src/test/java/com/mdp/form/service/TestFormQxService.java b/mdp-form/src/test/java/com/mdp/form/service/TestFormQxService.java index 246a0ac..31dda40 100644 --- a/mdp-form/src/test/java/com/mdp/form/service/TestFormQxService.java +++ b/mdp-form/src/test/java/com/mdp/form/service/TestFormQxService.java @@ -1,25 +1,25 @@ -package com.mdp.form.service; +package com.mdp.form.service; import java.util.*; import java.text.SimpleDateFormat; - -import com.mdp.form.entity.FormQx; 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.beans.factory.annotation.Autowired; +import com.mdp.form.service.FormQxService; +import com.mdp.form.entity.FormQx; import org.springframework.boot.test.context.SpringBootTest; /** * FormQxService的测试案例 - * 组织 com.qqkj
+ * 组织 com
* 顶级模块 mdp
* 大模块 form
* 小模块
- * 表 FORM.form_qx form_qx
+ * 表 form_qx 表单权限
* 实体 FormQx
* 表是指数据库结构中的表,实体是指java类型中的实体类
* 当前实体所有属性名:
@@ -42,273 +42,10 @@ public class TestFormQxService { ***/ @Test public void insert() { - Map p=BaseUtils.map("formId","v1Bz","allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - formQxService.insert(formQx); - //Assert.assertEquals(1, result); - } - /** - * 删除满足条件的一条或者一批数据 - ***/ - @Test - public void deleteByWhere() { - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - formQxService.deleteByWhere(formQx); - //Assert.assertEquals(1, result); - } - - /** - * 跟进主键删除一条数据 - ***/ - @Test - public void deleteByPk() { - Map p=BaseUtils.map("formId","v1Bz"); + Map p=BaseUtils.map("formId","UeR9","allowQueryRoleids","7aMo","allowQueryDeptids","29vz","allowQueryUserids","Oo88","notQueryRoleids","F7zD","notQueryDeptids","BNw0","notQueryUserids","n0JD","allowOtherQuery","H","allowOtherEdit","w","allowOtherDel","n","doDeptLvlCheck","5","deptLvlQx","gy0c"); FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - formQxService.deleteByPk(formQx); - //Assert.assertEquals(1, result); - } - - /** - * 更新满足条件的一条或者一批数据 - ***/ - @Test - public void updateSomeFieldByPk() { - Map where=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(where,FormQx.class); - formQxService.updateSomeFieldByPk(formQx); + formQxService.save(formQx); //Assert.assertEquals(1, result); } - - - - /** - * 根据主键更新一条数据 - ***/ - @Test - public void updateByPk() { - Map p=BaseUtils.map("formId","v1Bz"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - formQxService.updateByPk(formQx); - //Assert.assertEquals(1, result); - } - - - /** - * 新增或者修改一条数据 - ***/ - @Test - public void insertOrUpdate() { - Map p=BaseUtils.map("formId","v1Bz","allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - formQxService.insertOrUpdate(formQx); - //Assert.assertEquals(1, result); - } - - - /** - * 批量更新一批数据到数据库 - ***/ - @Test - public void batchUpdate() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","v1Bz","allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx0=BaseUtils.fromMap(p0,FormQx.class); - batchValues.add(formQx0); - Map p1=BaseUtils.map("formId","Om2A","allowQueryRoleids","ny8L","allowQueryDeptids","UqXO","allowQueryUserids","0QSJ","notQueryRoleids","ocze","notQueryDeptids","46vq","notQueryUserids","rh2t","allowOtherQuery","6","allowOtherEdit","N","allowOtherDel","I","doDeptLvlCheck","e","deptLvlQx","69hU"); - FormQx formQx1=BaseUtils.fromMap(p1,FormQx.class); - batchValues.add(formQx1); - Map p2=BaseUtils.map("formId","49zM","allowQueryRoleids","VE95","allowQueryDeptids","ipQ5","allowQueryUserids","ICHL","notQueryRoleids","Ou41","notQueryDeptids","FBxl","notQueryUserids","zVIA","allowOtherQuery","G","allowOtherEdit","g","allowOtherDel","B","doDeptLvlCheck","G","deptLvlQx","r20S"); - FormQx formQx2=BaseUtils.fromMap(p2,FormQx.class); - batchValues.add(formQx2); - Map p3=BaseUtils.map("formId","ybtx","allowQueryRoleids","r0JC","allowQueryDeptids","Hi9g","allowQueryUserids","UCHb","notQueryRoleids","Us7h","notQueryDeptids","uRwf","notQueryUserids","Kcw0","allowOtherQuery","E","allowOtherEdit","2","allowOtherDel","o","doDeptLvlCheck","e","deptLvlQx","sOXr"); - FormQx formQx3=BaseUtils.fromMap(p3,FormQx.class); - batchValues.add(formQx3); - Map p4=BaseUtils.map("formId","o5PE","allowQueryRoleids","N51x","allowQueryDeptids","vy73","allowQueryUserids","WyIB","notQueryRoleids","WhNC","notQueryDeptids","QmnS","notQueryUserids","LeeF","allowOtherQuery","R","allowOtherEdit","R","allowOtherDel","u","doDeptLvlCheck","4","deptLvlQx","7vqd"); - FormQx formQx4=BaseUtils.fromMap(p4,FormQx.class); - batchValues.add(formQx4); - Map p5=BaseUtils.map("formId","t2gl","allowQueryRoleids","jId5","allowQueryDeptids","41v7","allowQueryUserids","UDpQ","notQueryRoleids","Z7QW","notQueryDeptids","4tRo","notQueryUserids","R7Lf","allowOtherQuery","J","allowOtherEdit","G","allowOtherDel","u","doDeptLvlCheck","6","deptLvlQx","se6j"); - FormQx formQx5=BaseUtils.fromMap(p5,FormQx.class); - batchValues.add(formQx5); - Map p6=BaseUtils.map("formId","Oon4","allowQueryRoleids","CcyM","allowQueryDeptids","f9Yn","allowQueryUserids","6OPR","notQueryRoleids","PFO8","notQueryDeptids","Hvbm","notQueryUserids","L7n6","allowOtherQuery","L","allowOtherEdit","x","allowOtherDel","4","doDeptLvlCheck","b","deptLvlQx","OWYc"); - FormQx formQx6=BaseUtils.fromMap(p6,FormQx.class); - batchValues.add(formQx6); - Map p7=BaseUtils.map("formId","Nr5j","allowQueryRoleids","5qkT","allowQueryDeptids","j8mJ","allowQueryUserids","89ST","notQueryRoleids","F86I","notQueryDeptids","XxLi","notQueryUserids","U9ll","allowOtherQuery","p","allowOtherEdit","7","allowOtherDel","f","doDeptLvlCheck","q","deptLvlQx","82VG"); - FormQx formQx7=BaseUtils.fromMap(p7,FormQx.class); - batchValues.add(formQx7); - formQxService.batchUpdate(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量删除一批数据到数据库 - ***/ - @Test - public void batchDelete() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","v1Bz","allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx0=BaseUtils.fromMap(p0,FormQx.class); - batchValues.add(formQx0); - Map p1=BaseUtils.map("formId","Om2A","allowQueryRoleids","ny8L","allowQueryDeptids","UqXO","allowQueryUserids","0QSJ","notQueryRoleids","ocze","notQueryDeptids","46vq","notQueryUserids","rh2t","allowOtherQuery","6","allowOtherEdit","N","allowOtherDel","I","doDeptLvlCheck","e","deptLvlQx","69hU"); - FormQx formQx1=BaseUtils.fromMap(p1,FormQx.class); - batchValues.add(formQx1); - Map p2=BaseUtils.map("formId","49zM","allowQueryRoleids","VE95","allowQueryDeptids","ipQ5","allowQueryUserids","ICHL","notQueryRoleids","Ou41","notQueryDeptids","FBxl","notQueryUserids","zVIA","allowOtherQuery","G","allowOtherEdit","g","allowOtherDel","B","doDeptLvlCheck","G","deptLvlQx","r20S"); - FormQx formQx2=BaseUtils.fromMap(p2,FormQx.class); - batchValues.add(formQx2); - Map p3=BaseUtils.map("formId","ybtx","allowQueryRoleids","r0JC","allowQueryDeptids","Hi9g","allowQueryUserids","UCHb","notQueryRoleids","Us7h","notQueryDeptids","uRwf","notQueryUserids","Kcw0","allowOtherQuery","E","allowOtherEdit","2","allowOtherDel","o","doDeptLvlCheck","e","deptLvlQx","sOXr"); - FormQx formQx3=BaseUtils.fromMap(p3,FormQx.class); - batchValues.add(formQx3); - Map p4=BaseUtils.map("formId","o5PE","allowQueryRoleids","N51x","allowQueryDeptids","vy73","allowQueryUserids","WyIB","notQueryRoleids","WhNC","notQueryDeptids","QmnS","notQueryUserids","LeeF","allowOtherQuery","R","allowOtherEdit","R","allowOtherDel","u","doDeptLvlCheck","4","deptLvlQx","7vqd"); - FormQx formQx4=BaseUtils.fromMap(p4,FormQx.class); - batchValues.add(formQx4); - Map p5=BaseUtils.map("formId","t2gl","allowQueryRoleids","jId5","allowQueryDeptids","41v7","allowQueryUserids","UDpQ","notQueryRoleids","Z7QW","notQueryDeptids","4tRo","notQueryUserids","R7Lf","allowOtherQuery","J","allowOtherEdit","G","allowOtherDel","u","doDeptLvlCheck","6","deptLvlQx","se6j"); - FormQx formQx5=BaseUtils.fromMap(p5,FormQx.class); - batchValues.add(formQx5); - Map p6=BaseUtils.map("formId","Oon4","allowQueryRoleids","CcyM","allowQueryDeptids","f9Yn","allowQueryUserids","6OPR","notQueryRoleids","PFO8","notQueryDeptids","Hvbm","notQueryUserids","L7n6","allowOtherQuery","L","allowOtherEdit","x","allowOtherDel","4","doDeptLvlCheck","b","deptLvlQx","OWYc"); - FormQx formQx6=BaseUtils.fromMap(p6,FormQx.class); - batchValues.add(formQx6); - Map p7=BaseUtils.map("formId","Nr5j","allowQueryRoleids","5qkT","allowQueryDeptids","j8mJ","allowQueryUserids","89ST","notQueryRoleids","F86I","notQueryDeptids","XxLi","notQueryUserids","U9ll","allowOtherQuery","p","allowOtherEdit","7","allowOtherDel","f","doDeptLvlCheck","q","deptLvlQx","82VG"); - FormQx formQx7=BaseUtils.fromMap(p7,FormQx.class); - batchValues.add(formQx7); - formQxService.batchDelete(batchValues); - //Assert.assertEquals(1, result[0]); - } - - /** - * 批量新增一批数据到数据库 - ***/ - @Test - public void batchInsert() { - List batchValues=new ArrayList(); - Map p0=BaseUtils.map("formId","v1Bz","allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx0=BaseUtils.fromMap(p0,FormQx.class); - batchValues.add(formQx0); - Map p1=BaseUtils.map("formId","Om2A","allowQueryRoleids","ny8L","allowQueryDeptids","UqXO","allowQueryUserids","0QSJ","notQueryRoleids","ocze","notQueryDeptids","46vq","notQueryUserids","rh2t","allowOtherQuery","6","allowOtherEdit","N","allowOtherDel","I","doDeptLvlCheck","e","deptLvlQx","69hU"); - FormQx formQx1=BaseUtils.fromMap(p1,FormQx.class); - batchValues.add(formQx1); - Map p2=BaseUtils.map("formId","49zM","allowQueryRoleids","VE95","allowQueryDeptids","ipQ5","allowQueryUserids","ICHL","notQueryRoleids","Ou41","notQueryDeptids","FBxl","notQueryUserids","zVIA","allowOtherQuery","G","allowOtherEdit","g","allowOtherDel","B","doDeptLvlCheck","G","deptLvlQx","r20S"); - FormQx formQx2=BaseUtils.fromMap(p2,FormQx.class); - batchValues.add(formQx2); - Map p3=BaseUtils.map("formId","ybtx","allowQueryRoleids","r0JC","allowQueryDeptids","Hi9g","allowQueryUserids","UCHb","notQueryRoleids","Us7h","notQueryDeptids","uRwf","notQueryUserids","Kcw0","allowOtherQuery","E","allowOtherEdit","2","allowOtherDel","o","doDeptLvlCheck","e","deptLvlQx","sOXr"); - FormQx formQx3=BaseUtils.fromMap(p3,FormQx.class); - batchValues.add(formQx3); - Map p4=BaseUtils.map("formId","o5PE","allowQueryRoleids","N51x","allowQueryDeptids","vy73","allowQueryUserids","WyIB","notQueryRoleids","WhNC","notQueryDeptids","QmnS","notQueryUserids","LeeF","allowOtherQuery","R","allowOtherEdit","R","allowOtherDel","u","doDeptLvlCheck","4","deptLvlQx","7vqd"); - FormQx formQx4=BaseUtils.fromMap(p4,FormQx.class); - batchValues.add(formQx4); - Map p5=BaseUtils.map("formId","t2gl","allowQueryRoleids","jId5","allowQueryDeptids","41v7","allowQueryUserids","UDpQ","notQueryRoleids","Z7QW","notQueryDeptids","4tRo","notQueryUserids","R7Lf","allowOtherQuery","J","allowOtherEdit","G","allowOtherDel","u","doDeptLvlCheck","6","deptLvlQx","se6j"); - FormQx formQx5=BaseUtils.fromMap(p5,FormQx.class); - batchValues.add(formQx5); - Map p6=BaseUtils.map("formId","Oon4","allowQueryRoleids","CcyM","allowQueryDeptids","f9Yn","allowQueryUserids","6OPR","notQueryRoleids","PFO8","notQueryDeptids","Hvbm","notQueryUserids","L7n6","allowOtherQuery","L","allowOtherEdit","x","allowOtherDel","4","doDeptLvlCheck","b","deptLvlQx","OWYc"); - FormQx formQx6=BaseUtils.fromMap(p6,FormQx.class); - batchValues.add(formQx6); - Map p7=BaseUtils.map("formId","Nr5j","allowQueryRoleids","5qkT","allowQueryDeptids","j8mJ","allowQueryUserids","89ST","notQueryRoleids","F86I","notQueryDeptids","XxLi","notQueryUserids","U9ll","allowOtherQuery","p","allowOtherEdit","7","allowOtherDel","f","doDeptLvlCheck","q","deptLvlQx","82VG"); - FormQx formQx7=BaseUtils.fromMap(p7,FormQx.class); - batchValues.add(formQx7); - formQxService.batchInsert(batchValues); - //Assert.assertEquals(1, result[0]); - } - - - /** - * 查询一条数据到Map中 - ***/ - @Test - public void selectOneMap() { - Map p=BaseUtils.map("formId","v1Bz"); - Map result=this.formQxService.selectOne(FormQx.class.getName()+".selectOneMap",p); - Assert.assertEquals("v1Bz", result.get("form_id")); - } - - - /** - * 计算满足条件的行数 - ***/ - @Test - public void countByWhere() { - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - long result=formQxService.countByWhere(formQx); - Assert.assertEquals(true, result>0); - } - - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByPage() { - - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - p.put("pageNum","1"); - p.put("pageSize","10"); - PageUtils.startPage(p); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - List result=formQxService.selectListByWhere(formQx); - if(result instanceof Page) { - Page page=(Page)result; - Assert.assertEquals(true, page.getTotal()>=0); - } - } - - /** - * 分页查询,分页数据由平台自动组装并返回前台,后台不需要手工拼装. - ***/ - @Test - public void selectListByWhere() { - - - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - FormQx formQx=BaseUtils.fromMap(p,FormQx.class); - List result=formQxService.selectListByWhere(formQx); - Assert.assertEquals(true, result.size()>=1); - } - - - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByKey() { - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - List> result=formQxService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 模糊查询一批map.不分页. - ***/ - @Test - public void selectListMapByWhere() { - Map p=BaseUtils.map("allowQueryRoleids","hXaR","allowQueryDeptids","zKvQ","allowQueryUserids","b6b9","notQueryRoleids","QW53","notQueryDeptids","abHk","notQueryUserids","lG12","allowOtherQuery","d","allowOtherEdit","R","allowOtherDel","p","doDeptLvlCheck","L","deptLvlQx","6qK2"); - List> result=formQxService.selectListMapByKey(p); - Assert.assertEquals(true, result.size()>=0); - } - /** - * 查询一个对象 FormQx - ***/ - @Test - public void selectOneObject() { - Map p=BaseUtils.map("formId","v1Bz"); - - FormQx formQx1=BaseUtils.fromMap(p,FormQx.class); - FormQx formQx=formQxService.selectOneObject(formQx1); - Assert.assertEquals("v1Bz", formQx.getFormId()); - } - - /** - * 将字符串类型的日期转成Date对象 - * @param source 如2015-10-23或者 2015-10-23 15:30:25等 - * @param pattern 格式必须与 source的格式一致，如 2015-10-23对应的 pattern为 yyyy-MM-dd,
- * 2015-10-23 15:30:25 对应的pattern 为 yyyy-MM-dd HH:mm:ss - * @return - */ - public static Date parse(String source){ - - SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMddHHmmss"); - try { - return sdf.parse(source); - } catch (Exception e) { - } - - return null; - } + }