From 79fa17366c961ae0a84f975f2a6b6fa49b1f534c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 14:48:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttImagestBase.java | 61 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.xml | 6 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.java | 14 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttImagestBaseController.java | 61 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java | 9 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java | 17 ---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml | 32 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java | 10 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/vo/CollectVO.java | 29 +++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttImagestBaseService.java | 11 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttImagesBaseServiceImpl.java | 24 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java | 5
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java | 9 +
13 files changed, 264 insertions(+), 24 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java
index ec70287..4c99c64 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/controller/UserCollectController.java
@@ -98,5 +98,12 @@
return R.data(userCollectService.getMyCollect(userId));
}
-
+ /**
+ * 获取我的收藏的水库
+ */
+ @PostMapping("/getMyCollectVO")
+ @ApiOperation(value = "获取我的收藏的水库", notes = "获取我的收藏的水库")
+ public R getMyCollectVO(String userId){
+ return R.data(userCollectService.getMyCollectVO(userId));
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
index 73a059d..284a712 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.java
@@ -1,10 +1,8 @@
package cn.gistack.sm.collect.mapper;
+import cn.gistack.sm.collect.vo.CollectVO;
import cn.gistack.sm.collect.entity.UserCollect;
-import cn.gistack.sm.feedback.entity.Feedback;
-import cn.gistack.sm.feedback.vo.FeedbackVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,4 +10,5 @@
public interface UserCollectMapper extends BaseMapper<UserCollect> {
String getMyCollect(@Param("userId") String userId);
+ List<CollectVO> getMyCollectVO(@Param("userId") String userId);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
index 1200ef9..373b9a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/mapper/UserCollectMapper.xml
@@ -27,7 +27,39 @@
</select>
+ <select id="getMyCollectVO" resultType="cn.gistack.sm.collect.vo.CollectVO">
+ SELECT
+ SRUC.res_id,
+ arb."name" as resName,
+ arb."eng_scal" as engScal,
+ arb."res_reg_code" as resRegCode,
+ arb."res_type" as resType,
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName,
+
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode,
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS countyName,
+
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS cityCode,
+ case when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS cityName
+
+ FROM YWXT.SM_RES_USER_COLLECT SRUC
+
+ LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = SRUC.RES_ID
+ LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."interior_ad_guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
+
+ WHERE SRUC.STATUS = 1 AND IS_DELETED = 0 AND USER_ID = #{userId}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java
index 944fb5d..3518d83 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/IUserCollectService.java
@@ -1,11 +1,10 @@
package cn.gistack.sm.collect.service;
+import cn.gistack.sm.collect.vo.CollectVO;
import cn.gistack.sm.collect.entity.UserCollect;
-import cn.gistack.sm.feedback.entity.Feedback;
-import cn.gistack.sm.feedback.vo.FeedbackVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
-import org.springblade.core.tool.api.R;
+
+import java.util.List;
/**
* @PROJECT_NAME: skjcmanager
@@ -18,4 +17,7 @@
String getMyCollect(String userId);
String updateCollect(UserCollect userCollect);
+
+ List<CollectVO> getMyCollectVO(String userId);
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
index d174cb4..68a9712 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
@@ -1,5 +1,6 @@
package cn.gistack.sm.collect.service.impl;
+import cn.gistack.sm.collect.vo.CollectVO;
import cn.gistack.sm.collect.entity.UserCollect;
import cn.gistack.sm.collect.mapper.UserCollectMapper;
import cn.gistack.sm.collect.service.IUserCollectService;
@@ -7,9 +8,10 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class UserCollectServiceImpl extends BaseServiceImpl<UserCollectMapper, UserCollect> implements IUserCollectService {
@@ -46,5 +48,10 @@
return baseMapper.getMyCollect(userCollect.getUserId());
}
+ @Override
+ public List<CollectVO> getMyCollectVO(String userId) {
+ return baseMapper.getMyCollectVO(userId);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/vo/CollectVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/vo/CollectVO.java
new file mode 100644
index 0000000..2f5cd99
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/vo/CollectVO.java
@@ -0,0 +1,29 @@
+package cn.gistack.sm.collect.vo;
+
+import lombok.Data;
+
+@Data
+public class CollectVO {
+
+ //水库名称
+ private String resName;
+ //水库编码
+ private String resId;
+ private String resType;
+ //市
+ private String cityCode;
+ private String cityName;
+ //区
+ private String countyCode;
+ private String countyName;
+ //乡镇
+ private String townCode;
+ private String townName;
+ //管理行政区
+
+ //工程规模
+ private String engScal;
+ //注册登记号
+ private String resRegCode;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttImagestBaseController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttImagestBaseController.java
new file mode 100644
index 0000000..47ff084
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/AttImagestBaseController.java
@@ -0,0 +1,61 @@
+package cn.gistack.sm.sjztmd.controller;
+
+import cn.gistack.sm.sjztmd.entity.AttImagestBase;
+import cn.gistack.sm.sjztmd.entity.AttStBase;
+import cn.gistack.sm.sjztmd.service.IAttImagestBaseService;
+import cn.gistack.sm.sjztmd.service.IAttStBaseService;
+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.mp.support.Condition;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "中台监测站点信息")
+@RestController
+@RequestMapping("/sjztmd/attImagestBase")
+@AllArgsConstructor
+public class AttImagestBaseController extends BladeController {
+ private IAttImagestBaseService attImagestBaseService;
+
+ @ApiOperation(value = "中台监测站点信息-添加", notes = "中台监测站点信息-添加")
+ @PostMapping(value = "/save")
+ public R add(AttImagestBase attImagestBase) {
+ return R.data(attImagestBaseService.save(attImagestBase));
+ }
+
+ @ApiOperation(value = "中台监测站点信息-修改", notes = "中台监测站点信息-修改")
+ @PostMapping(value = "/edit")
+ public R edit(AttImagestBase attImagestBase) {
+ return R.data(attImagestBaseService.updateById(attImagestBase));
+ }
+
+ @ApiOperation(value = "中台监测站点信息-添加修改", notes = "中台监测站点信息-添加修改")
+ @PostMapping(value = "/submit")
+ public R submit(AttImagestBase attImagestBase) {
+ return R.data(attImagestBaseService.saveOrUpdate(attImagestBase));
+ }
+
+ @ApiOperation(value = "中台监测站点信息-删除", notes = "中台监测站点信息-删除")
+ @GetMapping(value = "/remove")
+ public R edit(String guid) {
+ return R.data(attImagestBaseService.removeById(guid));
+ }
+
+ @ApiOperation(value = "中台监测站点信息-获取测站信息", notes = "中台监测站点信息-获取测站信息")
+ @GetMapping(value = "/getStation")
+ public R getStation(AttImagestBase attImagestBase){
+ List<AttImagestBase> list = attImagestBaseService.list(Condition.getQueryWrapper(attImagestBase));
+ return R.data(list);
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttImagestBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttImagestBase.java
new file mode 100644
index 0000000..cd05864
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttImagestBase.java
@@ -0,0 +1,61 @@
+package cn.gistack.sm.sjztmd.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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.util.Date;
+
+/**
+ * 中台监测站点信息实体类
+ *
+ * @author Chill
+ */
+@Data
+@TableName("\"att_imagest_base\"")
+@ApiModel(value = "图像站点信息", description = "图像站点信息")
+public class AttImagestBase {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "主键")
+ @TableField("\"guid\"")
+ @TableId("\"guid\"")
+ private String guid;
+
+
+ /**
+ * 监测状态（0.离线，1在线，2.未启用）
+ */
+ @ApiModelProperty(value = "监测状态（0.离线，1在线，2.未启用）")
+ @TableField("\"device_status\"")
+ private String deviceStatus;
+
+
+ /**
+ * 设备状态说明
+ */
+ @ApiModelProperty(value = "设备状态说明")
+ @TableField("\"device_status_desc\"")
+ private String deviceStatusDesc;
+
+
+ /**
+ * 应报数
+ */
+ @ApiModelProperty(value = "应报数")
+ @TableField("\"should_report\"")
+ private String shouldReport;
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
index fd25813..9d9ae77 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttStBase.java
@@ -306,24 +306,11 @@
private String deviceStatusNote;
/**
- * 来源系统
+ * 应报数
*/
- @ApiModelProperty(value = "来源系统")
+ @ApiModelProperty(value = "应报数")
@TableField("\"should_report\"")
private String shouldReport;
-
-
-
-
-
-
-
-
-
-
-
-
-
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.java
new file mode 100644
index 0000000..3fd2115
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.java
@@ -0,0 +1,14 @@
+package cn.gistack.sm.sjztmd.mapper;
+
+import cn.gistack.sm.sjztmd.entity.AttImagestBase;
+import cn.gistack.sm.sjztmd.entity.AttStBase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface AttImagestBaseMapper extends BaseMapper<AttImagestBase> {
+
+
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.xml
new file mode 100644
index 0000000..e878002
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttImagestBaseMapper.xml
@@ -0,0 +1,6 @@
+<?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.AttImagestBaseMapper">
+
+
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttImagestBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttImagestBaseService.java
new file mode 100644
index 0000000..962f2d7
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttImagestBaseService.java
@@ -0,0 +1,11 @@
+package cn.gistack.sm.sjztmd.service;
+
+import cn.gistack.sm.sjztmd.entity.AttImagestBase;
+import cn.gistack.sm.sjztmd.entity.AttStBase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface IAttImagestBaseService extends IService<AttImagestBase> {
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttImagesBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttImagesBaseServiceImpl.java
new file mode 100644
index 0000000..a8dd12b
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttImagesBaseServiceImpl.java
@@ -0,0 +1,24 @@
+package cn.gistack.sm.sjztmd.service.impl;
+
+import cn.gistack.sm.sjztmd.entity.AttImagestBase;
+import cn.gistack.sm.sjztmd.entity.AttStBase;
+import cn.gistack.sm.sjztmd.mapper.AttImagestBaseMapper;
+import cn.gistack.sm.sjztmd.mapper.AttStBaseMapper;
+import cn.gistack.sm.sjztmd.service.IAttImagestBaseService;
+import cn.gistack.sm.sjztmd.service.IAttStBaseService;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@DS("zt")
+public class AttImagesBaseServiceImpl extends ServiceImpl<AttImagestBaseMapper, AttImagestBase> implements IAttImagestBaseService {
+
+
+}
--
Gitblit v1.9.3