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 +++++++++-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java | 4 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java | 13 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java | 2 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java | 19 +++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml | 42 +++++++++++++++++++++
6 files changed, 98 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
index 0223ebb..9c42e63 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/entity/AttResManagePerson.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* @ClassName 中台责任人实体类
@@ -74,4 +77,20 @@
@TableField("\"res_guid\"")
private String resGuid;
+ /**
+ * 水库id
+ */
+ @ApiModelProperty(value = "来源")
+ @TableField("\"sys_resource\"")
+ private String sysResource;
+
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间 ")
+ @TableField("\"update_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
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));
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
index 31cdcb9..54537fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -15,6 +16,9 @@
*/
public interface AttResManagePersonMapper extends BaseMapper<AttResManagePerson> {
+ Integer updateResManagePersonByGuid(@Param("attResManagePerson")AttResManagePerson attResManagePerson);
+ Integer insertResManagePersion(@Param("attResManagePerson")AttResManagePerson attResManagePerson);
+
List<AttResManagePerson> attResManagePersonListByResId(List<Long> resId);
List<PatrolResponsiblePerson> getPatrolResponsiblePersonAll();
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
index 9534f8a..2363618 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -29,4 +29,46 @@
WHERE a."user_phone" = b.PHONE and a."res_guid" = c."guid" and a."type" = 5
</select>
+ <update id="updateResManagePersonByGuid">
+ update "att_res_manage_person"
+ SET
+ <if test="attResManagePerson.userName !=null and attResManagePerson.userName != '' ">
+ "user_name" = #{attResManagePerson.userName},
+ </if>
+ <if test="attResManagePerson.userPhone !=null and attResManagePerson.userPhone != '' ">
+ "user_phone" = #{attResManagePerson.userPhone},
+ </if>
+ <if test="attResManagePerson.userUnit !=null and attResManagePerson.userUnit != '' ">
+ "user_unit" = #{attResManagePerson.userUnit},
+ </if>
+ <if test="attResManagePerson.position !=null and attResManagePerson.position != '' ">
+ "position" = #{attResManagePerson.position},
+ </if>
+ <if test="attResManagePerson.resGuid !=null and attResManagePerson.resGuid != '' ">
+ "res_guid" = #{attResManagePerson.resGuid},
+ </if>
+ <if test="attResManagePerson.type !=null and attResManagePerson.type != '' ">
+ "type" = #{attResManagePerson.type},
+ </if>
+ <if test="attResManagePerson.sysResource !=null and attResManagePerson.sysResource != '' ">
+ "sys_resource" = #{attResManagePerson.sysResource},
+ </if>
+ "update_time" = #{attResManagePerson.updateTime}
+ where "guid" = #{attResManagePerson.guid}
+ </update>
+
+ <insert id="insertResManagePersion">
+ insert into "att_res_manage_person"("guid", "user_name", "type", "user_phone", "user_unit", "position", "res_guid", "sys_resource")
+ values (rawtohex(sys_guid()),
+ #{attResManagePerson.userName},
+ #{attResManagePerson.type},
+ #{attResManagePerson.userPhone},
+ #{attResManagePerson.userUnit},
+ #{attResManagePerson.position},
+ #{attResManagePerson.resGuid},
+ #{attResManagePerson.sysResource})
+ </insert>
+
+
+
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
index 1d25cf8..2867af5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
@@ -15,6 +15,8 @@
*/
public interface IAttResManagePersonService extends IService<AttResManagePerson> {
+ Boolean saveOrUpdateResManagePerson(AttResManagePerson attResManagePerson);
+
/**
* 获取水库巡查责任人列表
* @param ResId 水库id数组
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
index 6ee94ba..771f159 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -22,6 +23,18 @@
@DS("zt")
public class AttResManagePersonServiceImpl extends ServiceImpl<AttResManagePersonMapper, AttResManagePerson> implements IAttResManagePersonService {
@Override
+ public Boolean saveOrUpdateResManagePerson(AttResManagePerson attResManagePerson) {
+ if (StringUtil.isBlank(attResManagePerson.getResGuid()))
+ return false;
+ if (StringUtil.isBlank(attResManagePerson.getSysResource()))
+ return false;
+ if (StringUtil.isBlank(attResManagePerson.getType()))
+ return false;
+ Integer res = StringUtil.isBlank(attResManagePerson.getGuid())? baseMapper.insertResManagePersion(attResManagePerson):baseMapper.updateResManagePersonByGuid(attResManagePerson);
+ return res > 0;
+ }
+
+ @Override
public List<AttResManagePerson> attResManagePersonListByResIds(String resId) {
return baseMapper.attResManagePersonListByResId(Func.toLongList(resId));
}
--
Gitblit v1.9.3