end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
f4f3c9331b
commit
d6dcd74364
4 changed files with 83 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
  2. 49
      xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
  3. 4
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
  4. 10
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

42
xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java
View File

@ -65,7 +65,7 @@ public class XmIterationMenuController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name="id",value="主键,主键",required=false), @ApiImplicitParam(name="id",value="主键,主键",required=false),
@ApiImplicitParam(name="iterationId",value="对应的迭代编号",required=false), @ApiImplicitParam(name="iterationId",value="对应的迭代编号",required=false),
@ApiImplicitParam(name="menuId",value="需求编号",required=false),
@ApiImplicitParam(name="menuId",value="用户故事编号",required=false),
@ApiImplicitParam(name="productId",value="产品编号",required=false), @ApiImplicitParam(name="productId",value="产品编号",required=false),
@ApiImplicitParam(name="ctime",value="关联时间",required=false), @ApiImplicitParam(name="ctime",value="关联时间",required=false),
@ApiImplicitParam(name="relStatus",value="关联状态0不再关联1正常关联",required=false), @ApiImplicitParam(name="relStatus",value="关联状态0不再关联1正常关联",required=false),
@ -113,15 +113,15 @@ public class XmIterationMenuController {
@RequestMapping(value="/batchDel",method=RequestMethod.POST) @RequestMapping(value="/batchDel",method=RequestMethod.POST)
public Map<String,Object> batchDelXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) { public Map<String,Object> batchDelXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功将需求移出迭代");
Tips tips=new Tips("成功将用户故事移出迭代");
try{ try{
List<String> menuIds=xmIterationMenus.getMenuIds(); List<String> menuIds=xmIterationMenus.getMenuIds();
if(menuIds==null || menuIds.size()==0){ if(menuIds==null || menuIds.size()==0){
return ResponseHelper.failed("menuIds-0","需求编号不能为空");
return ResponseHelper.failed("menuIds-0","用户故事编号不能为空");
} }
List<XmMenu> menus=xmMenuService.selectListByIds(menuIds); List<XmMenu> menus=xmMenuService.selectListByIds(menuIds);
if(menus==null || menus.size()==0){ if(menus==null || menus.size()==0){
return ResponseHelper.failed("menus-0","需求已不存在");
return ResponseHelper.failed("menus-0","用户故事已不存在");
} }
List<XmMenu> noQxOpList=new ArrayList<>(); List<XmMenu> noQxOpList=new ArrayList<>();
List<XmMenu> canOpList=new ArrayList<>(); List<XmMenu> canOpList=new ArrayList<>();
@ -142,17 +142,17 @@ public class XmIterationMenuController {
} }
List<String> msgs=new ArrayList<>(); List<String> msgs=new ArrayList<>();
if(canDels.size()>0){ if(canDels.size()>0){
msgs.add("成功将"+canDels.size()+"个需求移出迭代");
msgs.add("成功将"+canDels.size()+"个用户故事移出迭代");
xmIterationMenus.setMenuIds(canDels.stream().map(i->i.getMenuId()).collect(Collectors.toList())); xmIterationMenus.setMenuIds(canDels.stream().map(i->i.getMenuId()).collect(Collectors.toList()));
xmMenuService.batchUnIteration(xmIterationMenus); xmMenuService.batchUnIteration(xmIterationMenus);
xmRecordService.addXmMenuRecord(canDels,"产品-迭代-需求移出迭代","将需求移出迭代.");
//this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmIterationMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将需求【"+xmIterationMenu.getMenuId()+"】加入迭代");
xmRecordService.addXmMenuRecord(canDels,"产品-迭代-用户故事移出迭代","将用户故事移出迭代.");
//this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmIterationMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将用户故事【"+xmIterationMenu.getMenuId()+"】加入迭代");
} }
if(status7.size()>0){ if(status7.size()>0){
msgs.add("有"+status7.size()+"个需求状态为已上线,不能移出迭代。【"+status7.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
msgs.add("有"+status7.size()+"个用户故事状态为已上线,不能移出迭代。【"+status7.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(notJoins.size()>0){ if(notJoins.size()>0){
msgs.add("有"+notJoins.size()+"个需求未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
msgs.add("有"+notJoins.size()+"个用户故事未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canDels.size()==0){ if(canDels.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));
@ -172,20 +172,19 @@ public class XmIterationMenuController {
@RequestMapping(value="/batchAdd",method=RequestMethod.POST) @RequestMapping(value="/batchAdd",method=RequestMethod.POST)
public Map<String,Object> batchAddXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) { public Map<String,Object> batchAddXmIterationMenu(@RequestBody XmIterationMenuVo xmIterationMenus) {
Map<String,Object> m = new HashMap<>(); Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功将需求发布到迭代中");
Tips tips=new Tips("成功将用户故事发布到迭代中");
try{ try{
if(!StringUtils.hasText(xmIterationMenus.getIterationId())){ if(!StringUtils.hasText(xmIterationMenus.getIterationId())){
return ResponseHelper.failed("iterationId-0","迭代编号不能为空"); return ResponseHelper.failed("iterationId-0","迭代编号不能为空");
} }
List<String> menuIds=xmIterationMenus.getMenuIds(); List<String> menuIds=xmIterationMenus.getMenuIds();
if(menuIds==null || menuIds.size()==0){ if(menuIds==null || menuIds.size()==0){
return ResponseHelper.failed("menuIds-0","需求编号不能为空");
return ResponseHelper.failed("menuIds-0","用户故事编号不能为空");
} }
List<XmMenu> menus=xmMenuService.selectListByIds(menuIds); List<XmMenu> menus=xmMenuService.selectListByIds(menuIds);
if(menus==null || menus.size()==0){ if(menus==null || menus.size()==0){
return ResponseHelper.failed("menus-0","需求已不存在");
return ResponseHelper.failed("menus-0","用户故事已不存在");
} }
List<XmMenu> noQxOpList=new ArrayList<>(); List<XmMenu> noQxOpList=new ArrayList<>();
List<XmMenu> canOpList=new ArrayList<>(); List<XmMenu> canOpList=new ArrayList<>();
groupService.calcCanOpMenus(menus,canOpList,noQxOpList); groupService.calcCanOpMenus(menus,canOpList,noQxOpList);
@ -198,7 +197,7 @@ public class XmIterationMenuController {
hadJoin.add(menu); hadJoin.add(menu);
continue; continue;
} }
if("1".equals(menu.getNtype())){
if(!"0".equals(menu.getNtype())){
ntype1.add(menu); ntype1.add(menu);
continue; continue;
} }
@ -211,28 +210,31 @@ public class XmIterationMenuController {
List<String> msgs=new ArrayList<>(); List<String> msgs=new ArrayList<>();
if(canAdds.size()>0){ if(canAdds.size()>0){
XmIteration xmIteration=xmIterationService.selectOneObject(new XmIteration(xmIterationMenus.getIterationId())); XmIteration xmIteration=xmIterationService.selectOneObject(new XmIteration(xmIterationMenus.getIterationId()));
if(!"0".equals(xmIteration.getIphase()) && !"1".equals(xmIteration.getIphase())){
return ResponseHelper.failed("iphase-not-0-1",xmIteration.getIterationName()+"已过了用户故事评审阶段，不能再添加用户故事");
}
if(xmIteration==null){ if(xmIteration==null){
return ResponseHelper.failed("iteration-0","迭代不存在"); return ResponseHelper.failed("iteration-0","迭代不存在");
} }
msgs.add("成功将"+canAdds.size()+"个需求加入迭代");
msgs.add("成功将"+canAdds.size()+"个用户故事加入迭代");
if("1".equals(xmIteration.getIstatus())||"7".equals(xmIteration.getIphase())){ if("1".equals(xmIteration.getIstatus())||"7".equals(xmIteration.getIphase())){
return ResponseHelper.failed("istatus-1","迭代已关闭"); return ResponseHelper.failed("istatus-1","迭代已关闭");
} }
xmIterationMenus.setIterationName(xmIteration.getIterationName()); xmIterationMenus.setIterationName(xmIteration.getIterationName());
xmIterationMenus.setMenuIds(canAdds.stream().map(i->i.getMenuId()).collect(Collectors.toList())); xmIterationMenus.setMenuIds(canAdds.stream().map(i->i.getMenuId()).collect(Collectors.toList()));
xmMenuService.batchIteration(xmIterationMenus); xmMenuService.batchIteration(xmIterationMenus);
xmRecordService.addXmMenuRecord(canAdds,"产品-迭代-需求加入迭代","将需求加入迭代.");
xmRecordService.addXmMenuRecord(canAdds,"产品-迭代-用户故事加入迭代","将用户故事加入迭代.");
//this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmIterationMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将需求【"+xmIterationMenu.getMenuId()+"】加入迭代");
//this.xmMenuPushMsgService.pushMenuRelUsersMsg(user.getBranchId(), xmIterationMenu.getMenuId(), user.getUserid(), user.getUsername(), user.getUsername()+"将用户故事【"+xmIterationMenu.getMenuId()+"】加入迭代");
} }
if(status789.size()>0){ if(status789.size()>0){
msgs.add("有"+status789.size()+"个需求状态为已上线、已下线、已删除状态，不能加入迭代。【"+status789.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
msgs.add("有"+status789.size()+"个用户故事状态为已上线、已下线、已删除状态，不能加入迭代。【"+status789.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(hadJoin.size()>0){ if(hadJoin.size()>0){
msgs.add("有"+hadJoin.size()+"个需求已加入迭代，不能重复加入。【"+hadJoin.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
msgs.add("有"+hadJoin.size()+"个用户故事已加入迭代，不能重复加入。【"+hadJoin.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(ntype1.size()>0){ if(ntype1.size()>0){
msgs.add("有"+ntype1.size()+"个为需求池，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
msgs.add("有"+ntype1.size()+"个为史诗/特性，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】");
} }
if(canAdds.size()==0){ if(canAdds.size()==0){
tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));

49
xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java
View File

@ -1,14 +1,18 @@
package com.xm.core.ctrl; package com.xm.core.ctrl;
import com.alibaba.fastjson.JSON;
import com.mdp.audit.log.client.annotation.AuditLog; import com.mdp.audit.log.client.annotation.AuditLog;
import com.mdp.audit.log.client.annotation.OperType; import com.mdp.audit.log.client.annotation.OperType;
import com.mdp.core.entity.Tips; import com.mdp.core.entity.Tips;
import com.mdp.core.err.BizException; import com.mdp.core.err.BizException;
import com.mdp.core.utils.BaseUtils;
import com.mdp.core.utils.RequestUtils; import com.mdp.core.utils.RequestUtils;
import com.mdp.core.utils.ResponseHelper;
import com.mdp.mybatis.PageUtils; import com.mdp.mybatis.PageUtils;
import com.mdp.qx.HasQx; import com.mdp.qx.HasQx;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.xm.core.entity.XmMenu;
import com.xm.core.entity.XmQuestion; import com.xm.core.entity.XmQuestion;
import com.xm.core.service.XmQuestionService; import com.xm.core.service.XmQuestionService;
import com.xm.core.service.push.XmPushMsgService; import com.xm.core.service.push.XmPushMsgService;
@ -20,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/** /**
* url编制采用rest风格,如对XM.xm_question xm_question的操作有增删改查,对应的url分别为:<br> * url编制采用rest风格,如对XM.xm_question xm_question的操作有增删改查,对应的url分别为:<br>
@ -229,6 +231,45 @@ public class XmQuestionController {
} }
/***/
@ApiOperation( value = "根据主键修改一条项目菜单表信息",notes="editSomeFields")
@ApiResponses({
@ApiResponse(code = 200,response= XmMenu.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
})
@HasQx(value = "xm_core_xmQuestion_editSomeFields",name = "修改bug的某些字段",categoryId = "admin-xm",categoryName = "管理端-项目管理系统")
@RequestMapping(value="/editSomeFields",method=RequestMethod.POST)
public Map<String,Object> editSomeFields(@RequestBody Map<String,Object> xmQuestionMap) {
Map<String,Object> m = new HashMap<>();
Tips tips=new Tips("成功更新一条数据");
try{
List<String> ids= (List<String>) xmQuestionMap.get("ids");
if(ids==null || ids.size()==0){
ResponseHelper.failed("ids-0","ids不能为空");
}
List<XmQuestion> xmQuestionsDb=xmQuestionService.selectListByIds(ids);
if(xmQuestionsDb==null ||xmQuestionsDb.size()==0){
ResponseHelper.failed("bugs-0","该bug已不存在");
}
Set<String> fields=new HashSet<>();
for (String fieldName : xmQuestionMap.keySet()) {
if(fields.contains(fieldName)){
return ResponseHelper.failed(fieldName+"-no-edit",fieldName+"不允许修改");
}
}
xmQuestionService.editSomeFields(xmQuestionMap);
//m.put("data",xmMenu);
}catch (BizException e) {
tips=e.getTips();
logger.error("",e);
}catch (Exception e) {
tips.setFailureMsg(e.getMessage());
logger.error("",e);
}
m.put("tips", tips);
return m;
}
/** /**
@ -293,4 +334,6 @@ public class XmQuestionController {
m.put("tips", tips); m.put("tips", tips);
return m; return m;
} }
} }

4
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
View File

@ -198,6 +198,8 @@ public class XmQuestionService extends BaseService {
} }
this.update("updateProcessApprova", flowVars); this.update("updateProcessApprova", flowVars);
} }
public void editSomeFields(Map<String, Object> xmMenuMap) {
super.update("editSomeFields",xmMenuMap);
}
} }

10
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
View File

@ -76,6 +76,16 @@
where biz_proc_inst_id=#{procInstId} where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<update id="editSomeFields" parameterType="HashMap">
update xm_question
<set>
<include refid="someFieldSet"/>
</set>
where id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</update>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->

Write Preview
Loading…
Cancel
Save