From 73bafbb0c0b7392bb6f230357fe0008fd8b6d68f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 29 May 2023 15:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
index 782e372..9b5c7c6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResManagePersonController.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.sjztmd.controller;
+import cn.gistack.sm.patrol.entity.PatrolConfig;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
import cn.gistack.system.user.entity.User;
@@ -15,9 +16,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -105,4 +104,20 @@
return R.data(StringUtil.join(reslist, ","));
}
+ @ApiOperation(value="巡查责任人-添加/修改", notes="巡查责任人-添加/修改")
+ @PostMapping(value = "/editZrr")
+ public R editZrr(@RequestBody AttResManagePerson attResManagePerson) {
+ if (StringUtil.isEmpty(attResManagePerson.getResGuid()))
+ return R.fail("resGuid不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getType()))
+ return R.fail("type不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getSysResource()))
+ return R.fail("sysResource不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getUserPhone()))
+ return R.fail("userPhone不能为空");
+ if (StringUtil.isEmpty(attResManagePerson.getUserName()))
+ return R.fail("userName不能为空");
+ return R.data(attResManagePersonService.saveOrUpdateResManagePerson(attResManagePerson));
+ }
+
}
--
Gitblit v1.9.3