From 63f25d9b1989f37b1a07bb59359d2091d480ff4e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Sep 2023 16:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/vo/PointVO.java | 8 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.java | 32 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.xml | 28 ++++
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java | 5
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/entity/Point.java | 77 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/PointService.java | 30 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/controller/PointController.java | 129 ++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml | 12 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/impl/PointServiceImpl.java | 55 +++++++
10 files changed, 378 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
index 3243672..f5242e8 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
@@ -35,4 +35,9 @@
*/
private String smsType;
+ /**
+ * 告警规则名称
+ */
+ private String ruleName;
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
index 4712327..99f3676 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -4,13 +4,23 @@
<!--自定义分页列表查询-->
<select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
- select ssr.*,sst.content templateContent,sst.sms_type as smsType
+ select ssr.*,
+ sar.rule_name as ruleName,
+ sst.content templateContent,sst.sms_type as smsType
from sm_sms_result ssr
left join sm_sms_template sst on sst.template_id = ssr.template_id and sst.is_deleted = 0
+ left join YWXT.sm_alarm_rule_detail sard on sard.template_id = sst.id
+ left join YWXT.sm_alarm_rule sar on sar.id = sard.alarm_rule_id
where 1=1 and ssr.is_deleted = 0
<if test="smsResult.templateId!=null and smsResult.templateId!=''">
and ssr.template_id = #{smsResult.templateId}
</if>
+ <if test="smsResult.resCode==0">
+ and ssr.res_code =0
+ </if>
+ <if test="smsResult.resCode==1">
+ and ssr.res_code !=0
+ </if>
<if test="smsResult.templateContent!=null and smsResult.templateContent!=''">
and sst.content like concat('%',#{smsResult.templateContent},'%')
</if>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
index 3246f07..3e0e68b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
@@ -43,7 +43,9 @@
}
if (null!=smsResult.getIsExport()){
// 导出，不分页
- return baseMapper.selectSmsResultPage(null,smsResult,list);
+ List<SmsResultVO> resultVOList = baseMapper.selectSmsResultPage(null, smsResult, list);
+ // 设置统计值
+ return resultVOList;
}
// 查询返回
return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list));
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/controller/PointController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/controller/PointController.java
new file mode 100644
index 0000000..c09cffb
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/controller/PointController.java
@@ -0,0 +1,129 @@
+package cn.gistack.sm.point.controller;
+
+
+import cn.gistack.sm.point.entity.Point;
+import cn.gistack.sm.point.service.PointService;
+import cn.gistack.sm.point.vo.PointVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+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.*;
+
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * 点位控制层
+ * @author zhongrj
+ * @date 2023-09-23
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/point/point")
+public class PointController {
+
+ private final PointService pointService;
+
+ /**
+ * 分页列表查询
+ *
+ * @param point
+ * @return
+ */
+ @ApiOperation(value="点位-分页列表查询", notes="点位-分页列表查询")
+ @GetMapping(value = "/list")
+ public R queryPageList(Point point, Query query) {
+ IPage<Point> pageList = pointService.page(Condition.getPage(query), Condition.getQueryWrapper(point));
+ return R.data(pageList);
+ }
+
+ /**
+ * 自定义分页列表查询
+ * @param query
+ * @param point
+ * @return
+ */
+ @ApiOperation(value="点位-自定义分页列表查询", notes="点位-自定义分页列表查询")
+ @GetMapping(value = "/page")
+ public R page(PointVO point, Query query) {
+ return R.data( pointService.selectPointPage(Condition.getPage(query),point));
+ }
+
+ /**
+ * 添加
+ *
+ * @param point
+ * @return
+ */
+ @ApiOperation(value="点位-添加", notes="点位-添加")
+ @PostMapping(value = "/add")
+ public R add(@RequestBody Point point) {
+ point.setCreateTime(new Date());
+ return R.data(pointService.save(point));
+ }
+
+ /**
+ * 编辑
+ *
+ * @param point
+ * @return
+ */
+ @ApiOperation(value="点位-编辑", notes="点位-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R edit(@RequestBody Point point) {
+ return R.data(pointService.updateById(point));
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="点位-通过id删除", notes="点位-通过id删除")
+ @PostMapping(value = "/delete")
+ public R delete(@RequestParam(name="id",required=true) String id) {
+ return R.data(pointService.removeById(id));
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value="点位-批量删除", notes="点位-批量删除")
+ @PostMapping(value = "/deleteBatch")
+ public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ return R.data(this.pointService.removeByIds(Arrays.asList(ids.split(","))));
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="点位-通过id查询", notes="点位-通过id查询")
+ @GetMapping(value = "/queryById")
+ public R queryById(@RequestParam(name="id",required=true) String id) {
+ Point point = pointService.getById(id);
+ return R.data(point);
+ }
+
+
+ /**
+ * 通过图片id删除
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="点位-通过图片id删除", notes="点位-通过图片id删除")
+ @PostMapping(value = "/deleteByPicId")
+ public R deleteByPicId(@RequestParam(name="id",required=true) String id) {
+ return R.data(pointService.deleteByPicId(id));
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/entity/Point.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/entity/Point.java
new file mode 100644
index 0000000..62f1ff3
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/entity/Point.java
@@ -0,0 +1,77 @@
+package cn.gistack.sm.point.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 点位
+ *
+ * @author zhongrj
+ * @date 2023-09-23
+ */
+@Data
+@TableName(value = "sm_point")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Point {
+
+ /**
+ * id
+ */
+ @ApiModelProperty(value = "id")
+ @TableId(value = "id",type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 水库编号
+ */
+ @ApiModelProperty(value = "水库编号")
+ private String resGuid;
+
+ /**
+ * 测点名称
+ */
+ @ApiModelProperty(value = "测点名称")
+ private String name;
+
+ /**
+ * 测点类型
+ */
+ @ApiModelProperty(value = "测点类型")
+ private String type;
+
+ /**
+ * 图片id,关联考证表id
+ */
+ @ApiModelProperty(value = "图片id,关联考证表id")
+ private String picId;
+
+ /**
+ * x
+ */
+ @ApiModelProperty(value = "x")
+ private String x;
+
+ /**
+ * y
+ */
+ @ApiModelProperty(value = "y")
+ private String y;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.java
new file mode 100644
index 0000000..a794428
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.java
@@ -0,0 +1,32 @@
+package cn.gistack.sm.point.mapper;
+
+
+import cn.gistack.sm.point.entity.Point;
+import cn.gistack.sm.point.vo.PointVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 点位详情mapper映射层
+ * @author zhongrj
+ * @date 2023-05-29
+ */
+public interface PointMapper extends BaseMapper<Point> {
+
+ /**
+ * 自定义分页列表查询
+ * @param page
+ * @param point
+ * @return
+ */
+ List<PointVO> selectPointPage(IPage<PointVO> page, @Param("point") PointVO point);
+
+ /**
+ * 删除考证表附件信息
+ * @param id
+ */
+ int deletePicByPicAttach(@Param("id") String id);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.xml
new file mode 100644
index 0000000..2c84f4b
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/mapper/PointMapper.xml
@@ -0,0 +1,28 @@
+<?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.point.mapper.PointMapper">
+
+ <!--自定义分页列表查询-->
+ <select id="selectPointPage" resultType="cn.gistack.sm.point.vo.PointVO">
+ select * from sm_point
+ where 1=1
+ <if test="point.resGuid!=null and point.resGuid!=''">
+ and res_guid like concat('%',#{point.resGuid},'%')
+ </if>
+ <if test="point.name!=null and point.name!=''">
+ and name like concat('%',#{point.name},'%')
+ </if>
+ <if test="point.type!=null">
+ and type = #{point.type}
+ </if>
+ <if test="point.picId!=null and point.picId!=''">
+ and pic_id = #{point.picId}
+ </if>
+ </select>
+
+ <!--删除考证表附件信息-->
+ <delete id="deletePicByPicAttach">
+ delete from sm_textual_research_attach where id = #{id}
+ </delete>
+
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/PointService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/PointService.java
new file mode 100644
index 0000000..e63e345
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/PointService.java
@@ -0,0 +1,30 @@
+package cn.gistack.sm.point.service;
+
+
+import cn.gistack.sm.point.entity.Point;
+import cn.gistack.sm.point.vo.PointVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 点位服务层
+ * @author zhongrj
+ * @date 2023-09-23
+ */
+public interface PointService extends IService<Point> {
+
+ /**
+ * 自定义分页列表查询
+ * @param page
+ * @param point
+ * @return
+ */
+ Object selectPointPage(IPage<PointVO> page, PointVO point);
+
+ /**
+ * 通过图片id删除
+ * @param id
+ * @return
+ */
+ Boolean deleteByPicId(String id);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/impl/PointServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/impl/PointServiceImpl.java
new file mode 100644
index 0000000..c03eeaf
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/service/impl/PointServiceImpl.java
@@ -0,0 +1,55 @@
+package cn.gistack.sm.point.service.impl;
+
+
+import cn.gistack.sm.point.entity.Point;
+import cn.gistack.sm.point.mapper.PointMapper;
+import cn.gistack.sm.point.service.PointService;
+import cn.gistack.sm.point.vo.PointVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 点位服务实现层
+ * @author zhongrj
+ * @date 2023-09-23
+ */
+@Service
+public class PointServiceImpl extends ServiceImpl<PointMapper, Point> implements PointService {
+
+ /**
+ * 自定义分页列表查询
+ * @param page
+ * @param point
+ * @return
+ */
+ @Override
+ public IPage<PointVO> selectPointPage(IPage<PointVO> page, PointVO point) {
+ return page.setRecords(baseMapper.selectPointPage(page,point));
+ }
+
+ /**
+ * 通过图片id删除
+ * @param id
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean deleteByPicId(String id) {
+ Boolean flag = false;
+ // 先删除图片附件
+ int i = baseMapper.deletePicByPicAttach(id);
+ // 在删除对应的点位数据
+ if(i>0){
+ QueryWrapper<Point> wrapper = new QueryWrapper<>();
+ wrapper.eq("pic_id",id);
+ int delete = baseMapper.delete(wrapper);
+ if (delete>0){
+ flag = true;
+ }
+ }
+ return flag;
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/vo/PointVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/vo/PointVO.java
new file mode 100644
index 0000000..f97c207
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/point/vo/PointVO.java
@@ -0,0 +1,8 @@
+package cn.gistack.sm.point.vo;
+
+import cn.gistack.sm.point.entity.Point;
+import lombok.Data;
+
+@Data
+public class PointVO extends Point {
+}
--
Gitblit v1.9.3