diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java similarity index 87% rename from xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java rename to xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java index 5d8e08fa..5531895e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationProductLinkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationLinkController.java @@ -1,25 +1,21 @@ package com.xm.core.ctrl; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import com.xm.core.entity.XmIterationLink; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.stereotype.Controller; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; @@ -27,10 +23,9 @@ import io.swagger.annotations.ApiResponses; import com.mdp.mybatis.PageUtils; import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; -import com.mdp.core.utils.BaseUtils; import com.mdp.core.utils.RequestUtils; import com.xm.core.service.XmIterationProductLinkService; -import com.xm.core.entity.XmIterationProductLink; + /** * url编制采用rest风格,如对XM.xm_iteration_product_link 迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表的操作有增删改查,对应的url分别为:
* 新增: core/xmIterationProductLink/add
@@ -45,9 +40,9 @@ import com.xm.core.entity.XmIterationProductLink; @RestController("xm.core.xmIterationProductLinkController") @RequestMapping(value="/**/core/xmIterationProductLink") @Api(tags={"迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表操作接口"}) -public class XmIterationProductLinkController { +public class XmIterationLinkController { - static Logger logger =LoggerFactory.getLogger(XmIterationProductLinkController.class); + static Logger logger =LoggerFactory.getLogger(XmIterationLinkController.class); @Autowired private XmIterationProductLinkService xmIterationProductLinkService; @@ -57,7 +52,7 @@ public class XmIterationProductLinkController { @ApiOperation( value = "查询迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息列表",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmIterationProductLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") + @ApiResponse(code = 200,response= XmIterationLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},total:总记录数,data:[数据对象1,数据对象2,...]}") }) @RequestMapping(value="/list",method=RequestMethod.GET) public Map listXmIterationProductLink( @RequestParam Map xmIterationProductLink){ @@ -77,10 +72,10 @@ public class XmIterationProductLinkController { @ApiOperation( value = "新增一条迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表信息",notes=" ") @ApiResponses({ - @ApiResponse(code = 200,response=XmIterationProductLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") + @ApiResponse(code = 200,response= XmIterationLink.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'},data:数据对象}") }) @RequestMapping(value="/add",method=RequestMethod.POST) - public Map addXmIterationProductLink(@RequestBody XmIterationProductLink xmIterationProductLink) { + public Map addXmIterationProductLink(@RequestBody XmIterationLink xmIterationProductLink) { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ @@ -118,7 +113,7 @@ public class XmIterationProductLinkController { @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}") }) @RequestMapping(value="/del",method=RequestMethod.POST) - public Map delXmIterationProductLink(@RequestBody XmIterationProductLink xmIterationProductLink){ + public Map delXmIterationProductLink(@RequestBody XmIterationLink xmIterationProductLink){ Map m = new HashMap<>(); Tips tips=new Tips("成功删除一条数据"); try{ diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIterationProductLink.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java similarity index 94% rename from xm-core/src/main/java/com/xm/core/entity/XmIterationProductLink.java rename to xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java index a065539c..dd82e9a6 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmIterationProductLink.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java @@ -14,7 +14,7 @@ import java.util.Date; * iteration_id,product_id;
*/ @ApiModel(description="迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表") -public class XmIterationProductLink implements java.io.Serializable { +public class XmIterationLink implements java.io.Serializable { private static final long serialVersionUID = 1L; @@ -38,13 +38,13 @@ public class XmIterationProductLink implements java.io.Serializable { String linkStatus; /**迭代表主键,产品表主键**/ - public XmIterationProductLink(String iterationId,String productId) { + public XmIterationLink(String iterationId, String productId) { this.iterationId = iterationId; this.productId = productId; } /**迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表**/ - public XmIterationProductLink() { + public XmIterationLink() { } /** diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationProductLinkService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationProductLinkService.java index 190167fb..a1eb2ce9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationProductLinkService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationProductLinkService.java @@ -2,11 +2,9 @@ package com.xm.core.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; import com.mdp.core.service.BaseService; -import com.xm.core.entity.XmIterationProductLink; + /** * 父类已经支持增删改查操作,因此,即使本类什么也不写,也已经可以满足一般的增删改查操作了.
* 组织 com 顶级模块 xm 大模块 core 小模块
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml similarity index 93% rename from xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml rename to xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml index 3dc10b8e..95d35e69 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationProductLinkMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml @@ -1,6 +1,6 @@ - + @@ -35,7 +35,7 @@ - select * from xm_iteration_product_link res @@ -43,7 +43,7 @@ - select * from xm_iteration_product_link res where res.iteration_id = #{iterationId} @@ -58,14 +58,14 @@ and res.product_id = #{productId} - select count(1) from xm_iteration_product_link res - + insert into xm_iteration_product_link( ) values ( @@ -74,7 +74,7 @@ - + delete from xm_iteration_product_link 1=2 @@ -82,13 +82,13 @@ - + delete from xm_iteration_product_link where iteration_id = #{iterationId} and product_id = #{productId} - + update xm_iteration_product_link @@ -97,7 +97,7 @@ - + update xm_iteration_product_link