From 844ffa2181d698f3871a62553fe10dd4054b63fa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 10:23:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
index ee2d9b9..9c14bd9 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -28,7 +28,7 @@
* @author zss
* @since 2023-08-18 16:59:14
*/
-@Api(tags = "鍩虹鏁版嵁-->宸ヨ壓璺嚎缁存姢琛ㄦ帴鍙�")
+@Api(tags = "鍩虹鏁版嵁-->宸ヨ壓璺嚎缁存姢")
@RestController
@RequestMapping("/technologyTemplate")
public class TechnologyTemplateController {
@@ -43,62 +43,76 @@
return Result.success(technologyTemplateService.chooseDevGroup());
}
+ @ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢-->閫夋嫨宸ュ簭")
+ @GetMapping("/chooseTech")
+ public Result chooseTech() {
+ return Result.success(technologyTemplateService.chooseTech());
+ }
+
+ @ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢-->閫夋嫨鍏冧欢")
+ @GetMapping("/chooseElement")
+ public Result chooseElement() {
+ return Result.success(technologyTemplateService.chooseElement());
+ }
+
@ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢")
@PostMapping("/addTechTemp")
- public Result addSale(@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
- technologyTemplateService.addSale(technologyTemplateDto);
+ public Result addTechTemp(@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
+ technologyTemplateService.addTechTemp(technologyTemplateDto);
return Result.success("鏂板鎴愬姛!");
}
- @ApiOperation(value = "鏌ヨ宸ヨ壓璺嚎鍒楄〃")
+ @ApiOperation(value = "鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟浜岀骇灞曠ず")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "name", value = "宸ヨ壓", dataTypeClass = String.class),
- @ApiImplicitParam(name = "father", value = "宸ュ簭", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "message", value = "鎼滅储鍐呭", dataTypeClass = String.class)
})
@GetMapping("/selectAllTechTem")
- public Result selectAllTechTem(int pageSize, int countSize, Integer type, String name, String father) {
- IPage<Map<String, Object>> technologyTemplatePage = technologyTemplateService.selectAllTechTem(new Page<Object>(pageSize, countSize), type, name, father);
- Map<String, Object> map = new HashMap<>();
- map.put("total", technologyTemplatePage.getTotal());
- map.put("row", technologyTemplatePage.getRecords());
- return Result.success(map);
+ public Result selectAllTechTem(Integer type,String message) {
+ return Result.success(technologyTemplateService.selectAllTechTem(type,message));
+ }
+
+ @ApiOperation(value = "鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class,required = true)
+ })
+ @GetMapping("/selectAllTechNam")
+ public Result selectAllTechNam(String father) {
+ return Result.success(technologyTemplateService.selectAllTechNam(father));
}
@ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "宸ヨ壓id", dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
})
@GetMapping("/selecTechById")
public Result selecTechById(Integer id) {
- return Result.success(technologyTemplateService.getById(id));
+ return Result.success(technologyTemplateService.selecTechById(id));
}
@ApiOperation(value = "缂栬緫")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "宸ヨ壓id", dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
})
@PostMapping("/writeTechById")
- public Result writeTechById(Integer id,@RequestBody TechnologyTemplateDto technologyTemplateDto) {
+ public Result writeTechById(Integer id,@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
technologyTemplateService.writeTechById(id,technologyTemplateDto);
- return Result.success("淇敼鎴愬姛!");
+ return Result.success("淇敼"+id+"鎴愬姛!");
}
@ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "宸ヨ壓id", dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
})
@PostMapping("/delTechById")
public Result delTechById(Integer id) {
technologyTemplateService.delTechById(id);
- return Result.success("鍒犻櫎鎴愬姛!");
+ return Result.success("鍒犻櫎"+id+"鎴愬姛!");
}
@ApiOperation(value = "鎵归噺鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "ids", value = "宸ヨ壓id", dataTypeClass = String.class,required = true)
+ @ApiImplicitParam(name = "ids", value = "宸ヨ壓璺嚎id", dataTypeClass = String.class,required = true)
})
@PostMapping("/delAllTech")
public Result delAllTech(String ids) {
--
Gitblit v1.9.3