From 59dd637267a99eadd2c5cf0b8d59e8dc4fbb6b26 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期六, 22 六月 2024 08:45:10 +0800
Subject: [PATCH] 增加：地形标定管理
---
ard-work/src/main/java/com/ruoyi/device/terrain/service/IArdTerrainMarkService.java | 61 +++++
ard-work/src/main/java/com/ruoyi/device/terrain/domain/ArdTerrainMark.java | 139 ++++++++++++
ard-work/src/main/java/com/ruoyi/device/terrain/service/impl/ArdTerrainMarkServiceImpl.java | 98 ++++++++
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 69 +++---
ard-work/src/main/java/com/ruoyi/device/terrain/controller/ArdTerrainMarkController.java | 113 ++++++++++
ard-work/src/main/resources/mapper/device/ArdTerrainMarkMapper.xml | 104 +++++++++
ard-work/src/main/java/com/ruoyi/device/terrain/mapper/ArdTerrainMarkMapper.java | 61 +++++
7 files changed, 611 insertions(+), 34 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/terrain/controller/ArdTerrainMarkController.java b/ard-work/src/main/java/com/ruoyi/device/terrain/controller/ArdTerrainMarkController.java
new file mode 100644
index 0000000..20cf6b3
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/terrain/controller/ArdTerrainMarkController.java
@@ -0,0 +1,113 @@
+package com.ruoyi.device.terrain.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+import com.ruoyi.device.terrain.service.IArdTerrainMarkService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 鍦板舰鏍囧畾绠＄悊Controller
+ *
+ * @author liusuyi
+ * @date 2024-06-22
+ */
+@Api(tags = "鍦板舰鏍囧畾绠＄悊")
+@RestController
+@RequestMapping("/terrain/mark")
+public class ArdTerrainMarkController extends BaseController
+{
+ @Autowired
+ private IArdTerrainMarkService ardTerrainMarkService;
+
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鍦板舰鏍囧畾绠＄悊鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('terrain:mark:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(ArdTerrainMark ardTerrainMark)
+ {
+ startPage();
+ List<ArdTerrainMark> list = ardTerrainMarkService.selectArdTerrainMarkList(ardTerrainMark);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鍦板舰鏍囧畾绠＄悊鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('terrain:mark:export')")
+ @Log(title = "鍦板舰鏍囧畾绠＄悊", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ArdTerrainMark ardTerrainMark)
+ {
+ List<ArdTerrainMark> list = ardTerrainMarkService.selectArdTerrainMarkList(ardTerrainMark);
+ ExcelUtil<ArdTerrainMark> util = new ExcelUtil<ArdTerrainMark>(ArdTerrainMark.class);
+ util.exportExcel(response, list, "鍦板舰鏍囧畾绠＄悊鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鍦板舰鏍囧畾绠＄悊璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇鍦板舰鏍囧畾绠＄悊璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('terrain:mark:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") String id)
+ {
+ return success(ardTerrainMarkService.selectArdTerrainMarkById(id));
+ }
+
+ /**
+ * 鏂板鍦板舰鏍囧畾绠＄悊
+ */
+ @ApiOperation("鏂板鍦板舰鏍囧畾绠＄悊")
+ @PreAuthorize("@ss.hasPermi('terrain:mark:add')")
+ @Log(title = "鍦板舰鏍囧畾绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ArdTerrainMark ardTerrainMark)
+ {
+ return toAjax(ardTerrainMarkService.insertArdTerrainMark(ardTerrainMark));
+ }
+
+ /**
+ * 淇敼鍦板舰鏍囧畾绠＄悊
+ */
+ @ApiOperation("淇敼鍦板舰鏍囧畾绠＄悊")
+ @PreAuthorize("@ss.hasPermi('terrain:mark:edit')")
+ @Log(title = "鍦板舰鏍囧畾绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ArdTerrainMark ardTerrainMark)
+ {
+ return toAjax(ardTerrainMarkService.updateArdTerrainMark(ardTerrainMark));
+ }
+
+ /**
+ * 鍒犻櫎鍦板舰鏍囧畾绠＄悊
+ */
+ @ApiOperation("鍒犻櫎鍦板舰鏍囧畾绠＄悊")
+ @PreAuthorize("@ss.hasPermi('terrain:mark:remove')")
+ @Log(title = "鍦板舰鏍囧畾绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids)
+ {
+ return toAjax(ardTerrainMarkService.deleteArdTerrainMarkByIds(ids));
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/device/terrain/domain/ArdTerrainMark.java b/ard-work/src/main/java/com/ruoyi/device/terrain/domain/ArdTerrainMark.java
new file mode 100644
index 0000000..93399e6
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/terrain/domain/ArdTerrainMark.java
@@ -0,0 +1,139 @@
+package com.ruoyi.device.terrain.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鍦板舰鏍囧畾绠＄悊瀵硅薄 ard_terrain_mark
+ *
+ * @author liusuyi
+ * @date 2024-06-22
+ */
+public class ArdTerrainMark extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** ID涓婚敭 */
+ private String id;
+
+ /** 鐩告満ID */
+ @Excel(name = "鐩告満ID")
+ private String cameraId;
+
+ /** 缁忓害 */
+ @Excel(name = "缁忓害")
+ private Double longitude;
+
+ /** 绾害 */
+ @Excel(name = "绾害")
+ private Double latitude;
+
+ /** 淇话 */
+ @Excel(name = "淇话")
+ private Double t;
+
+ /** 楂樺眰 */
+ @Excel(name = "楂樺眰")
+ private Double altitude;
+
+ /** 鎵�灞為儴闂� */
+ @Excel(name = "鎵�灞為儴闂�")
+ private String deptId;
+
+ /** 鎵�灞炵敤鎴� */
+ @Excel(name = "鎵�灞炵敤鎴�")
+ private String userId;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setCameraId(String cameraId)
+ {
+ this.cameraId = cameraId;
+ }
+
+ public String getCameraId()
+ {
+ return cameraId;
+ }
+ public void setLongitude(Double longitude)
+ {
+ this.longitude = longitude;
+ }
+
+ public Double getLongitude()
+ {
+ return longitude;
+ }
+ public void setLatitude(Double latitude)
+ {
+ this.latitude = latitude;
+ }
+
+ public Double getLatitude()
+ {
+ return latitude;
+ }
+ public void setT(Double t)
+ {
+ this.t = t;
+ }
+
+ public Double getT()
+ {
+ return t;
+ }
+ public void setAltitude(Double altitude)
+ {
+ this.altitude = altitude;
+ }
+
+ public Double getAltitude()
+ {
+ return altitude;
+ }
+ public void setDeptId(String deptId)
+ {
+ this.deptId = deptId;
+ }
+
+ public String getDeptId()
+ {
+ return deptId;
+ }
+ public void setUserId(String userId)
+ {
+ this.userId = userId;
+ }
+
+ public String getUserId()
+ {
+ return userId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("cameraId", getCameraId())
+ .append("longitude", getLongitude())
+ .append("latitude", getLatitude())
+ .append("t", getT())
+ .append("altitude", getAltitude())
+ .append("deptId", getDeptId())
+ .append("userId", getUserId())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/device/terrain/mapper/ArdTerrainMarkMapper.java b/ard-work/src/main/java/com/ruoyi/device/terrain/mapper/ArdTerrainMarkMapper.java
new file mode 100644
index 0000000..5a36924
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/terrain/mapper/ArdTerrainMarkMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.device.terrain.mapper;
+
+import java.util.List;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+
+/**
+ * 鍦板舰鏍囧畾绠＄悊Mapper鎺ュ彛
+ *
+ * @author liusuyi
+ * @date 2024-06-22
+ */
+public interface ArdTerrainMarkMapper
+{
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 鍦板舰鏍囧畾绠＄悊
+ */
+ public ArdTerrainMark selectArdTerrainMarkById(String id);
+
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊鍒楄〃
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 鍦板舰鏍囧畾绠＄悊闆嗗悎
+ */
+ public List<ArdTerrainMark> selectArdTerrainMarkList(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 鏂板鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertArdTerrainMark(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 淇敼鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateArdTerrainMark(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 鍒犻櫎鍦板舰鏍囧畾绠＄悊
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdTerrainMarkById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTerrainMarkByIds(String[] ids);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/device/terrain/service/IArdTerrainMarkService.java b/ard-work/src/main/java/com/ruoyi/device/terrain/service/IArdTerrainMarkService.java
new file mode 100644
index 0000000..79a0cdc
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/terrain/service/IArdTerrainMarkService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.device.terrain.service;
+
+import java.util.List;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+
+/**
+ * 鍦板舰鏍囧畾绠＄悊Service鎺ュ彛
+ *
+ * @author liusuyi
+ * @date 2024-06-22
+ */
+public interface IArdTerrainMarkService
+{
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 鍦板舰鏍囧畾绠＄悊
+ */
+ public ArdTerrainMark selectArdTerrainMarkById(String id);
+
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊鍒楄〃
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 鍦板舰鏍囧畾绠＄悊闆嗗悎
+ */
+ public List<ArdTerrainMark> selectArdTerrainMarkList(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 鏂板鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ public int insertArdTerrainMark(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 淇敼鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ public int updateArdTerrainMark(ArdTerrainMark ardTerrainMark);
+
+ /**
+ * 鎵归噺鍒犻櫎鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍦板舰鏍囧畾绠＄悊涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTerrainMarkByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎鍦板舰鏍囧畾绠＄悊淇℃伅
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteArdTerrainMarkById(String id);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/device/terrain/service/impl/ArdTerrainMarkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/terrain/service/impl/ArdTerrainMarkServiceImpl.java
new file mode 100644
index 0000000..fc84300
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/device/terrain/service/impl/ArdTerrainMarkServiceImpl.java
@@ -0,0 +1,98 @@
+package com.ruoyi.device.terrain.service.impl;
+
+import java.util.List;
+ import com.ruoyi.common.utils.DateUtils;
+
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.device.terrain.mapper.ArdTerrainMarkMapper;
+import com.ruoyi.device.terrain.domain.ArdTerrainMark;
+import com.ruoyi.device.terrain.service.IArdTerrainMarkService;
+
+/**
+ * 鍦板舰鏍囧畾绠＄悊Service涓氬姟灞傚鐞�
+ *
+ * @author liusuyi
+ * @date 2024-06-22
+ */
+@Service
+public class ArdTerrainMarkServiceImpl implements IArdTerrainMarkService {
+ @Autowired
+ private ArdTerrainMarkMapper ardTerrainMarkMapper;
+
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 鍦板舰鏍囧畾绠＄悊
+ */
+ @Override
+ public ArdTerrainMark selectArdTerrainMarkById(String id) {
+ return ardTerrainMarkMapper.selectArdTerrainMarkById(id);
+ }
+
+ /**
+ * 鏌ヨ鍦板舰鏍囧畾绠＄悊鍒楄〃
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 鍦板舰鏍囧畾绠＄悊
+ */
+ @Override
+ public List<ArdTerrainMark> selectArdTerrainMarkList(ArdTerrainMark ardTerrainMark) {
+ return ardTerrainMarkMapper.selectArdTerrainMarkList(ardTerrainMark);
+ }
+
+ /**
+ * 鏂板鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdTerrainMark(ArdTerrainMark ardTerrainMark) {
+ ardTerrainMark.setId(IdUtils.simpleUUID());
+ ardTerrainMark.setUserId(SecurityUtils.getUserId());
+ ardTerrainMark.setCreateBy(SecurityUtils.getUsername());
+ ardTerrainMark.setCreateTime(DateUtils.getNowDate());
+ return ardTerrainMarkMapper.insertArdTerrainMark(ardTerrainMark);
+ }
+
+ /**
+ * 淇敼鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ardTerrainMark 鍦板舰鏍囧畾绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdTerrainMark(ArdTerrainMark ardTerrainMark) {
+ ardTerrainMark.setUpdateBy(SecurityUtils.getUsername());
+ ardTerrainMark.setUpdateTime(DateUtils.getNowDate());
+ return ardTerrainMarkMapper.updateArdTerrainMark(ardTerrainMark);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鍦板舰鏍囧畾绠＄悊
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTerrainMarkByIds(String[] ids) {
+ return ardTerrainMarkMapper.deleteArdTerrainMarkByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鍦板舰鏍囧畾绠＄悊淇℃伅
+ *
+ * @param id 鍦板舰鏍囧畾绠＄悊涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTerrainMarkById(String id) {
+ return ardTerrainMarkMapper.deleteArdTerrainMarkById(id);
+ }
+}
diff --git a/ard-work/src/main/resources/mapper/device/ArdTerrainMarkMapper.xml b/ard-work/src/main/resources/mapper/device/ArdTerrainMarkMapper.xml
new file mode 100644
index 0000000..da4e572
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/device/ArdTerrainMarkMapper.xml
@@ -0,0 +1,104 @@
+<?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="com.ruoyi.device.terrain.mapper.ArdTerrainMarkMapper">
+
+ <resultMap type="ArdTerrainMark" id="ArdTerrainMarkResult">
+ <result property="id" column="id" />
+ <result property="cameraId" column="camera_id" />
+ <result property="longitude" column="longitude" />
+ <result property="latitude" column="latitude" />
+ <result property="t" column="t" />
+ <result property="altitude" column="altitude" />
+ <result property="deptId" column="dept_id" />
+ <result property="userId" column="user_id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectArdTerrainMarkVo">
+ select id, camera_id, longitude, latitude, t, altitude, dept_id, user_id, create_by, create_time, update_by, update_time from ard_terrain_mark
+ </sql>
+
+ <select id="selectArdTerrainMarkList" parameterType="ArdTerrainMark" resultMap="ArdTerrainMarkResult">
+ <include refid="selectArdTerrainMarkVo"/>
+ <where>
+ <if test="cameraId != null and cameraId != ''"> and camera_id = #{cameraId}</if>
+ <if test="longitude != null "> and longitude = #{longitude}</if>
+ <if test="latitude != null "> and latitude = #{latitude}</if>
+ <if test="t != null "> and t = #{t}</if>
+ <if test="altitude != null "> and altitude = #{altitude}</if>
+ <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
+ <if test="userId != null and userId != ''"> and user_id = #{userId}</if>
+ </where>
+ </select>
+
+ <select id="selectArdTerrainMarkById" parameterType="String" resultMap="ArdTerrainMarkResult">
+ <include refid="selectArdTerrainMarkVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertArdTerrainMark" parameterType="ArdTerrainMark">
+ insert into ard_terrain_mark
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="cameraId != null">camera_id,</if>
+ <if test="longitude != null">longitude,</if>
+ <if test="latitude != null">latitude,</if>
+ <if test="t != null">t,</if>
+ <if test="altitude != null">altitude,</if>
+ <if test="deptId != null">dept_id,</if>
+ <if test="userId != null">user_id,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="cameraId != null">#{cameraId},</if>
+ <if test="longitude != null">#{longitude},</if>
+ <if test="latitude != null">#{latitude},</if>
+ <if test="t != null">#{t},</if>
+ <if test="altitude != null">#{altitude},</if>
+ <if test="deptId != null">#{deptId},</if>
+ <if test="userId != null">#{userId},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdTerrainMark" parameterType="ArdTerrainMark">
+ update ard_terrain_mark
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="cameraId != null">camera_id = #{cameraId},</if>
+ <if test="longitude != null">longitude = #{longitude},</if>
+ <if test="latitude != null">latitude = #{latitude},</if>
+ <if test="t != null">t = #{t},</if>
+ <if test="altitude != null">altitude = #{altitude},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="userId != null">user_id = #{userId},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteArdTerrainMarkById" parameterType="String">
+ delete from ard_terrain_mark where id = #{id}
+ </delete>
+
+ <delete id="deleteArdTerrainMarkByIds" parameterType="String">
+ delete from ard_terrain_mark where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index bf88988..193464d 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,90 +29,88 @@
/**
* ${functionName}Controller
- *
+ *
* @author ${author}
* @date ${datetime}
*/
+@Api(tags = "${functionName}")
@RestController
@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
@Autowired
private I${ClassName}Service ${className}Service;
- /**
- * 鏌ヨ${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @GetMapping("/list")
-#if($table.crud || $table.sub)
- public TableDataInfo list(${ClassName} ${className})
- {
+/**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
+@ApiOperation("鏌ヨ${functionName}鍒楄〃")
+@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+@GetMapping("/list")
+ #if($table.crud || $table.sub)
+ public TableDataInfo list(${ClassName} ${className}) {
startPage();
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return getDataTable(list);
}
-#elseif($table.tree)
- public AjaxResult list(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return success(list);
- }
-#end
+ #elseif($table.tree)
+ public AjaxResult list(${ClassName} ${className}) {
+ List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+ return success(list);
+ }
+ #end
/**
* 瀵煎嚭${functionName}鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
- @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+ @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ${ClassName} ${className})
- {
+ public void export(HttpServletResponse response, ${ClassName} ${className}) {
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+ ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
util.exportExcel(response, list, "${functionName}鏁版嵁");
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
@GetMapping(value = "/{${pkColumn.javaField}}")
- public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
- {
+ public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
}
/**
* 鏂板${functionName}
*/
+ @ApiOperation("鏂板${functionName}")
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
- @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+ @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ${ClassName} ${className})
- {
+ public AjaxResult add(@RequestBody ${ClassName} ${className}) {
return toAjax(${className}Service.insert${ClassName}(${className}));
}
/**
* 淇敼${functionName}
*/
+ @ApiOperation("淇敼${functionName}")
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
- @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+ @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ${ClassName} ${className})
- {
+ public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
return toAjax(${className}Service.update${ClassName}(${className}));
}
/**
* 鍒犻櫎${functionName}
*/
+ @ApiOperation("鍒犻櫎${functionName}")
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
- @Log(title = "${functionName}", businessType = BusinessType.DELETE)
- @DeleteMapping("/{${pkColumn.javaField}s}")
- public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
- {
+ @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{${pkColumn.javaField}s}")
+ public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
}
}
--
Gitblit v1.9.3