韩福成 hace 1 año
padre
commit
5c4115ce42

+ 5 - 5
data-ui/src/api/data/digitalforest/trees/trees.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询珍古树列表
+// 查询珍古树列表
 export function listTrees(query) {
   return request({
     url: '/sooka-sponest-center-data/trees/list',
@@ -9,7 +9,7 @@ export function listTrees(query) {
   })
 }
 
-// 查询珍古树详细
+// 查询珍古树详细
 export function getTrees(id) {
   return request({
     url: '/sooka-sponest-center-data/trees/' + id,
@@ -17,7 +17,7 @@ export function getTrees(id) {
   })
 }
 
-// 新增珍古树
+// 新增珍古树
 export function addTrees(data) {
   return request({
     url: '/sooka-sponest-center-data/trees',
@@ -26,7 +26,7 @@ export function addTrees(data) {
   })
 }
 
-// 修改珍古树
+// 修改珍古树
 export function updateTrees(data) {
   return request({
     url: '/sooka-sponest-center-data/trees',
@@ -35,7 +35,7 @@ export function updateTrees(data) {
   })
 }
 
-// 删除珍古树
+// 删除珍古树
 export function delTrees(id) {
   return request({
     url: '/sooka-sponest-center-data/trees/' + id,

+ 6 - 6
data-ui/src/views/data/digitalforest/trees/index.vue

@@ -118,7 +118,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改珍古树对话框 -->
+    <!-- 添加或修改珍古树对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
@@ -272,7 +272,7 @@
         showSearch: true,
         // 总条数
         total: 0,
-        // 珍古树表格数据
+        // 珍古树表格数据
         treesList: [],
         // 弹出层标题
         title: "",
@@ -410,7 +410,7 @@
           this.deptOptions = response.data;
         });
       },
-      /** 查询珍古树列表 */
+      /** 查询珍古树列表 */
       getList() {
         this.loading = true;
         listTrees(this.queryParams).then(response => {
@@ -468,7 +468,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = "添加珍古树";
+        this.title = "添加珍古树";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -477,7 +477,7 @@
         getTrees(id).then(response => {
           this.form = response.data;
           this.open = true;
-          this.title = "修改珍古树";
+          this.title = "修改珍古树";
         });
       },
       /** 提交按钮 */
@@ -515,7 +515,7 @@
       handleExport() {
         this.download('sooka-sponest-center-data/trees/export', {
           ...this.queryParams
-        }, `珍古树_${new Date().getTime()}.xlsx`)
+        }, `珍古树_${new Date().getTime()}.xlsx`)
       }
     }
   };

+ 26 - 26
src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestTreesController.java

@@ -25,12 +25,12 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * 珍古树Controller
+ * 珍古树Controller
  *
  * @author ruoyi
  * @date 2022-05-04
  */
-@Api(tags = "数据中心林业珍古树控制器")
+@Api(tags = "数据中心林业珍古树控制器")
 @RestController
 @RequestMapping("/trees")
 public class CenterdataTForestTreesController extends BaseController {
@@ -39,10 +39,10 @@ public class CenterdataTForestTreesController extends BaseController {
     private ICenterdataTForestTreesService centerdataTForestTreesService;
 
     /**
-     * 查询珍古树列表
-     * 查询珍古树列表调用
+     * 查询珍古树列表
+     * 查询珍古树列表调用
      */
-    @ApiOperation(value = "数据中心查询珍惜古树列表", notes = "数据中心查询珍惜古树列表")
+    @ApiOperation(value = "数据中心查询珍稀古树列表", notes = "数据中心查询珍稀古树列表")
     @RequiresPermissions("forest:trees:list")
     @GetMapping("/list")
     @ApiImplicitParam(name = "treesName", value = "名称", dataType = "String", paramType = "query")
@@ -52,7 +52,7 @@ public class CenterdataTForestTreesController extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiOperation(value = "手机端查询珍惜古树列表", notes = "手机端查询珍惜古树列表")
+    @ApiOperation(value = "手机端查询珍稀古树列表", notes = "手机端查询珍稀古树列表")
     @PostMapping("/remoteList")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "treesName", value = "名称", dataType = "String", paramType = "body"),
@@ -65,26 +65,26 @@ public class CenterdataTForestTreesController extends BaseController {
     }
 
     /**
-     * 导出珍古树列表
-     * 数据中心珍古树列表导出调用
+     * 导出珍古树列表
+     * 数据中心珍古树列表导出调用
      */
-    @ApiOperation(value = "数据中心珍惜古树列表导出", notes = "数据中心珍惜古树列表导出")
+    @ApiOperation(value = "数据中心珍稀古树列表导出", notes = "数据中心珍稀古树列表导出")
     @RequiresPermissions("forest:trees:export")
-    @Log(title = "珍古树", businessType = BusinessType.EXPORT)
+    @Log(title = "珍古树", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiImplicitParam(name = "treesName", value = "名称", dataType = "String", paramType = "query")
     public void export(HttpServletResponse response, @ApiIgnore CenterdataTForestTrees centerdataTForestTrees) {
         List<CenterdataTForestTrees> list = centerdataTForestTreesService.selectCenterdataTForestTreesList(centerdataTForestTrees);
         ExcelUtil<CenterdataTForestTrees> util = new ExcelUtil<>(CenterdataTForestTrees.class);
-        util.exportExcel(response, list, "珍古树数据");
+        util.exportExcel(response, list, "珍古树数据");
     }
 
     /**
-     * 获取珍古树详细信息
-     * 数据中心珍古树详情调用
+     * 获取珍古树详细信息
+     * 数据中心珍古树详情调用
      */
     @ApiImplicitParam(name = "id", value = "主键id", required = true, dataType = "String", paramType = "path")
-    @ApiOperation(value = "数据中心获取珍惜古树详细信息", notes = "数据中心获取珍惜古树详细信息")
+    @ApiOperation(value = "数据中心获取珍稀古树详细信息", notes = "数据中心获取珍稀古树详细信息")
     @RequiresPermissions("forest:trees:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
@@ -92,12 +92,12 @@ public class CenterdataTForestTreesController extends BaseController {
     }
 
     /**
-     * 新增珍古树
-     * 数据中心珍古树新增调用
+     * 新增珍古树
+     * 数据中心珍古树新增调用
      */
-    @ApiOperation(value = "数据中心新增珍惜古树", notes = "数据中心新增珍惜古树")
+    @ApiOperation(value = "数据中心新增珍稀古树", notes = "数据中心新增珍稀古树")
     @RequiresPermissions("forest:trees:add")
-    @Log(title = "珍古树", businessType = BusinessType.INSERT)
+    @Log(title = "珍古树", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTForestTrees centerdataTForestTrees) {
         String tableName = "centerdata_t_forest_trees";
@@ -111,8 +111,8 @@ public class CenterdataTForestTreesController extends BaseController {
     }
 
     /**
-     * 修改珍古树
-     * 数据中心珍古树修改调用
+     * 修改珍古树
+     * 数据中心珍古树修改调用
      */
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键id", dataType = "String", paramType = "body", required = true),
@@ -124,9 +124,9 @@ public class CenterdataTForestTreesController extends BaseController {
             @ApiImplicitParam(name = "latitude", value = "纬度", dataType = "String", paramType = "body", required = true),
             @ApiImplicitParam(name = "deptId", value = "部门ID", dataType = "Long", paramType = "body", required = true)
     })
-    @ApiOperation(value = "数据中心修改珍惜古树", notes = "数据中心修改珍惜古树")
+    @ApiOperation(value = "数据中心修改珍稀古树", notes = "数据中心修改珍稀古树")
     @RequiresPermissions("forest:trees:edit")
-    @Log(title = "珍古树", businessType = BusinessType.UPDATE)
+    @Log(title = "珍古树", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@ApiIgnore @Validated @RequestBody CenterdataTForestTrees centerdataTForestTrees) {
         String tableName = "centerdata_t_forest_trees";
@@ -140,13 +140,13 @@ public class CenterdataTForestTreesController extends BaseController {
     }
 
     /**
-     * 删除珍古树
-     * 数据中心珍古树删除调用
+     * 删除珍古树
+     * 数据中心珍古树删除调用
      */
     @ApiImplicitParam(name = "ids", value = "主键id数组", required = true, dataType = "String[]", paramType = "path")
-    @ApiOperation(value = "数据中心删除珍惜古树", notes = "数据中心删除珍惜古树")
+    @ApiOperation(value = "数据中心删除珍稀古树", notes = "数据中心删除珍稀古树")
     @RequiresPermissions("forest:trees:remove")
-    @Log(title = "珍古树", businessType = BusinessType.DELETE)
+    @Log(title = "珍古树", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
         int result = centerdataTForestTreesService.deleteCenterdataTForestTreesByIds(ids);

+ 2 - 2
src/main/java/com/sooka/sponest/data/digitalforest/domain/CenterdataTForestTrees.java

@@ -10,12 +10,12 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * 珍古树对象 centerdata_t_forest_trees
+ * 珍古树对象 centerdata_t_forest_trees
  *
  * @author ruoyi
  * @date 2022-05-04
  */
-@ApiModel(description = "数据中心珍古树实体类对象")
+@ApiModel(description = "数据中心珍古树实体类对象")
 @Data
 public class CenterdataTForestTrees extends BaseBusinessEntity {
 

+ 1 - 1
src/main/java/com/sooka/sponest/data/digitalforest/domain/bo/CenterdataTForestTreesTJ.java

@@ -4,7 +4,7 @@ import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 
 /**
- * 珍古树对象 centerdata_t_forest_trees
+ * 珍古树对象 centerdata_t_forest_trees
  *
  * @author ruoyi
  * @date 2022-05-04

+ 12 - 12
src/main/java/com/sooka/sponest/data/digitalforest/mapper/CenterdataTForestTreesMapper.java

@@ -7,7 +7,7 @@ import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO
 import java.util.List;
 
 /**
- * 珍古树Mapper接口
+ * 珍古树Mapper接口
  *
  * @author ruoyi
  * @date 2022-05-04
@@ -15,39 +15,39 @@ import java.util.List;
 public interface CenterdataTForestTreesMapper {
 
     /**
-     * 查询珍古树列表
+     * 查询珍古树列表
      *
-     * @param centerdataTForestTrees 珍古树
-     * @return 珍古树集合
+     * @param centerdataTForestTrees 珍古树
+     * @return 珍古树集合
      */
     List<CenterdataTForestTrees> selectCenterdataTForestTreesList(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 查询珍古树
+     * 查询珍古树
      *
-     * @param id 珍古树主键
-     * @return 珍古树
+     * @param id 珍古树主键
+     * @return 珍古树
      */
     CenterdataTForestTrees selectCenterdataTForestTreesById(String id);
 
     /**
-     * 新增珍古树
+     * 新增珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     int insertCenterdataTForestTrees(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 修改珍古树
+     * 修改珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     int updateCenterdataTForestTrees(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 批量删除珍古树
+     * 批量删除珍古树
      *
      * @param ids 需要删除的数据主键集合
      * @return 结果

+ 13 - 13
src/main/java/com/sooka/sponest/data/digitalforest/service/ICenterdataTForestTreesService.java

@@ -8,7 +8,7 @@ import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO
 import java.util.List;
 
 /**
- * 珍古树Service接口
+ * 珍古树Service接口
  *
  * @author ruoyi
  * @date 2022-05-04
@@ -16,41 +16,41 @@ import java.util.List;
 public interface ICenterdataTForestTreesService extends IBaseService {
 
     /**
-     * 查询珍古树列表
+     * 查询珍古树列表
      *
-     * @param centerdataTForestTrees 珍古树
-     * @return 珍古树集合
+     * @param centerdataTForestTrees 珍古树
+     * @return 珍古树集合
      */
     List<CenterdataTForestTrees> selectCenterdataTForestTreesList(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 查询珍古树
+     * 查询珍古树
      *
-     * @param id 珍古树主键
-     * @return 珍古树
+     * @param id 珍古树主键
+     * @return 珍古树
      */
     CenterdataTForestTrees selectCenterdataTForestTreesById(String id);
 
     /**
-     * 新增珍古树
+     * 新增珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     int insertCenterdataTForestTrees(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 修改珍古树
+     * 修改珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     int updateCenterdataTForestTrees(CenterdataTForestTrees centerdataTForestTrees);
 
     /**
-     * 批量删除珍古树
+     * 批量删除珍古树
      *
-     * @param ids 需要删除的珍古树主键集合
+     * @param ids 需要删除的珍古树主键集合
      * @return 结果
      */
     int deleteCenterdataTForestTreesByIds(String[] ids);

+ 13 - 13
src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTForestTreesServiceImpl.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * 珍古树Service业务层处理
+ * 珍古树Service业务层处理
  *
  * @author ruoyi
  * @date 2022-05-04
@@ -28,10 +28,10 @@ public class CenterdataTForestTreesServiceImpl extends BaseServiceImpl implement
     private CenterdataTForestTreesMapper centerdataTForestTreesMapper;
 
     /**
-     * 查询珍古树列表
+     * 查询珍古树列表
      *
-     * @param centerdataTForestTrees 珍古树
-     * @return 珍古树
+     * @param centerdataTForestTrees 珍古树
+     * @return 珍古树
      */
     @DataScopeMutiDept(deptAlias = "d")
     @Override
@@ -41,10 +41,10 @@ public class CenterdataTForestTreesServiceImpl extends BaseServiceImpl implement
     }
 
     /**
-     * 查询珍古树
+     * 查询珍古树
      *
-     * @param id 珍古树主键
-     * @return 珍古树
+     * @param id 珍古树主键
+     * @return 珍古树
      */
     @Override
     public CenterdataTForestTrees selectCenterdataTForestTreesById(String id) {
@@ -52,9 +52,9 @@ public class CenterdataTForestTreesServiceImpl extends BaseServiceImpl implement
     }
 
     /**
-     * 新增珍古树
+     * 新增珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     @Override
@@ -67,9 +67,9 @@ public class CenterdataTForestTreesServiceImpl extends BaseServiceImpl implement
     }
 
     /**
-     * 修改珍古树
+     * 修改珍古树
      *
-     * @param centerdataTForestTrees 珍古树
+     * @param centerdataTForestTrees 珍古树
      * @return 结果
      */
     @Override
@@ -81,9 +81,9 @@ public class CenterdataTForestTreesServiceImpl extends BaseServiceImpl implement
     }
 
     /**
-     * 批量删除珍古树
+     * 批量删除珍古树
      *
-     * @param ids 需要删除的珍古树主键
+     * @param ids 需要删除的珍古树主键
      * @return 结果
      */
     @Override

+ 1 - 1
src/main/resources/mapper/appbigdata/AppBigData.xml

@@ -29,7 +29,7 @@
         left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
         union all
-        select '珍古树' name,count(*) value,'centerdata_t_forest_trees' code from centerdata_t_forest_trees a
+        select '珍古树' name,count(*) value,'centerdata_t_forest_trees' code from centerdata_t_forest_trees a
         left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
         union all

+ 1 - 1
src/main/resources/mapper/digitalforest/ForestBigDataMapper.xml

@@ -60,7 +60,7 @@
             left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
         union all
-        select '珍古树' name,count(*) value from centerdata_t_forest_trees a
+        select '珍古树' name,count(*) value from centerdata_t_forest_trees a
             left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
         union all

+ 1 - 1
src/main/resources/mapper/index/IndexViewMapper.xml

@@ -208,7 +208,7 @@
         union all
         select '森林防火队' name ,count(*)  value from centerdata_t_forest_fireteam a
         union all
-        select '珍古树' name ,count(*)  value from centerdata_t_forest_trees a
+        select '珍古树' name ,count(*)  value from centerdata_t_forest_trees a
     </select>
 
     <select id="getAgriculture" resultType="java.util.Map">