From 0b16f5e75c2e9376e5fdb296fe964f34b1d33372 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 04 Apr 2023 09:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.java | 24 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRouteService.java | 24 ++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java | 38 +++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.xml | 45 +++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRouteServiceImpl.java | 50 ++++++++++++
5 files changed, 181 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
index 9becd39..b6d69d1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRouteController.java
@@ -60,6 +60,18 @@
return R.data(patrolRouteService.save(patrolRoute));
}
+ /**
+ * 自定义添加
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义添加", notes="巡查路线-自定义添加")
+ @PostMapping(value = "/save")
+ public R save(@RequestBody PatrolRoute patrolRoute) {
+ return R.data(patrolRouteService.savePatrolRoute(patrolRoute));
+ }
+
/**
* 编辑
*
@@ -71,6 +83,19 @@
public R edit(@RequestBody PatrolRoute patrolRoute) {
return R.data(patrolRouteService.updateById(patrolRoute));
}
+
+
+ /**
+ * 自定义编辑
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义编辑", notes="巡查路线-自定义编辑")
+ @RequestMapping(value = "/update", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R update(@RequestBody PatrolRoute patrolRoute) {
+ return R.data(patrolRouteService.updatePatrolRouteById(patrolRoute));
+ }
/**
* 通过id删除
@@ -110,6 +135,19 @@
return R.data(patrolRoute);
}
+ /**
+ * 自定义通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="巡查路线-自定义通过id查询", notes="巡查路线-自定义通过id查询")
+ @GetMapping(value = "/getPatrolRouteById")
+ public R getPatrolRouteById(@RequestParam(name="id",required=true) String id) {
+ PatrolRoute patrolRoute = patrolRouteService.getPatrolRouteById(id);
+ return R.data(patrolRoute);
+ }
+
/**
* 查询巡查路线树数据
* @param patrolRoute
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.java
index 2bb0f39..3b4837f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.java
@@ -27,4 +27,28 @@
* @return
*/
List<PatrolRouteVO> getPatrolRouteTree(@Param("patrolRoute") PatrolRouteVO patrolRoute);
+
+ /**
+ * 自定义添加
+ *
+ * @param patrolRoute
+ * @return
+ */
+ Integer savePatrolRoute(@Param("patrolRoute")PatrolRoute patrolRoute);
+
+ /**
+ * 自定义编辑
+ *
+ * @param patrolRoute
+ * @return
+ */
+ Integer updatePatrolRouteById(@Param("patrolRoute")PatrolRoute patrolRoute);
+
+ /**
+ * 自定义通过id查询
+ *
+ * @param id
+ * @return
+ */
+ PatrolRoute getPatrolRouteById(@Param("id")String id);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.xml
index 8d3708c..b6dda46 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRouteMapper.xml
@@ -23,4 +23,49 @@
and reservoir_id like concat(concat('%',#{patrolRoute.reservoirId}),'%')
</if>
</select>
+
+ <!--新增-->
+ <insert id="savePatrolRoute">
+ INSERT INTO sm_patrol_route
+ (
+ id,routeName,reservoirId,remark,
+ create_dept,create_time,create_user,update_user,update_time,is_deleted,status,route_coordinates
+ )
+ VALUES
+ (
+ #{patrolRoute.id},#{patrolRoute.routeName},#{patrolRoute.reservoirId},#{patrolRoute.remark},
+ #{patrolRoute.createDept},#{patrolRoute.createTime},#{patrolRoute.createUser},#{patrolRoute.updateUser},
+ #{patrolRoute.updateTime},#{patrolRoute.isDeleted},#{patrolRoute.status},
+ dmgeo.ST_LineFromText(${patrolRoute.routeCoordinates},0)
+ )
+ </insert>
+
+ <!--自定义修改巡查任务数据-->
+ <update id="updatePatrolRouteById">
+ update sm_patrol_route
+ SET
+ <if test="patrolRoute.routeName !=null and patrolRoute.routeName !=''">
+ route_name = #{patrolRoute.routeName},
+ </if>
+ <if test="patrolRoute.reservoirId !=null and patrolRoute.reservoirId !=''">
+ reservoir_id = #{patrolRoute.reservoirId},
+ </if>
+ <if test="patrolRoute.remark !=null and patrolRoute.remark !=''">
+ remark = #{patrolRoute.remark},
+ </if>
+ <if test="patrolRoute.routeCoordinates !=null and patrolRoute.routeCoordinates !=''">
+ route_coordinates = dmgeo.ST_LineFromText(${patrolRoute.routeCoordinates},0),
+ </if>
+ update_time = #{patrolRoute.updateTime}
+ where id=#{patrolRoute.id}
+ </update>
+
+ <!--自定义查询详情-->
+ <select id="getPatrolRouteById" resultType="cn.gistack.sm.patrol.entity.PatrolRoute">
+ select
+ spr.id,spr.route_name,spr.reservoir_id,spr.remark,
+ dmgeo.ST_AsGeoJSON(spr.route_coordinates) AS route_coordinates
+ FROM sm_patrol_route spr
+ where spr.id = #{id}
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRouteService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRouteService.java
index 0592692..0b5b5ae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRouteService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolRouteService.java
@@ -24,4 +24,28 @@
* @return
*/
Object getPatrolRouteTree(PatrolRouteVO patrolRoute);
+
+ /**
+ * 自定义添加
+ *
+ * @param patrolRoute
+ * @return
+ */
+ Boolean savePatrolRoute(PatrolRoute patrolRoute);
+
+ /**
+ * 自定义编辑
+ *
+ * @param patrolRoute
+ * @return
+ */
+ Boolean updatePatrolRouteById(PatrolRoute patrolRoute);
+
+ /**
+ * 自定义通过id查询
+ *
+ * @param id
+ * @return
+ */
+ PatrolRoute getPatrolRouteById(String id);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRouteServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRouteServiceImpl.java
index f1b2bc8..b1031e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRouteServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRouteServiceImpl.java
@@ -3,10 +3,14 @@
import cn.gistack.sm.patrol.entity.PatrolRoute;
import cn.gistack.sm.patrol.mapper.PatrolRouteMapper;
import cn.gistack.sm.patrol.service.IPatrolRouteService;
+import cn.gistack.sm.patrol.util.EnhancementServicesTool;
+import cn.gistack.sm.patrol.util.IdWorker;
import cn.gistack.sm.patrol.vo.PatrolRouteVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.EmptyStackException;
/**
* @Description: 巡查路线
@@ -34,4 +38,50 @@
public Object getPatrolRouteTree(PatrolRouteVO patrolRoute) {
return baseMapper.getPatrolRouteTree(patrolRoute);
}
+
+ /**
+ * 自定义添加
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @Override
+ public Boolean savePatrolRoute(PatrolRoute patrolRoute) {
+ patrolRoute.setId(IdWorker.getId());
+ // 设置基础信息
+ EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
+ enhancementServicesTool.resolveEntity(patrolRoute);
+ //新增
+ Integer save = baseMapper.savePatrolRoute(patrolRoute);
+ // 返回
+ return save>0?true:false;
+ }
+
+ /**
+ * 自定义编辑
+ *
+ * @param patrolRoute
+ * @return
+ */
+ @Override
+ public Boolean updatePatrolRouteById(PatrolRoute patrolRoute) {
+ // 设置基础信息
+ EnhancementServicesTool enhancementServicesTool = new EnhancementServicesTool();
+ enhancementServicesTool.resolveEntity(patrolRoute);
+ //新增
+ Integer update = baseMapper.updatePatrolRouteById(patrolRoute);
+ // 返回
+ return update>0?true:false;
+ }
+
+ /**
+ * 自定义通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public PatrolRoute getPatrolRouteById(String id) {
+ return baseMapper.getPatrolRouteById(id);
+ }
}
--
Gitblit v1.9.3