diff --git a/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java b/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java index d265c2c..7de4d41 100644 --- a/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java +++ b/src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java @@ -100,22 +100,25 @@ public class ApplicationController { return R.ok(); } - @GetMapping("/log/{id}") + @GetMapping("/{id}/log") public R queryLogList(@PathVariable("id") String id) { List applicationEntityList = applicationService.queryLogList(id); return R.ok().putData("record", applicationEntityList); } - @GetMapping("/log/{id1}/{id2}") - public R applicationCompare(@PathVariable("id1") String id1, @PathVariable("id2") String id2) { - Page page = applicationService.compare(id1, id2); - return R.ok().putData("record", page); + @GetMapping("/{id}/{oldVersion}/{newVersion}") + public R applicationCompare(@PathVariable("id") String id, + @PathVariable("oldVersion") String oldVersion, + @PathVariable("newVersion") String newVersion) { + List list = applicationService.compare(id, oldVersion, newVersion); + return R.ok().putData("record", list); } - @PostMapping("/restore/{id}/{version}") - public R restore(@PathVariable("id") String id, @PathVariable("version") String version) { + @PostMapping("/{id}/{version}/restore") + public R restore(@PathVariable("id") String id, + @PathVariable("version") String version) { applicationService.restore(id, version); return R.ok(); } diff --git a/src/main/java/net/geedge/asw/module/app/dao/ApplicationDao.java b/src/main/java/net/geedge/asw/module/app/dao/ApplicationDao.java index 87ab274..4044f01 100644 --- a/src/main/java/net/geedge/asw/module/app/dao/ApplicationDao.java +++ b/src/main/java/net/geedge/asw/module/app/dao/ApplicationDao.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import net.geedge.asw.module.app.entity.ApplicationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -19,7 +20,7 @@ public interface ApplicationDao extends BaseMapper{ List queryLogList(String id); - List compare(Page page, Map params); + List compare(@Param("params") Map params); } diff --git a/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java b/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java index ad3ac43..839da97 100644 --- a/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java +++ b/src/main/java/net/geedge/asw/module/app/service/IApplicationService.java @@ -19,7 +19,7 @@ public interface IApplicationService extends IService{ ApplicationEntity queryByApplicationAndLog(String id, String version); - Page compare(String id1, String id2); + List compare(String id, String oldVersion, String newVersion); List queryLogList(String id); diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java index 32f3587..564b810 100644 --- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java @@ -106,12 +106,10 @@ public class ApplicationServiceImpl extends ServiceImpl params = Map.of("ids", Arrays.asList(id1, id2)); - Page page = T.PageUtil.getPage(params); - List packageList = this.getBaseMapper().compare(page, params); - page.setRecords(packageList); - return page; + public List compare(String id, String oldVersion, String newVersion) { + Map params = Map.of("id", id, "versions", Arrays.asList(oldVersion, newVersion)); + List packageList = this.getBaseMapper().compare(params); + return packageList; } diff --git a/src/main/resources/db/mapper/app/ApplicationMapper.xml b/src/main/resources/db/mapper/app/ApplicationMapper.xml index 2ca0e60..3761a72 100644 --- a/src/main/resources/db/mapper/app/ApplicationMapper.xml +++ b/src/main/resources/db/mapper/app/ApplicationMapper.xml @@ -92,16 +92,16 @@ left join sys_user cu on app.create_user_id = cu.id left join sys_user uu on app.update_user_id = uu.id - - app.id in - - #{id} + + AND app.op_version in + + #{version} + + AND app.id = #{params.id} + - - ORDER BY app.id -