diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java
deleted file mode 100644
index 807932bf..00000000
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuExchangeController.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.xm.core.ctrl;
-
-import com.mdp.core.entity.Tips;
-import com.mdp.core.err.BizException;
-import com.mdp.core.utils.RequestUtils;
-import com.mdp.mybatis.PageUtils;
-import com.mdp.qx.HasQx;
-import com.mdp.safe.client.utils.LoginUtils;
-import com.xm.core.entity.XmMenuExchange;
-import com.xm.core.service.XmMenuExchangeService;
-import com.xm.core.service.push.XmMenuPushMsgService;
-import io.swagger.annotations.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-/**
- * url编制采用rest风格,如对XM.xm_menu_exchange 功能表的操作有增删改查,对应的url分别为:
- * 新增: xm/xmMenuExchange/add
- * 查询: xm/xmMenuExchange/list
- * 模糊查询: xm/xmMenuExchange/listKey
- * 修改: xm/xmMenuExchange/edit
- * 删除: xm/xmMenuExchange/del
- * 批量删除: xm/xmMenuExchange/batchDel
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmMenuExchange 表 XM.xm_menu_exchange 当前主键(包括多主键): id;
- ***/
-@RestController("xm.core.xmMenuExchangeController")
-@RequestMapping(value="/**/xm/core/xmMenuExchange")
-@Api(tags={"功能表操作接口"})
-public class XmMenuExchangeController {
-
- static Log logger=LogFactory.getLog(XmMenuExchangeController.class);
-
- @Autowired
- private XmMenuExchangeService xmMenuExchangeService;
-
- @Autowired
- XmMenuPushMsgService pushMsgService ;
-
-
- @ApiOperation( value = "查询功能表信息列表",notes="listXmMenuExchange,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
- @ApiImplicitParams({
- @ApiImplicitParam(name="id",value="评论编号,主键",required=false),
- @ApiImplicitParam(name="menuId",value="功能编号",required=false),
- @ApiImplicitParam(name="menuName",value="功能名称",required=false),
- @ApiImplicitParam(name="productId",value="归属产品编号",required=false),
- @ApiImplicitParam(name="remark",value="备注",required=false),
- @ApiImplicitParam(name="pid",value="上级评论编号",required=false),
- @ApiImplicitParam(name="cuserid",value="评论人编号",required=false),
- @ApiImplicitParam(name="cusername",value="评论人名称",required=false),
- @ApiImplicitParam(name="ctime",value="评论时间",required=false),
- @ApiImplicitParam(name="cbranchId",value="评论人所属机构",required=false),
- @ApiImplicitParam(name="adopt",value="是否采纳0否1采纳",required=false),
- @ApiImplicitParam(name="adoptUserid",value="采纳人编号",required=false),
- @ApiImplicitParam(name="adoptUsername",value="采纳人名称",required=false),
- @ApiImplicitParam(name="adoptTime",value="采纳时间",required=false),
- @ApiImplicitParam(name="closed",value="关闭该评论0否1是",required=false),
- @ApiImplicitParam(name="puserid",value="上级用户编号",required=false),
- @ApiImplicitParam(name="pusername",value="上级姓名",required=false),
- @ApiImplicitParam(name="premark",value="上级备注",required=false),
- @ApiImplicitParam(name="notifyUserids",value="本评论需要同步给的人列表,逗号分隔",required=false),
- @ApiImplicitParam(name="notifyChannels",value="发送通知渠道inner-email/wxpub/sms/im/out-email等逗号分割",required=false),
- @ApiImplicitParam(name="notifyUsernames",value="通知用户姓名逗号分隔",required=false),
- @ApiImplicitParam(name="pageSize",value="每页记录数",required=false),
- @ApiImplicitParam(name="pageNum",value="当前页码,从1开始",required=false),
- @ApiImplicitParam(name="total",value="总记录数,服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算",required=false),
- @ApiImplicitParam(name="orderBy",value="排序列 如性别、学生编号排序 orderBy = sex desc,student_id desc",required=false),
- @ApiImplicitParam(name="count",value="是否进行总条数计算,count=true|false",required=false)
- })
- @ApiResponses({
- @ApiResponse(code = 200,response= XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}")
- })
- @RequestMapping(value="/list",method=RequestMethod.GET)
- public Map listXmMenuExchange( @ApiIgnore @RequestParam Map xmMenuExchange){
- Map m = new HashMap<>();
- RequestUtils.transformArray(xmMenuExchange, "ids");
- PageUtils.startPage(xmMenuExchange);
- if( !StringUtils.hasText((String) xmMenuExchange.get("branchId"))){
- xmMenuExchange.put("branchId",LoginUtils.getCurrentUserInfo().getBranchId());
- }
- List> xmMenuExchangeList = xmMenuExchangeService.selectListMapByWhere(xmMenuExchange); //列出XmMenuExchange列表
- PageUtils.responePage(m, xmMenuExchangeList);
- m.put("data",xmMenuExchangeList);
- Tips tips=new Tips("查询成功");
- m.put("tips", tips);
- return m;
- }
-
-
-
- /***/
- @ApiOperation( value = "新增一条功能表信息",notes="addXmMenuExchange,主键如果为空，后台自动生成")
- @ApiResponses({
- @ApiResponse(code = 200,response=XmMenuExchange.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
- })
- @HasQx(value = "xm_core_xmMenuExchange_add",name = "发布需求评论",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
- @RequestMapping(value="/add",method=RequestMethod.POST)
- public Map addXmMenuExchange(@RequestBody XmMenuExchange xmMenuExchange) {
- Map m = new HashMap<>();
- Tips tips=new Tips("成功新增一条数据");
- try{
- if(StringUtils.isEmpty(xmMenuExchange.getId())) {
- xmMenuExchange.setId(this.xmMenuExchangeService.createKey("id"));
- }
- xmMenuExchange.setCtime(new Date());
- xmMenuExchangeService.insert(xmMenuExchange);
- String imMsg=xmMenuExchange.getCusername()+"发表关于需求【"+xmMenuExchange.getMenuId()+"-"+xmMenuExchange.getMenuName()+"】的评论："+xmMenuExchange.getRemark();
- pushMsgService.pushMenuRelUsersMsg(xmMenuExchange.getCbranchId(), xmMenuExchange.getMenuId(), xmMenuExchange.getCuserid(), xmMenuExchange.getCusername(), imMsg);
- m.put("data",xmMenuExchange);
- }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;
- }
-
-
- /***/
- @ApiOperation( value = "删除一条功能表信息",notes="delXmMenuExchange,仅需要上传主键字段")
- @ApiResponses({
- @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")
- })
- @HasQx(value = "xm_core_xmMenuExchange_del",name = "删除需求评论",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
- @RequestMapping(value="/del",method=RequestMethod.POST)
- public Map delXmMenuExchange(@RequestBody XmMenuExchange xmMenuExchange){
- Map m = new HashMap<>();
- Tips tips=new Tips("成功删除一条数据");
- try{
- xmMenuExchangeService.deleteByPk(xmMenuExchange);
- }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;
- }
-
-
- /***/
- @ApiOperation( value = "根据主键修改一条功能表信息",notes="editXmMenuExchange")
- @ApiResponses({
- @ApiResponse(code = 200,response=XmMenuExchange.class, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}")
- })
- @HasQx(value = "xm_core_xmMenuExchange_edit",name = "修改需求评论",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
- @RequestMapping(value="/edit",method=RequestMethod.POST)
- public Map editXmMenuExchange(@RequestBody XmMenuExchange xmMenuExchange) {
- Map m = new HashMap<>();
- Tips tips=new Tips("成功更新一条数据");
- try{
- xmMenuExchangeService.updateByPk(xmMenuExchange);
- m.put("data",xmMenuExchange);
- }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;
- }
-
-
-
-
- /***/
- @ApiOperation( value = "根据主键列表批量删除功能表信息",notes="batchDelXmMenuExchange,仅需要上传主键字段")
- @ApiResponses({
- @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}")
- })
- @HasQx(value = "xm_core_xmMenuExchange_batchDel",name = "批量删除需求评论",moduleId = "xm-project",moduleName = "管理端-项目管理系统")
- @RequestMapping(value="/batchDel",method=RequestMethod.POST)
- public Map batchDelXmMenuExchange(@RequestBody List xmMenuExchanges) {
- Map m = new HashMap<>();
- Tips tips=new Tips("成功删除"+xmMenuExchanges.size()+"条数据");
- try{
- xmMenuExchangeService.batchDelete(xmMenuExchanges);
- }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;
- }
-
-}
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java b/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java
deleted file mode 100644
index 3a084a4d..00000000
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenuExchange.java
+++ /dev/null
@@ -1,379 +0,0 @@
-package com.xm.core.entity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmMenuExchange所有属性名:
- * menuId,menuName,productId,remark,id,pid,cuserid,cusername,ctime,cbranchId,adopt,adoptUserid,adoptUsername,adoptTime,closed,puserid,pusername,premark,notifyUserids,notifyChannels,notifyUsernames,cuserHeadImg,replyType;
- * 表 XM.xm_menu_exchange 功能表的所有字段名:
- * menu_id,menu_name,product_id,remark,id,pid,cuserid,cusername,ctime,cbranch_id,adopt,adopt_userid,adopt_username,adopt_time,closed,puserid,pusername,premark,notify_userids,notify_channels,notify_usernames,cuser_head_img,reply_type;
- * 当前主键(包括多主键):
- * id;
- */
-@ApiModel(description="功能表")
-public class XmMenuExchange implements java.io.Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(notes="评论编号,主键",allowEmptyValue=true,example="",allowableValues="")
- String id;
-
-
- @ApiModelProperty(notes="功能编号",allowEmptyValue=true,example="",allowableValues="")
- String menuId;
-
- @ApiModelProperty(notes="功能名称",allowEmptyValue=true,example="",allowableValues="")
- String menuName;
-
- @ApiModelProperty(notes="归属产品编号",allowEmptyValue=true,example="",allowableValues="")
- String productId;
-
- @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
- String remark;
-
- @ApiModelProperty(notes="上级评论编号",allowEmptyValue=true,example="",allowableValues="")
- String pid;
-
- @ApiModelProperty(notes="评论人编号",allowEmptyValue=true,example="",allowableValues="")
- String cuserid;
-
- @ApiModelProperty(notes="评论人名称",allowEmptyValue=true,example="",allowableValues="")
- String cusername;
-
- @ApiModelProperty(notes="评论时间",allowEmptyValue=true,example="",allowableValues="")
- Date ctime;
-
- @ApiModelProperty(notes="评论人所属机构",allowEmptyValue=true,example="",allowableValues="")
- String cbranchId;
-
- @ApiModelProperty(notes="是否采纳0否1采纳",allowEmptyValue=true,example="",allowableValues="")
- String adopt;
-
- @ApiModelProperty(notes="采纳人编号",allowEmptyValue=true,example="",allowableValues="")
- String adoptUserid;
-
- @ApiModelProperty(notes="采纳人名称",allowEmptyValue=true,example="",allowableValues="")
- String adoptUsername;
-
- @ApiModelProperty(notes="采纳时间",allowEmptyValue=true,example="",allowableValues="")
- Date adoptTime;
-
- @ApiModelProperty(notes="关闭该评论0否1是",allowEmptyValue=true,example="",allowableValues="")
- String closed;
-
- @ApiModelProperty(notes="上级用户编号",allowEmptyValue=true,example="",allowableValues="")
- String puserid;
-
- @ApiModelProperty(notes="上级姓名",allowEmptyValue=true,example="",allowableValues="")
- String pusername;
-
- @ApiModelProperty(notes="上级备注",allowEmptyValue=true,example="",allowableValues="")
- String premark;
-
- @ApiModelProperty(notes="本评论需要同步给的人列表,逗号分隔",allowEmptyValue=true,example="",allowableValues="")
- String notifyUserids;
-
- @ApiModelProperty(notes="发送通知渠道inner-email/wxpub/sms/im/out-email等逗号分割",allowEmptyValue=true,example="",allowableValues="")
- String notifyChannels;
-
- @ApiModelProperty(notes="通知用户姓名逗号分隔",allowEmptyValue=true,example="",allowableValues="")
- String notifyUsernames;
-
- @ApiModelProperty(notes="发言人头像地址",allowEmptyValue=true,example="",allowableValues="")
- String cuserHeadImg;
-
- @ApiModelProperty(notes="回复方式1引用2回复",allowEmptyValue=true,example="",allowableValues="")
- String replyType;
-
- /**评论编号**/
- public XmMenuExchange(String id) {
- this.id = id;
- }
-
- /**功能表**/
- public XmMenuExchange() {
- }
-
- /**
- * 功能编号
- **/
- public void setMenuId(String menuId) {
- this.menuId = menuId;
- }
- /**
- * 功能名称
- **/
- public void setMenuName(String menuName) {
- this.menuName = menuName;
- }
- /**
- * 归属产品编号
- **/
- public void setProductId(String productId) {
- this.productId = productId;
- }
- /**
- * 备注
- **/
- public void setRemark(String remark) {
- this.remark = remark;
- }
- /**
- * 评论编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 上级评论编号
- **/
- public void setPid(String pid) {
- this.pid = pid;
- }
- /**
- * 评论人编号
- **/
- public void setCuserid(String cuserid) {
- this.cuserid = cuserid;
- }
- /**
- * 评论人名称
- **/
- public void setCusername(String cusername) {
- this.cusername = cusername;
- }
- /**
- * 评论时间
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 评论人所属机构
- **/
- public void setCbranchId(String cbranchId) {
- this.cbranchId = cbranchId;
- }
- /**
- * 是否采纳0否1采纳
- **/
- public void setAdopt(String adopt) {
- this.adopt = adopt;
- }
- /**
- * 采纳人编号
- **/
- public void setAdoptUserid(String adoptUserid) {
- this.adoptUserid = adoptUserid;
- }
- /**
- * 采纳人名称
- **/
- public void setAdoptUsername(String adoptUsername) {
- this.adoptUsername = adoptUsername;
- }
- /**
- * 采纳时间
- **/
- public void setAdoptTime(Date adoptTime) {
- this.adoptTime = adoptTime;
- }
- /**
- * 关闭该评论0否1是
- **/
- public void setClosed(String closed) {
- this.closed = closed;
- }
- /**
- * 上级用户编号
- **/
- public void setPuserid(String puserid) {
- this.puserid = puserid;
- }
- /**
- * 上级姓名
- **/
- public void setPusername(String pusername) {
- this.pusername = pusername;
- }
- /**
- * 上级备注
- **/
- public void setPremark(String premark) {
- this.premark = premark;
- }
- /**
- * 本评论需要同步给的人列表,逗号分隔
- **/
- public void setNotifyUserids(String notifyUserids) {
- this.notifyUserids = notifyUserids;
- }
- /**
- * 发送通知渠道inner-email/wxpub/sms/im/out-email等逗号分割
- **/
- public void setNotifyChannels(String notifyChannels) {
- this.notifyChannels = notifyChannels;
- }
- /**
- * 通知用户姓名逗号分隔
- **/
- public void setNotifyUsernames(String notifyUsernames) {
- this.notifyUsernames = notifyUsernames;
- }
- /**
- * 发言人头像地址
- **/
- public void setCuserHeadImg(String cuserHeadImg) {
- this.cuserHeadImg = cuserHeadImg;
- }
- /**
- * 回复方式1引用2回复
- **/
- public void setReplyType(String replyType) {
- this.replyType = replyType;
- }
-
- /**
- * 功能编号
- **/
- public String getMenuId() {
- return this.menuId;
- }
- /**
- * 功能名称
- **/
- public String getMenuName() {
- return this.menuName;
- }
- /**
- * 归属产品编号
- **/
- public String getProductId() {
- return this.productId;
- }
- /**
- * 备注
- **/
- public String getRemark() {
- return this.remark;
- }
- /**
- * 评论编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 上级评论编号
- **/
- public String getPid() {
- return this.pid;
- }
- /**
- * 评论人编号
- **/
- public String getCuserid() {
- return this.cuserid;
- }
- /**
- * 评论人名称
- **/
- public String getCusername() {
- return this.cusername;
- }
- /**
- * 评论时间
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 评论人所属机构
- **/
- public String getCbranchId() {
- return this.cbranchId;
- }
- /**
- * 是否采纳0否1采纳
- **/
- public String getAdopt() {
- return this.adopt;
- }
- /**
- * 采纳人编号
- **/
- public String getAdoptUserid() {
- return this.adoptUserid;
- }
- /**
- * 采纳人名称
- **/
- public String getAdoptUsername() {
- return this.adoptUsername;
- }
- /**
- * 采纳时间
- **/
- public Date getAdoptTime() {
- return this.adoptTime;
- }
- /**
- * 关闭该评论0否1是
- **/
- public String getClosed() {
- return this.closed;
- }
- /**
- * 上级用户编号
- **/
- public String getPuserid() {
- return this.puserid;
- }
- /**
- * 上级姓名
- **/
- public String getPusername() {
- return this.pusername;
- }
- /**
- * 上级备注
- **/
- public String getPremark() {
- return this.premark;
- }
- /**
- * 本评论需要同步给的人列表,逗号分隔
- **/
- public String getNotifyUserids() {
- return this.notifyUserids;
- }
- /**
- * 发送通知渠道inner-email/wxpub/sms/im/out-email等逗号分割
- **/
- public String getNotifyChannels() {
- return this.notifyChannels;
- }
- /**
- * 通知用户姓名逗号分隔
- **/
- public String getNotifyUsernames() {
- return this.notifyUsernames;
- }
- /**
- * 发言人头像地址
- **/
- public String getCuserHeadImg() {
- return this.cuserHeadImg;
- }
- /**
- * 回复方式1引用2回复
- **/
- public String getReplyType() {
- return this.replyType;
- }
-
-}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java
deleted file mode 100644
index bcf8cb3b..00000000
--- a/xm-core/src/main/java/com/xm/core/service/XmMenuExchangeService.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.xm.core.service;
-
-import com.mdp.core.service.BaseService;
-import org.springframework.stereotype.Service;
-
-/**
- * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
- * 实体 XmMenuExchange 表 XM.xm_menu_exchange 当前主键(包括多主键): id;
- ***/
-@Service("xm.core.xmMenuExchangeService")
-public class XmMenuExchangeService extends BaseService {
-
- /** 请在此类添加自定义函数 */
-
-}
-
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuCommentMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuCommentMapper.xml
index ad92dab7..2f70cb4b 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuCommentMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuCommentMapper.xml
@@ -38,7 +38,7 @@
where id = #{id}
-