admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

合并uat冲突修改

Browse Source
This commit is contained in:
guoshengxiong 2025-09-30 09:18:49 +08:00
parent 3d7a9774dc
commit e06cef4d70
16 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildAcceptanceController.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.Arrays;
import java.util.List;
@ -17,8 +17,8 @@ import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
@ -78,7 +78,7 @@ public class BigDangerBuildAcceptanceController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerBuildAcceptanceVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerBuildAcceptanceVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildAcceptanceService.queryPageList(param));
}
@ -90,7 +90,7 @@ public class BigDangerBuildAcceptanceController {
@OperLog(operModul = "危大清单施工条件验收管理", operType = "列表查询", operDesc = "列表查询危大清单施工条件验收信息")
@ApiOperation(value = "列表查询危大清单施工条件验收信息", notes = "列表查询危大清单施工条件验收信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerBuildAcceptanceVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerBuildAcceptanceVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildAcceptanceService.queryList(param));
}
@ -131,7 +131,7 @@ public class BigDangerBuildAcceptanceController {
@ApiOperation(value = "删除危大清单施工条件验收信息", notes = "删除危大清单施工条件验收信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单施工条件验收ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerBuildAcceptance> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerBuildAcceptance> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerBuildAcceptanceService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildPlaceController.java
View File

@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -51,7 +51,7 @@ public class BigDangerBuildPlaceController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerBuildPlaceVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerBuildPlaceVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildPlaceService.queryPageList(param));
}
@ -63,7 +63,7 @@ public class BigDangerBuildPlaceController {
@OperLog(operModul = "危大清单施工部位管理", operType = "列表查询", operDesc = "列表查询危大清单施工部位信息")
@ApiOperation(value = "列表查询危大清单施工部位信息", notes = "列表查询危大清单施工部位信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerBuildPlaceVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerBuildPlaceVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildPlaceService.queryList(param));
}
@ -104,7 +104,7 @@ public class BigDangerBuildPlaceController {
@ApiOperation(value = "删除危大清单施工部位信息", notes = "删除危大清单施工部位信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单施工部位ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerBuildPlace> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerBuildPlace> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerBuildPlaceService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

12
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildProgressController.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.Arrays;
import java.util.List;
@ -17,8 +17,8 @@ import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
@ -78,7 +78,7 @@ public class BigDangerBuildProgressController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerBuildProgressVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerBuildProgressVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildProgressService.queryPageList(param));
}
@ -90,7 +90,7 @@ public class BigDangerBuildProgressController {
@OperLog(operModul = "危大清单施工进度管理", operType = "列表查询", operDesc = "列表查询危大清单施工进度信息")
@ApiOperation(value = "列表查询危大清单施工进度信息", notes = "列表查询危大清单施工进度信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerBuildProgressVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerBuildProgressVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildProgressService.queryList(param));
}
@ -131,7 +131,7 @@ public class BigDangerBuildProgressController {
@ApiOperation(value = "删除危大清单施工进度信息", notes = "删除危大清单施工进度信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单施工进度ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerBuildProgress> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerBuildProgress> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerBuildProgressService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerBuildSideStationController.java
View File

@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -51,7 +51,7 @@ public class BigDangerBuildSideStationController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerBuildSideStationVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerBuildSideStationVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildSideStationService.queryPageList(param));
}
@ -63,7 +63,7 @@ public class BigDangerBuildSideStationController {
@OperLog(operModul = "危大清单施工旁站管理", operType = "列表查询", operDesc = "列表查询危大清单施工旁站信息")
@ApiOperation(value = "列表查询危大清单施工旁站信息", notes = "列表查询危大清单施工旁站信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerBuildSideStationVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerBuildSideStationVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerBuildSideStationService.queryList(param));
}
@ -104,7 +104,7 @@ public class BigDangerBuildSideStationController {
@ApiOperation(value = "删除危大清单施工旁站信息", notes = "删除危大清单施工旁站信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单施工旁站ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerBuildSideStation> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerBuildSideStation> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerBuildSideStationService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

10
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogController.java
View File

@ -18,7 +18,7 @@ import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -52,7 +52,7 @@ public class BigDangerCatalogController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerCatalogVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerCatalogVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerCatalogService.queryPageList(param));
}
@ -64,7 +64,7 @@ public class BigDangerCatalogController {
@OperLog(operModul = "危大目录管理", operType = "列表查询", operDesc = "列表查询危大目录信息")
@ApiOperation(value = "列表查询危大目录信息", notes = "列表查询危大目录信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerCatalogVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerCatalogVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerCatalogService.queryList(param));
}
@ -105,7 +105,7 @@ public class BigDangerCatalogController {
@ApiOperation(value = "删除危大目录信息", notes = "删除危大目录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大目录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerCatalog> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerCatalog> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerCatalogService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}
@ -129,7 +129,7 @@ public class BigDangerCatalogController {
@ApiImplicitParam(name = "headquartersSn", value = "总公司sn", paramType = "body", required = true, dataType = "String"),
})
@GetMapping(value = "tree/list")
public Result<JSONArray> treeList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
public Result<JSONArray> treeList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> paramMap) {
return Result.success(bigDangerCatalogService.treeList(paramMap));
}
}

12
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerCatalogTemplateController.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.Arrays;
import java.util.List;
@ -17,8 +17,8 @@ import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
@ -78,7 +78,7 @@ public class BigDangerCatalogTemplateController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerCatalogTemplateVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerCatalogTemplateVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerCatalogTemplateService.queryPageList(param));
}
@ -90,7 +90,7 @@ public class BigDangerCatalogTemplateController {
@OperLog(operModul = "危大目录库模板管理", operType = "列表查询", operDesc = "列表查询危大目录库模板信息")
@ApiOperation(value = "列表查询危大目录库模板信息", notes = "列表查询危大目录库模板信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerCatalogTemplateVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerCatalogTemplateVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerCatalogTemplateService.queryList(param));
}
@ -131,7 +131,7 @@ public class BigDangerCatalogTemplateController {
@ApiOperation(value = "删除危大目录库模板信息", notes = "删除危大目录库模板信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大目录库模板ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerCatalogTemplate> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerCatalogTemplate> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerCatalogTemplateService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

12
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerExceptionIssueController.java
View File

@ -9,7 +9,7 @@ import io.swagger.annotations.ApiImplicitParams;
import java.util.HashMap;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.Arrays;
import java.util.List;
@ -17,8 +17,8 @@ import java.util.Map;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
@ -78,7 +78,7 @@ public class BigDangerExceptionIssueController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerExceptionIssueVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerExceptionIssueVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerExceptionIssueService.queryPageList(param));
}
@ -90,7 +90,7 @@ public class BigDangerExceptionIssueController {
@OperLog(operModul = "危大清单异常问题管理", operType = "列表查询", operDesc = "列表查询危大清单异常问题信息")
@ApiOperation(value = "列表查询危大清单异常问题信息", notes = "列表查询危大清单异常问题信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerExceptionIssueVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerExceptionIssueVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerExceptionIssueService.queryList(param));
}
@ -131,7 +131,7 @@ public class BigDangerExceptionIssueController {
@ApiOperation(value = "删除危大清单异常问题信息", notes = "删除危大清单异常问题信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单异常问题ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerExceptionIssue> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerExceptionIssue> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerExceptionIssueService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

4
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerInspectTableLibraryController.java
View File

@ -30,8 +30,8 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerPlanController.java
View File

@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -72,7 +72,7 @@ public class BigDangerPlanController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerPlanVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerPlanVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerPlanService.queryPageList(param));
}
@ -84,7 +84,7 @@ public class BigDangerPlanController {
@OperLog(operModul = "危大清单计划管理", operType = "列表查询", operDesc = "列表查询危大清单计划信息")
@ApiOperation(value = "列表查询危大清单计划信息", notes = "列表查询危大清单计划信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerPlanVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerPlanVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerPlanService.queryList(param));
}
@ -125,7 +125,7 @@ public class BigDangerPlanController {
@ApiOperation(value = "删除危大清单计划信息", notes = "删除危大清单计划信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单计划ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerPlan> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerPlan> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerPlanService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeController.java
View File

@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.*;
import java.util.function.Function;
@ -60,7 +60,7 @@ public class BigDangerRecognizeController {
// @OperLog(operModul = "危大清单辨识记录管理", operType = "列表查询", operDesc = "列表查询危大清单辨识记录信息")
// @ApiOperation(value = "列表查询危大清单辨识记录信息", notes = "列表查询危大清单辨识记录信息", httpMethod="GET")
// @GetMapping(value = "/list")
// public Result<List<BigDangerRecognizeVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
// public Result<List<BigDangerRecognizeVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
// return Result.success(bigDangerRecognizeService.queryList(param));
// }
@Lazy
@ -85,7 +85,7 @@ public class BigDangerRecognizeController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerRecognizeVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerRecognizeVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerRecognizeService.queryPageList(param));
}
@ -126,7 +126,7 @@ public class BigDangerRecognizeController {
@ApiOperation(value = "删除危大清单辨识记录信息", notes = "删除危大清单辨识记录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单辨识记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerRecognize> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerRecognize> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerRecognizeService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

10
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecognizeDetailController.java
View File

@ -24,7 +24,7 @@ import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.Date;
import java.util.HashMap;
@ -58,7 +58,7 @@ public class BigDangerRecognizeDetailController {
// @OperLog(operModul = "危大清单辨识详情管理", operType = "列表查询", operDesc = "列表查询危大清单辨识详情信息")
// @ApiOperation(value = "列表查询危大清单辨识详情信息", notes = "列表查询危大清单辨识详情信息", httpMethod="GET")
// @GetMapping(value = "/list")
// public Result<List<BigDangerRecognizeDetailVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
// public Result<List<BigDangerRecognizeDetailVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
// return Result.success(bigDangerRecognizeDetailService.queryList(param));
// }
@ -77,7 +77,7 @@ public class BigDangerRecognizeDetailController {
@ApiImplicitParam(name = "recognizeId", value = "危大清单辨识记录ID（第一次新增不用传，编辑回显需要传）", paramType = "query", required = false, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerRecognizeDetailVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerRecognizeDetailVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerRecognizeDetailService.queryPageList(param));
}
@ -118,7 +118,7 @@ public class BigDangerRecognizeDetailController {
@ApiOperation(value = "删除危大清单辨识详情信息", notes = "删除危大清单辨识详情信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单辨识详情ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerRecognizeDetail> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerRecognizeDetail> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerRecognizeDetailService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}
@ -173,7 +173,7 @@ public class BigDangerRecognizeDetailController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
})
@PostMapping(value = "/getNewestListByDescribe")
public Result<IPage<BigDangerRecognizeDetailVo>> getNewestListByDescribe(@ApiIgnore @RequestBody Map<String, Object> param) {
public Result<IPage<BigDangerRecognizeDetailVo>> getNewestListByDescribe(@Parameter(hidden = true) @RequestBody Map<String, Object> param) {
return Result.success(bigDangerRecognizeDetailService.getNewestListByDescribe(param));
}
}

12
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordController.java
View File

@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.List;
import java.util.Map;
@ -135,7 +135,7 @@ public class BigDangerRecordController {
@ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/endEngineer")
public Result endEngineer(@ApiIgnore @RequestBody Map<String, Object> paramMap) {
public Result endEngineer(@Parameter(hidden = true) @RequestBody Map<String, Object> paramMap) {
bigDangerRecordService.endEngineer(paramMap);
return Result.ok();
}
@ -147,7 +147,7 @@ public class BigDangerRecordController {
@ApiImplicitParam(name = "catalogName", value = "目录名称", paramType = "body", required = false, dataType = "String"),
})
@PostMapping(value = "/getCatalogListByRecordId")
public Result<List<CatalogListByRecordIdVo>> getCatalogListByRecordId(@ApiIgnore @RequestBody Map<String, Object> param) {
public Result<List<CatalogListByRecordIdVo>> getCatalogListByRecordId(@Parameter(hidden = true) @RequestBody Map<String, Object> param) {
return Result.success(bigDangerRecordService.getCatalogListByRecordId(param));
}
@ -156,7 +156,7 @@ public class BigDangerRecordController {
@ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/getControlItemListByRecordId")
public Result<List<BigDangerControlItem>> getControlItemListByRecordId(@ApiIgnore @RequestBody Map<String, Object> param) {
public Result<List<BigDangerControlItem>> getControlItemListByRecordId(@Parameter(hidden = true) @RequestBody Map<String, Object> param) {
return Result.success(bigDangerRecordService.getControlItemListByRecordId(param));
}
@ -165,7 +165,7 @@ public class BigDangerRecordController {
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countRecord")
public Result<CountRecordVo> countRecord(@ApiIgnore @RequestBody Map<String, Object> param) {
public Result<CountRecordVo> countRecord(@Parameter(hidden = true) @RequestBody Map<String, Object> param) {
return Result.success(bigDangerRecordService.countRecord(param));
}
@ -175,7 +175,7 @@ public class BigDangerRecordController {
@ApiImplicitParam(name = "id", value = "危大清单ID", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/countSecurityByRecordId")
public Result<CountSecurityVo> countSecurityByRecordId(@ApiIgnore @RequestBody Map<String, Object> param) {
public Result<CountSecurityVo> countSecurityByRecordId(@Parameter(hidden = true) @RequestBody Map<String, Object> param) {
return Result.success(bigDangerRecordService.countSecurityByRecordId(param));
}

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerRecordFileController.java
View File

@ -17,7 +17,7 @@ import org.simpleframework.xml.core.Validate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -53,7 +53,7 @@ public class BigDangerRecordFileController {
@ApiImplicitParam(name = "catalogId", value = "危大目录id（未分类资料的传-1）", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerRecordFileVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerRecordFileVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerRecordFileService.queryPageList(param));
}
@ -65,7 +65,7 @@ public class BigDangerRecordFileController {
@OperLog(operModul = "危大清单文件管理", operType = "列表查询", operDesc = "列表查询危大清单文件信息")
@ApiOperation(value = "列表查询危大清单文件信息", notes = "列表查询危大清单文件信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerRecordFileVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerRecordFileVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerRecordFileService.queryList(param));
}
@ -106,7 +106,7 @@ public class BigDangerRecordFileController {
@ApiOperation(value = "删除危大清单文件信息", notes = "删除危大清单文件信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大清单文件ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerRecordFile> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerRecordFile> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerRecordFileService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

8
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeCatalogController.java
View File

@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.HashMap;
import java.util.List;
@ -58,7 +58,7 @@ public class BigDangerTypeCatalogController {
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@GetMapping(value = "/page")
public Result<IPage<BigDangerTypeCatalogVo>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<IPage<BigDangerTypeCatalogVo>> queryPageList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerTypeCatalogService.queryPageList(param));
}
@ -70,7 +70,7 @@ public class BigDangerTypeCatalogController {
@OperLog(operModul = "危大工程类别绑定目录管理", operType = "列表查询", operDesc = "列表查询危大工程类别绑定目录信息")
@ApiOperation(value = "列表查询危大工程类别绑定目录信息", notes = "列表查询危大工程类别绑定目录信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<BigDangerTypeCatalogVo>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<BigDangerTypeCatalogVo>> queryList(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
return Result.success(bigDangerTypeCatalogService.queryList(param));
}
@ -110,7 +110,7 @@ public class BigDangerTypeCatalogController {
@ApiOperation(value = "删除危大工程类别绑定目录信息", notes = "删除危大工程类别绑定目录信息", httpMethod = "POST")
@ApiImplicitParam(name = "id", value = "危大工程类别绑定目录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
@PostMapping(value = "/delete")
public Result<BigDangerTypeCatalog> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
public Result<BigDangerTypeCatalog> delete(@Parameter(hidden = true) @RequestBody HashMap<String, Object> map) {
bigDangerTypeCatalogService.delete(MapUtils.getString(map, "id"));
return Result.ok();
}

4
src/main/java/com/zhgd/xmgl/modules/bigdanger/controller/BigDangerTypeController.java
View File

@ -27,7 +27,7 @@ import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import io.swagger.v3.oas.annotations.Parameter;
import java.util.*;
import java.util.stream.Collectors;
@ -157,7 +157,7 @@ public class BigDangerTypeController {
@ApiImplicitParam(name = "name", value = "名称", paramType = "body", required = false, dataType = "String"),
})
@GetMapping(value = "/getTopProjectClassifyTypeRecordTree")
public Result<List<TopProjectClassifyTypeRecordTreeVo>> getTopProjectClassifyTypeRecordTree(@ApiIgnore @RequestParam HashMap<String, Object> param) {
public Result<List<TopProjectClassifyTypeRecordTreeVo>> getTopProjectClassifyTypeRecordTree(@Parameter(hidden = true) @RequestParam HashMap<String, Object> param) {
String projectSn = MapUtils.getString(param, "projectSn");
String sn = MapUtils.getString(param, "sn");
String projectClassify = MapUtils.getString(param, "projectClassify");

4
src/main/java/com/zhgd/xmgl/modules/bigdanger/service/impl/BigDangerInspectTableLibraryServiceImpl.java
View File

@ -66,7 +66,7 @@ public class BigDangerInspectTableLibraryServiceImpl extends ServiceImpl<BigDang
queryWrapper.lambda().eq(BigDangerInspectTableLibrary::getSn, bigDangerInspectTableLibrary.getSn())
.eq(BigDangerInspectTableLibrary::getParentId, bigDangerInspectTableLibrary.getParentId())
.eq(BigDangerInspectTableLibrary::getClassifyName, bigDangerInspectTableLibrary.getClassifyName());
int count = bigDangerInspectTableLibraryMapper.selectCount(queryWrapper);
int count = Math.toIntExact(bigDangerInspectTableLibraryMapper.selectCount(queryWrapper));
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("nameExistErr"));
}
@ -92,7 +92,7 @@ public class BigDangerInspectTableLibraryServiceImpl extends ServiceImpl<BigDang
.eq(BigDangerInspectTableLibrary::getParentId, oldBigDangerInspectTableLibrary.getParentId())
.eq(BigDangerInspectTableLibrary::getClassifyName, bigDangerInspectTableLibrary.getClassifyName())
.ne(BigDangerInspectTableLibrary::getId, bigDangerInspectTableLibrary.getId());
int count = bigDangerInspectTableLibraryMapper.selectCount(queryWrapper);
int count = Math.toIntExact(bigDangerInspectTableLibraryMapper.selectCount(queryWrapper));
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("nameExistErr"));
}