Browse Source

chore: 修正请求参数类型

master
wangxiang 2 years ago
parent
commit
801beb22a7
  1. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java
  2. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java
  3. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java
  4. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java
  5. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java
  6. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java
  7. 6
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java
  8. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java
  9. 4
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java
  10. 6
      kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java

@ -28,7 +28,7 @@ public class ActivityExtensionPropertyController {
private final ActivityExtensionPropertyService activityExtensionPropertyService; private final ActivityExtensionPropertyService activityExtensionPropertyService;
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(activityExtensionPropertyService.getById(id)); return R.ok(activityExtensionPropertyService.getById(id));
} }
@ -52,7 +52,7 @@ public class ActivityExtensionPropertyController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
activityExtensionPropertyService.removeByIds(Arrays.asList(ids)); activityExtensionPropertyService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java

@ -42,7 +42,7 @@ public class ButtonController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(buttonService.getById(id)); return R.ok(buttonService.getById(id));
} }
@ -59,7 +59,7 @@ public class ButtonController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
buttonService.removeByIds(Arrays.asList(ids)); buttonService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java

@ -33,7 +33,7 @@ public class CategoryController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(categoryService.getById(id)); return R.ok(categoryService.getById(id));
} }
@ -54,7 +54,7 @@ public class CategoryController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
categoryService.removeByIds(Arrays.asList(ids)); categoryService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java

@ -41,7 +41,7 @@ public class ConditionController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(conditionService.getById(id)); return R.ok(conditionService.getById(id));
} }
@ -58,7 +58,7 @@ public class ConditionController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
conditionService.removeByIds(Arrays.asList(ids)); conditionService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java

@ -32,7 +32,7 @@ public class FormCategoryController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(formCategoryService.getById(id)); return R.ok(formCategoryService.getById(id));
} }
@ -49,7 +49,7 @@ public class FormCategoryController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
formCategoryService.removeByIds(Arrays.asList(ids)); formCategoryService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java

@ -33,7 +33,7 @@ public class FormDefinitionController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(formDefinitionService.getById(id)); return R.ok(formDefinitionService.getById(id));
} }
@ -50,7 +50,7 @@ public class FormDefinitionController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
formDefinitionService.removeByIds(Arrays.asList(ids)); formDefinitionService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

6
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java

@ -46,7 +46,7 @@ public class FormDefinitionJsonController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(formDefinitionJsonService.getById(id)); return R.ok(formDefinitionJsonService.getById(id));
} }
@ -78,13 +78,13 @@ public class FormDefinitionJsonController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
formDefinitionJsonService.removeByIds(Arrays.asList(ids)); formDefinitionJsonService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }
@PutMapping("/setPrimaryVersion/{id}") @PutMapping("/setPrimaryVersion/{id}")
public R setPrimaryVersion(@PathVariable Integer id) { public R setPrimaryVersion(@PathVariable String id) {
FormDefinitionJson formDefinitionJson =formDefinitionJsonService.getById(id); FormDefinitionJson formDefinitionJson =formDefinitionJsonService.getById(id);
// 其余版本更新为非主版本 // 其余版本更新为非主版本
formDefinitionJsonService.update( formDefinitionJsonService.update(

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java

@ -43,7 +43,7 @@ public class ListenerController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(listenerService.getById(id)); return R.ok(listenerService.getById(id));
} }
@ -60,7 +60,7 @@ public class ListenerController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
listenerService.removeByIds(Arrays.asList(ids)); listenerService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

4
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java

@ -35,7 +35,7 @@ public class WorkflowCopyController {
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public R getById(@PathVariable("id") Integer id) { public R getById(@PathVariable("id") String id) {
return R.ok(workflowCopyService.getById(id)); return R.ok(workflowCopyService.getById(id));
} }
@ -52,7 +52,7 @@ public class WorkflowCopyController {
} }
@DeleteMapping("/remove/{ids}") @DeleteMapping("/remove/{ids}")
public R remove(@PathVariable Integer[] ids) { public R remove(@PathVariable String[] ids) {
workflowCopyService.removeByIds(Arrays.asList(ids)); workflowCopyService.removeByIds(Arrays.asList(ids));
return R.ok(); return R.ok();
} }

6
kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml

@ -7,9 +7,9 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
#server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
ip: @profiles.ip@ #ip: @profiles.ip@
server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
namespace: @profiles.namespace@ namespace: @profiles.namespace@
config: config:
server-addr: ${spring.cloud.nacos.discovery.server-addr} server-addr: ${spring.cloud.nacos.discovery.server-addr}

Loading…
Cancel
Save