gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整 application path

Browse Source
This commit is contained in:
zhangshuai
2024-08-08 15:23:47 +08:00
parent 519b6e1c2d
commit afb19a4326
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/geedge/asw/module/app/controller/ApplicationController.java
View File

@@ -100,22 +100,25 @@ public class ApplicationController {
return R.ok();
}
@GetMapping("/log/{id}")
@GetMapping("/{id}/log")
public R queryLogList(@PathVariable("id") String id) {
List<ApplicationEntity> 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<ApplicationEntity> 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();
}

3
src/main/java/net/geedge/asw/module/app/dao/ApplicationDao.java
View File

@@ -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<ApplicationEntity>{
List<ApplicationEntity> queryLogList(String id);
List<ApplicationEntity> compare(Page page, Map<String, Object> params);
List<ApplicationEntity> compare(@Param("params") Map<String, Object> params);
}

2
src/main/java/net/geedge/asw/module/app/service/IApplicationService.java
View File

@@ -19,7 +19,7 @@ public interface IApplicationService extends IService<ApplicationEntity>{
ApplicationEntity queryByApplicationAndLog(String id, String version);
Page compare(String id1, String id2);
List<ApplicationEntity> compare(String id, String oldVersion, String newVersion);
List<ApplicationEntity> queryLogList(String id);

10
src/main/java/net/geedge/asw/module/app/service/impl/ApplicationServiceImpl.java
View File

@@ -106,12 +106,10 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationDao, Applicat
}
@Override
public Page compare(String id1, String id2) {
Map<String, Object> params = Map.of("ids", Arrays.asList(id1, id2));
Page page = T.PageUtil.getPage(params);
List<ApplicationEntity> packageList = this.getBaseMapper().compare(page, params);
page.setRecords(packageList);
return page;
public List<ApplicationEntity> compare(String id, String oldVersion, String newVersion) {
Map<String, Object> params = Map.of("id", id, "versions", Arrays.asList(oldVersion, newVersion));
List<ApplicationEntity> packageList = this.getBaseMapper().compare(params);
return packageList;
}

14
src/main/resources/db/mapper/app/ApplicationMapper.xml
View File

@@ -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
<where>
<if test="params.ids != null and params.ids != ''">
app.id in
<foreach item="id" collection="params.ids" separator="," open="(" close=")">
#{id}
<if test="params.versions != null and params.versions != ''">
AND app.op_version in
<foreach item="version" collection="params.versions" separator="," open="(" close=")">
#{version}
</foreach>
</if>
<if test="params.id != null and params.id != ''">
AND app.id = #{params.id}
</if>
</where>
<if test="params.orderBy == null or params.orderBy == ''">
ORDER BY app.id
</if>
</select>