From 515973966fa1b60b30f9dbb0062d7198e5fcce85 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 03 Jun 2023 16:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java | 21 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java | 67 ++++++++++++++++
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java | 8 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml | 14 +++
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java | 47 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java | 16 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java | 51 ++++++++++++
9 files changed, 228 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
index 3a4898e..72e8536 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
@@ -41,10 +41,16 @@
/**
* 通知类型 1:水情告警 2：雨情告警
*/
- @ApiModelProperty(value = "通知类型")
+ @ApiModelProperty(value = "通知类型:1:水情告警 2：雨情告警")
private String noticeType;
/**
+ * 通知方式:短信，电话，站内信
+ */
+ @ApiModelProperty(value = "通知方式:短信，电话，站内信")
+ private String noticeMode;
+
+ /**
* 模板内容
*/
@ApiModelProperty(value = "模板内容")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
index 6f94d55..f26e8b1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
@@ -17,5 +17,8 @@
<if test="smsTemplate.type!=null and smsTemplate.type!=''">
and type = #{smsTemplate.type}
</if>
+ <if test="smsTemplate.noticeMode!=null and smsTemplate.noticeMode!=''">
+ and notice_mode = #{smsTemplate.noticeMode}
+ </if>
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java
new file mode 100644
index 0000000..85241a1
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttResRsbNorspiController.java
@@ -0,0 +1,47 @@
+package cn.gistack.sm.sjztmd.controller;
+
+import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
+import cn.gistack.sm.sjztmd.service.IAttResRsbNorspiService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+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;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION: 堰顶高程Controller
+ * @USER: aix
+ * @DATE: 2023/6/3 11:07
+ */
+@Slf4j
+@Api(tags = "水库正常溢洪道")
+@RestController
+@RequestMapping("/sjztmd/attResRsbNorspi")
+@AllArgsConstructor
+public class AttResRsbNorspiController extends BladeController {
+
+ private final IAttResRsbNorspiService attResRsbNorspiService;
+
+ /**
+ * 编辑
+ *
+ * @param attResRsbNorspi
+ * @return
+ */
+ @ApiOperation(value = "水库特征水位-编辑", notes = "水库特征水位-编辑")
+ @PostMapping(value = "/edit")
+ public R edit(@RequestBody AttResRsbNorspi attResRsbNorspi) {
+ if (StringUtil.isBlank(attResRsbNorspi.getResGuid())) {
+ return R.fail("参数不正确");
+ }
+ return R.data(attResRsbNorspiService.updateAttResRsbNorspiByResId(attResRsbNorspi));
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java
new file mode 100644
index 0000000..1e7903f
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResRsbNorspi.java
@@ -0,0 +1,67 @@
+package cn.gistack.sm.sjztmd.entity;
+
+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;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/6/3 10:55
+ */
+@Data
+@TableName("\"att_res_rsb_norspi\"")
+@ApiModel(value = "水库正常溢洪道对象", description = "水库正常溢洪道对象")
+public class AttResRsbNorspi implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "主键")
+ @TableField("\"guid\"")
+ private String guid;
+
+ /**
+ * 水库GUID
+ */
+ @ApiModelProperty(value = "水库GUID")
+ @TableField("\"res_guid\"")
+ private String resGuid;
+
+ /**
+ * 填报堰顶高程
+ */
+ @ApiModelProperty(value = "填报堰顶高程 ")
+ @TableField("\"tb_weir_top_elevation\"")
+ private String tbWeirTopElevation;
+
+ /**
+ * 更新人
+ */
+ @ApiModelProperty(value = "更新人 ")
+ @TableField("\"update_by\"")
+ private String updateBy;
+
+ /**
+ * 更新时间
+ */
+ @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/mapper/AttResRsbNorspiMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java
new file mode 100644
index 0000000..696f6e4
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.java
@@ -0,0 +1,21 @@
+package cn.gistack.sm.sjztmd.mapper;
+
+import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/6/3 10:58
+ */
+@Service
+@DS("zt")
+public interface AttResRsbNorspiMapper extends BaseMapper<AttResRsbNorspi> {
+
+ Integer updateAttResRsbNorspiByResId(@Param("attResRsbNorspi")AttResRsbNorspi attResRsbNorspi);
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml
new file mode 100644
index 0000000..37af313
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResRsbNorspiMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.gistack.sm.sjztmd.mapper.AttResRsbNorspiMapper">
+ <!--namespace根据自己需要创建的的mapper的路径和名称填写-->
+ <update id="updateAttResRsbNorspiByResId">
+ UPDATE "att_res_rsb_norspi" SET
+ <if test="attResRsbNorspi.tbWeirTopElevation !=null and attResRsbNorspi.tbWeirTopElevation != ''">
+ "tb_weir_top_elevation" = #{attResRsbNorspi.tbWeirTopElevation},
+ </if>
+ "update_by" = concat("update_by",',',#{attResRsbNorspi.updateBy}),
+ "update_time" = #{attResRsbNorspi.updateTime}
+ WHERE "res_guid" = #{attResRsbNorspi.resGuid}
+ </update>
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java
new file mode 100644
index 0000000..f3783f3
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResRsbNorspiService.java
@@ -0,0 +1,16 @@
+package cn.gistack.sm.sjztmd.service;
+
+import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/6/3 11:02
+ */
+public interface IAttResRsbNorspiService extends IService<AttResRsbNorspi> {
+
+ Boolean updateAttResRsbNorspiByResId(AttResRsbNorspi attResRsbNorspi);
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
index 5c4a891..25de07f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResWaterBlockService.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sjztmd.service;
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* @PROJECT_NAME: skjcmanager
@@ -8,7 +9,7 @@
* @USER: aix
* @DATE: 2023/5/26 14:42
*/
-public interface IAttResWaterBlockService {
+public interface IAttResWaterBlockService extends IService<AttResWaterBlock> {
Boolean updateAttResWaterBlockByResId(AttResWaterBlock attResWaterBlock);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
new file mode 100644
index 0000000..8066957
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResRsbNorspiServiceImpl.java
@@ -0,0 +1,51 @@
+package cn.gistack.sm.sjztmd.service.impl;
+
+
+import cn.gistack.sm.sjztmd.entity.AttResRsbNorspi;
+import cn.gistack.sm.sjztmd.mapper.AttResRsbNorspiMapper;
+import cn.gistack.sm.sjztmd.service.IAttResRsbNorspiService;
+import cn.gistack.system.user.feign.IUserClient;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * @PROJECT_NAME: skjcmanager
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2023/6/3 11:03
+ */
+@Service
+@DS("zt")
+public class AttResRsbNorspiServiceImpl extends ServiceImpl<AttResRsbNorspiMapper, AttResRsbNorspi> implements IAttResRsbNorspiService {
+
+
+ @Autowired
+ private IUserClient userClient;
+
+ @Override
+ public Boolean updateAttResRsbNorspiByResId(AttResRsbNorspi attResRsbNorspi) {
+
+ attResRsbNorspi.setUpdateTime(DateUtil.now());
+
+ JSONObject paramJson = new JSONObject();
+ paramJson.put("time", DateUtil.format(new Date(),"yyyy-MM-dd"));
+ paramJson.put("editPar", "tb_weir_top_elevation");
+ paramJson.put("ly", "ywxt");
+ paramJson.put("user_id", AuthUtil.getUserId());
+ paramJson.put("user_name", AuthUtil.getUserName());
+ paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
+ attResRsbNorspi.setUpdateBy(paramJson.toJSONString());
+
+ return SqlHelper.retBool(baseMapper.updateAttResRsbNorspiByResId(attResRsbNorspi));
+
+ }
+
+}
--
Gitblit v1.9.3