From ee09a54de9dada5461e3df972df5cdb1cdd6bd16 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 15 五月 2024 17:33:29 +0800
Subject: [PATCH] 提交代码
---
javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml | 10
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml | 150 ++-----
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html | 86 ++-
javaweb-plus/javaweb-admin/src/main/resources/application.yml | 2
javaweb-plus/javaweb-admin/src/main/resources/templates/index.html | 4
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html | 117 ++---
/dev/null | 33 -
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java | 12
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java | 30 -
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java | 5
javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html | 6
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java | 144 ------
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java | 429 ---------------------
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java | 15
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java | 48 ++
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 71 --
16 files changed, 230 insertions(+), 932 deletions(-)
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml b/javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml
index 365717f..9c1e3e8 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml
+++ b/javaweb-plus/javaweb-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- #url: jdbc:mysql://localhost:3306/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- #username: root
- #password: 123456
- url: jdbc:mysql://117.78.1.188:8979/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/chenjiang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 0a6a0fca362f482bb42950be47237946Aa@
+ password: 123456
+# url: jdbc:mysql://117.78.1.188:8979/jianguan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: root
+# password: 0a6a0fca362f482bb42950be47237946Aa@
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/application.yml b/javaweb-plus/javaweb-admin/src/main/resources/application.yml
index 492ac57..5ff8137 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/application.yml
+++ b/javaweb-plus/javaweb-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2022
# 瀹炰緥婕旂ず寮�鍏�
- demoEnabled: false
+ demoEnabled: true
# 鏂囦欢璺緞 绀轰緥
profile: D:\dkyWeb\uploads
# 鑾峰彇ip鍦板潃寮�鍏�
diff --git a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
index 296656f..6fbea05 100644
--- a/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
+++ b/javaweb-plus/javaweb-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>鍕樺療淇℃伅鍖栨湇鍔″钩鍙�</title>
+ <title>閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</title>
<!--[if lt IE 9]>
<meta http-equiv="refresh" content="0;ie.html"/>
<![endif]-->
@@ -29,7 +29,7 @@
<ul class="nav" id="side-menu">
<a th:href="@{/index}">
<li class="logo">
- <span class="logo-lg" >鐩戠骞冲彴</span>
+ <span class="logo-lg" >閽绘帰宸ョ▼骞冲彴</span>
</li>
</a>
<li>
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CollectStatisticsController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CollectStatisticsController.java
deleted file mode 100644
index 9a61007..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CollectStatisticsController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.CollectStatistics;
-import com.javaweb.geo.service.ICollectStatisticsService;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 缁熻姹囨�籆ontroller
- *
- * @author cxy
- * @date 2022-12-26
- */
-@Controller
-@RequestMapping("/geo/statistics")
-public class CollectStatisticsController extends BaseController
-{
- private String prefix = "geo/statistics";
-
- @Autowired
- private ICollectStatisticsService collectStatisticsService;
-
- @RequiresPermissions("geo:statistics:view")
- @GetMapping()
- public String statistics()
- {
- return prefix + "/statistics";
- }
-
- /**
- * 鏌ヨ缁熻姹囨�诲垪琛�
- */
- @RequiresPermissions("geo:statistics:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(CollectStatistics collectStatistics)
- {
- startPage();
- List<CollectStatistics> list = collectStatisticsService.selectCollectStatisticsList(collectStatistics);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭缁熻姹囨�诲垪琛�
- */
- @RequiresPermissions("geo:statistics:export")
- @Log(title = "缁熻姹囨��", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(CollectStatistics collectStatistics)
- {
- List<CollectStatistics> list = collectStatisticsService.selectCollectStatisticsList(collectStatistics);
- ExcelUtil<CollectStatistics> util = new ExcelUtil<CollectStatistics>(CollectStatistics.class);
- return util.exportExcel(list, "statistics");
- }
-
- /**
- * 鏂板缁熻姹囨��
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨缁熻姹囨��
- */
- @RequiresPermissions("geo:statistics:add")
- @Log(title = "缁熻姹囨��", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(CollectStatistics collectStatistics)
- {
- return toAjax(collectStatisticsService.insertCollectStatistics(collectStatistics));
- }
-
- /**
- * 淇敼缁熻姹囨��
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
- CollectStatistics collectStatistics = collectStatisticsService.selectCollectStatisticsById(ids);
- mmap.put("collectStatistics", collectStatistics);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨缁熻姹囨��
- */
- @RequiresPermissions("geo:statistics:edit")
- @Log(title = "缁熻姹囨��", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(CollectStatistics collectStatistics)
- {
- return toAjax(collectStatisticsService.updateCollectStatistics(collectStatistics));
- }
-
- /**
- * 鍒犻櫎缁熻姹囨��
- */
- @RequiresPermissions("geo:statistics:remove")
- @Log(title = "缁熻姹囨��", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(collectStatisticsService.deleteCollectStatisticsByIds(ids));
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyController.java
deleted file mode 100644
index d5f335f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyController.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.Company;
-import com.javaweb.geo.service.ICompanyService;
-import com.javaweb.geotdp.enums.CityConst;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 鍕樺療鍗曚綅Controller
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Controller
-@RequestMapping("/geo/company")
-public class CompanyController extends BaseController
-{
- private String prefix = "geo/company";
-
- @Autowired
- private ICompanyService companyService;
-
- @RequiresPermissions("geo:company:view")
- @GetMapping()
- public String company()
- {
- return prefix + "/company";
- }
-
- /**
- * 鏌ヨ鍕樺療鍗曚綅鍒楄〃
- */
- @RequiresPermissions("geo:company:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(Company company)
- {
- startPage();
- List<Company> list = companyService.selectCompanyList(company);
- for(Company c : list){
- c.setDistrictName(CityConst.getCitName(c.getDistrict()));
- }
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鍕樺療鍗曚綅鍒楄〃
- */
- @RequiresPermissions("geo:company:export")
- @Log(title = "鍕樺療鍗曚綅", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(Company company)
- {
- List<Company> list = companyService.selectCompanyList(company);
- ExcelUtil<Company> util = new ExcelUtil<Company>(Company.class);
- return util.exportExcel(list, "company");
- }
-
- /**
- * 鏂板鍕樺療鍗曚綅
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨鍕樺療鍗曚綅
- */
- @RequiresPermissions("geo:company:add")
- @Log(title = "鍕樺療鍗曚綅", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(Company company)
- {
- return toAjax(companyService.insertCompany(company));
- }
-
- /**
- * 淇敼鍕樺療鍗曚綅
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
- Company company = companyService.selectCompanyById(ids);
- mmap.put("company", company);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨鍕樺療鍗曚綅
- */
- @RequiresPermissions("geo:company:edit")
- @Log(title = "鍕樺療鍗曚綅", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(Company company)
- {
- return toAjax(companyService.updateCompany(company));
- }
-
- /**
- * 鍒犻櫎鍕樺療鍗曚綅
- */
- @RequiresPermissions("geo:company:remove")
- @Log(title = "鍕樺療鍗曚綅", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(companyService.deleteCompanyByIds(ids));
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyUserController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyUserController.java
deleted file mode 100644
index 224cabc..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/CompanyUserController.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.CompanyUser;
-import com.javaweb.geo.mapper.CompanyUserMapper;
-import com.javaweb.geo.service.ICompanyUserService;
-import com.javaweb.system.domain.SysUser;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 浼佷笟-浜哄憳Controller
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Controller
-@RequestMapping("/geo/user")
-public class CompanyUserController extends BaseController
-{
- private String prefix = "geo/user";
-
- @Autowired
- private ICompanyUserService companyUserService;
-
-
- @Autowired
- private CompanyUserMapper companyUserMapper;
-
- @RequiresPermissions("geo:user:view")
- @GetMapping()
- public String user()
- {
- return prefix + "/user";
- }
-
- /**
- * 鏌ヨ浼佷笟-浜哄憳鍒楄〃
- */
- @RequiresPermissions("geo:user:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(CompanyUser companyUser)
- {
- startPage();
- List<CompanyUser> list = companyUserService.selectCompanyUserList(companyUser);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭浼佷笟-浜哄憳鍒楄〃
- */
- @RequiresPermissions("geo:user:export")
- @Log(title = "浼佷笟-浜哄憳", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(CompanyUser companyUser)
- {
- List<CompanyUser> list = companyUserService.selectCompanyUserList(companyUser);
- ExcelUtil<CompanyUser> util = new ExcelUtil<CompanyUser>(CompanyUser.class);
- return util.exportExcel(list, "user");
- }
-
- /**
- * 鏂板浼佷笟-浜哄憳
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨浼佷笟-浜哄憳
- */
- @RequiresPermissions("geo:user:add")
- @Log(title = "浼佷笟-浜哄憳", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(CompanyUser companyUser)
- {
- return toAjax(companyUserService.insertCompanyUser(companyUser));
- }
-
- /**
- * 淇敼浼佷笟-浜哄憳
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
- CompanyUser companyUser = companyUserService.selectCompanyUserById(ids);
- mmap.put("companyUser", companyUser);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨浼佷笟-浜哄憳
- */
- @RequiresPermissions("geo:user:edit")
- @Log(title = "浼佷笟-浜哄憳", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(CompanyUser companyUser)
- {
- return toAjax(companyUserService.updateCompanyUser(companyUser));
- }
-
- /**
- * 鍒犻櫎浼佷笟-浜哄憳
- */
- @RequiresPermissions("geo:user:remove")
- @Log(title = "浼佷笟-浜哄憳", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(companyUserService.deleteCompanyUserByIds(ids));
- }
-
- /**
- * 鏇存柊鐘舵��
- * @param companyUser
- * @return
- */
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/changeStatus")
- @ResponseBody
- public AjaxResult changeStatus(CompanyUser companyUser)
- {
-
- return toAjax(companyUserMapper.changeStatus(companyUser));
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DataSourceController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DataSourceController.java
deleted file mode 100644
index dc77ea3..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DataSourceController.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.DataSource;
-import com.javaweb.geo.service.IDataSourceService;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 鏁版嵁鏉ユ簮Controller
- *
- * @author cxy
- * @date 2022-12-30
- */
-@Controller
-@RequestMapping("/geo/source")
-public class DataSourceController extends BaseController
-{
- private String prefix = "geo/source";
-
- @Autowired
- private IDataSourceService dataSourceService;
-
- @RequiresPermissions("geo:source:view")
- @GetMapping()
- public String source()
- {
- return prefix + "/source";
- }
-
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮鍒楄〃
- */
- @RequiresPermissions("geo:source:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(DataSource dataSource)
- {
- startPage();
- List<DataSource> list = dataSourceService.selectDataSourceList(dataSource);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鏁版嵁鏉ユ簮鍒楄〃
- */
- @RequiresPermissions("geo:source:export")
- @Log(title = "鏁版嵁鏉ユ簮", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(DataSource dataSource)
- {
- List<DataSource> list = dataSourceService.selectDataSourceList(dataSource);
- ExcelUtil<DataSource> util = new ExcelUtil<DataSource>(DataSource.class);
- return util.exportExcel(list, "source");
- }
-
- /**
- * 鏂板鏁版嵁鏉ユ簮
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨鏁版嵁鏉ユ簮
- */
- @RequiresPermissions("geo:source:add")
- @Log(title = "鏁版嵁鏉ユ簮", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(DataSource dataSource)
- {
- return toAjax(dataSourceService.insertDataSource(dataSource));
- }
-
- /**
- * 淇敼鏁版嵁鏉ユ簮
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
- DataSource dataSource = dataSourceService.selectDataSourceById(ids);
- mmap.put("dataSource", dataSource);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨鏁版嵁鏉ユ簮
- */
- @RequiresPermissions("geo:source:edit")
- @Log(title = "鏁版嵁鏉ユ簮", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(DataSource dataSource)
- {
- return toAjax(dataSourceService.updateDataSource(dataSource));
- }
-
- /**
- * 鍒犻櫎鏁版嵁鏉ユ簮
- */
- @RequiresPermissions("geo:source:remove")
- @Log(title = "鏁版嵁鏉ユ簮", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(dataSourceService.deleteDataSourceByIds(ids));
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionConfigController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionConfigController.java
deleted file mode 100644
index 7787916..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionConfigController.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-
-import com.javaweb.geotdp.domain.ResponseResult;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.ExceptionConfig;
-import com.javaweb.geo.service.IExceptionConfigService;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 寮傚父閰嶇疆Controller
- *
- * @author cxy
- * @date 2022-11-14
- */
-@Controller
-@RequestMapping("/geo/config")
-public class ExceptionConfigController extends BaseController
-{
- private String prefix = "geo/config";
-
- @Autowired
- private IExceptionConfigService exceptionConfigService;
-
- @RequiresPermissions("geo:config:view")
- @GetMapping()
- public String config()
- {
- return prefix + "/config";
- }
-
- /**
- * 鏌ヨ寮傚父閰嶇疆鍒楄〃
- */
- @RequiresPermissions("geo:config:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(ExceptionConfig exceptionConfig)
- {
- startPage();
- List<ExceptionConfig> list = exceptionConfigService.selectExceptionConfigList(exceptionConfig);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭寮傚父閰嶇疆鍒楄〃
- */
- @RequiresPermissions("geo:config:export")
- @Log(title = "寮傚父閰嶇疆", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(ExceptionConfig exceptionConfig)
- {
- List<ExceptionConfig> list = exceptionConfigService.selectExceptionConfigList(exceptionConfig);
- ExcelUtil<ExceptionConfig> util = new ExcelUtil<ExceptionConfig>(ExceptionConfig.class);
- return util.exportExcel(list, "config");
- }
-
- /**
- * 鏂板寮傚父閰嶇疆
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨寮傚父閰嶇疆
- */
- @RequiresPermissions("geo:config:add")
- @Log(title = "寮傚父閰嶇疆", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(ExceptionConfig exceptionConfig)
- {
- return exceptionConfigService.insertExceptionConfig(exceptionConfig);
- }
-
- /**
- * 淇敼寮傚父閰嶇疆
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") Long ids, ModelMap mmap)
- {
- ExceptionConfig exceptionConfig = exceptionConfigService.selectExceptionConfigById(ids);
- mmap.put("exceptionConfig", exceptionConfig);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨寮傚父閰嶇疆
- */
- @RequiresPermissions("geo:config:edit")
- @Log(title = "寮傚父閰嶇疆", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(ExceptionConfig exceptionConfig)
- {
- return toAjax(exceptionConfigService.updateExceptionConfig(exceptionConfig));
- }
-
- /**
- * 鍒犻櫎寮傚父閰嶇疆
- */
- @RequiresPermissions("geo:config:remove")
- @Log(title = "寮傚父閰嶇疆", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(exceptionConfigService.deleteExceptionConfigByIds(ids));
- }
-
- /**
- * 鏌ヨ寮傚父閰嶇疆
- */
- @GetMapping( "/configInfo")
- @ResponseBody
- public ResponseResult configInfo()
- {
- return exceptionConfigService.configInfo();
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionController.java
deleted file mode 100644
index f2dbd21..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ExceptionController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.javaweb.geo.domain.HandleException;
-import com.javaweb.geo.domain.HandleOpinion;
-import com.javaweb.geo.service.IHandleExceptionService;
-import com.javaweb.geo.vo.ExceptionDistanceVo;
-import com.javaweb.geo.vo.ExceptionTimeVo;
-import com.javaweb.geotdp.domain.ResponseResult;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 寮傚父Controller
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Controller
-@RequestMapping("/geo/exception")
-public class ExceptionController extends BaseController {
-
- @Autowired
- private IHandleExceptionService handleExceptionService;
-
- private String prefix = "geo/exception";
-
- @GetMapping(value = "/config")
- public String config() {
- return prefix + "/config";
- }
-
- @RequiresPermissions("geo:exception:view")
- @GetMapping()
- public String exception() {
- return prefix + "/exception";
- }
-
- /**
- * 鏃堕棿寮傚父璇︽儏
- */
- @GetMapping("/time")
- public String timeDetail(@RequestParam("holeId") String holeId, ModelMap mmap) {
- mmap.put("holeId", holeId);
-
- HandleException exception = new HandleException();
- exception.setHoleId(holeId);
- exception.setType("2");
- List<HandleException> list = handleExceptionService.selectHandleExceptionList(exception);
- if(ObjectUtil.isNotEmpty(list)){
- mmap.put("detail", list.get(0));
- }
- return prefix + "/time_detail";
- }
-
- /**
- * 璺濈寮傚父璇︽儏
- */
- @GetMapping("/distance")
- public String distanceDetail(@RequestParam("holeId") String holeId, ModelMap mmap) {
- mmap.put("holeId", holeId);
-
- HandleException exception = new HandleException();
- exception.setHoleId(holeId);
- exception.setType("1");
- List<HandleException> list = handleExceptionService.selectHandleExceptionList(exception);
- if(ObjectUtil.isNotEmpty(list)){
- mmap.put("detail", list.get(0));
- }
- return prefix + "/distance_detail";
- }
-
- /**
- * 寮傚父澶勭悊鎰忚璇︽儏
- */
- @GetMapping("/opinion")
- public String opinionDetail(@RequestParam("exceptionId") String exceptionId, ModelMap mmap) {
- mmap.put("exceptionId", exceptionId);
- return prefix + "/opinion_detail";
- }
-
-
- /**
- * 鏌ヨ寮傚父澶勭悊鍒楄〃
- */
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(HandleException handleException) {
- startPage();
- List<HandleException> list = handleExceptionService.selectHandleExceptionList(handleException);
- return getDataTable(list);
- }
-
- /**
- * 鍒犻櫎寮傚父澶勭悊
- */
- @Log(title = "寮傚父澶勭悊", businessType = BusinessType.DELETE)
- @PostMapping("/remove")
- @ResponseBody
- public AjaxResult remove(String ids) {
- return toAjax(handleExceptionService.deleteHandleExceptionByIds(ids));
- }
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯�(鏃堕棿寮傚父)
- */
- @PostMapping("/holeTimeDetails/{holeId}")
- @ResponseBody
- public TableDataInfo holeTimeDetails(@PathVariable("holeId") String holeId) {
- // startPage();
- List<ExceptionTimeVo> list = handleExceptionService.holeTimeDetails(holeId);
- return getDataTable(list);
- }
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯�(浣嶇疆寮傚父)
- */
- @PostMapping("/holeDistanceDetails/{holeId}")
- @ResponseBody
- public TableDataInfo holeDistanceDetails(@PathVariable("holeId") String holeId) {
- // startPage();
- List<ExceptionDistanceVo> list = handleExceptionService.holeDistanceDetails(holeId);
- return getDataTable(list);
- }
-
-
- /**
- * 寮傚父澶勭悊鎰忚璇︽儏
- */
- @PostMapping("/handleOpinionDetails/{exceptionId}")
- @ResponseBody
- public TableDataInfo handleOpinionDetails(@PathVariable("exceptionId") String exceptionId) {
- // startPage();
- List<HandleOpinion> list = handleExceptionService.handleOpinionDetails(exceptionId);
- return getDataTable(list);
- }
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/LaborUnitController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/LaborUnitController.java
deleted file mode 100644
index 3502114..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/LaborUnitController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.util.List;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.LaborUnit;
-import com.javaweb.geo.service.ILaborUnitService;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.IdGenerate;
-import com.javaweb.common.utils.StringUtils;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-/**
- * 鍔冲姟鍗曚綅Controller
- *
- * @author zmk
- * @date 2022-10-20
- */
-@Controller
-@RequestMapping("/geo/unit")
-public class LaborUnitController extends BaseController
-{
- private String prefix = "geo/unit";
-
- @Autowired
- private ILaborUnitService laborUnitService;
-
- @RequiresPermissions("geo:unit:view")
- @GetMapping()
- public String unit()
- {
- return prefix + "/unit";
- }
-
- /**
- * 鏌ヨ鍔冲姟鍗曚綅鍒楄〃
- */
- @RequiresPermissions("geo:unit:list")
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo list(LaborUnit laborUnit)
- {
- startPage();
- List<LaborUnit> list = laborUnitService.selectLaborUnitList(laborUnit);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭鍔冲姟鍗曚綅鍒楄〃
- */
- @RequiresPermissions("geo:unit:export")
- @Log(title = "鍔冲姟鍗曚綅", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- @ResponseBody
- public AjaxResult export(LaborUnit laborUnit)
- {
- List<LaborUnit> list = laborUnitService.selectLaborUnitList(laborUnit);
- ExcelUtil<LaborUnit> util = new ExcelUtil<LaborUnit>(LaborUnit.class);
- return util.exportExcel(list, "unit");
- }
-
- /**
- * 鏂板鍔冲姟鍗曚綅
- */
- @GetMapping("/add")
- public String add()
- {
- return prefix + "/add";
- }
-
- /**
- * 鏂板淇濆瓨鍔冲姟鍗曚綅
- */
- @RequiresPermissions("geo:unit:add")
- @Log(title = "鍔冲姟鍗曚綅", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(LaborUnit laborUnit)
- {
- if(StringUtils.isEmpty(laborUnit.getIds())){
- laborUnit.setIds(IdGenerate.nextId());
- }
- return toAjax(laborUnitService.insertLaborUnit(laborUnit));
- }
-
- /**
- * 淇敼鍔冲姟鍗曚綅
- */
- @GetMapping("/edit/{ids}")
- public String edit(@PathVariable("ids") String ids, ModelMap mmap)
- {
- LaborUnit laborUnit = laborUnitService.selectLaborUnitById(ids);
- mmap.put("laborUnit", laborUnit);
- return prefix + "/edit";
- }
-
- /**
- * 淇敼淇濆瓨鍔冲姟鍗曚綅
- */
- @RequiresPermissions("geo:unit:edit")
- @Log(title = "鍔冲姟鍗曚綅", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(LaborUnit laborUnit)
- {
- return toAjax(laborUnitService.updateLaborUnit(laborUnit));
- }
-
- /**
- * 鍒犻櫎鍔冲姟鍗曚綅
- */
- @RequiresPermissions("geo:unit:remove")
- @Log(title = "鍔冲姟鍗曚綅", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(laborUnitService.deleteLaborUnitByIds(ids));
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
index 31a54a2..cb5c728 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
@@ -4,7 +4,6 @@
import com.javaweb.geo.domain.CompanyUser;
import com.javaweb.geo.mapper.HoleMapper;
-import com.javaweb.geo.vo.ExceptionProjectVo;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -20,8 +19,6 @@
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.Company;
import com.javaweb.geo.domain.Project;
-import com.javaweb.geo.mapper.CompanyMapper;
-import com.javaweb.geo.mapper.CompanyUserMapper;
import com.javaweb.geo.service.IProjectService;
import com.javaweb.common.core.controller.BaseController;
import com.javaweb.common.core.domain.AjaxResult;
@@ -42,12 +39,6 @@
@Autowired
private IProjectService projectService;
-
- @Autowired
- private CompanyMapper companyMapper;
-
- @Autowired
- private CompanyUserMapper companyUserMapper;
@Autowired
private HoleMapper holeMapper;
@@ -118,15 +109,6 @@
String cname = "";
String lname = "";
- CompanyUser companyUser = companyUserMapper.selectCompanyUserById(project.getLeader());
- Company company = companyMapper.selectCompanyById(project.getCompanyId());
-
- if (!ObjectUtils.isEmpty(company)){
- cname = company.getFullName();
- }
- if (!ObjectUtils.isEmpty(companyUser)){
- lname = companyUser.getRealName();
- }
project.setCompanyName(cname);
project.setLeaderName(lname);
@@ -187,18 +169,6 @@
{
return toAjax(projectService.deleteProjectByIds(ids));
}
-
- /**
- * 鏌ヨ寮傚父椤圭洰鍒楄〃
- */
- @GetMapping("/proExceptionList")
- @ResponseBody
- public TableDataInfo proExceptionList(){
- startPage();
- List<ExceptionProjectVo> list = projectService.proExceptionList();
- return getDataTable(list);
- }
-
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectWorkController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectWorkController.java
deleted file mode 100644
index 9ce70c1..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectWorkController.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.javaweb.geo.controller;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.javaweb.common.annotation.UserAuth;
-import com.javaweb.common.utils.DateUtils;
-import com.javaweb.geo.domain.Hole;
-import com.javaweb.geo.domain.HoleYantu;
-import com.javaweb.geo.service.IHoleQutuService;
-import com.javaweb.geo.service.IHoleService;
-import com.javaweb.geo.service.IProjectWorkService;
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.platform.domain.*;
-import com.javaweb.platform.utils.UserAuthCacheUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.javaweb.common.annotation.Log;
-import com.javaweb.common.enums.BusinessType;
-import com.javaweb.geo.domain.Project;
-import com.javaweb.geo.service.IProjectService;
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.poi.ExcelUtil;
-import com.javaweb.common.core.page.TableDataInfo;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 椤圭洰宸ヤ綔閲廋ontroller
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Controller
-@RequestMapping("/geo/projectwork")
-public class ProjectWorkController extends BaseController {
-
- private String prefix = "geo/projectwork";
-
- @Autowired
- private IProjectService projectService;
-
- @Autowired
- private IProjectWorkService projectWorkService;
-
- @Autowired
- private IHoleService holeService;
-
- @Autowired
- private IHoleQutuService holeQutuService;
-
- /**
- * 宸ヤ綔閲忕粺璁�
- *
- * @return
- */
- @GetMapping("/work")
- public String work(@RequestParam("id") String id, ModelMap mmap)
- {
-
- AjaxResult ajaxResult = projectWorkService.workloadAccount(id);
- mmap.put("work",ajaxResult.get("data"));
-
- return "geo/project/work";
- }
-
- /**
- * 椤圭洰鐨勫湴鍥炬ā寮�
- *
- * @param id
- * @param mmap
- * @return
- */
- @GetMapping("/map")
- public String map(@RequestParam("id") String id, ModelMap mmap) {
- //鏌ヨ椤圭洰
- Project project =projectService.selectProjectById(id);
- mmap.put("project",project);
- //鏌ヨ閽诲瓟
- Hole hole = new Hole();
- hole.setProjectId(id);
- hole.setIsDeleted(false);
- List<Hole> holes = holeService.selectHoleList(hole);
- mmap.put("holes",holes);
- return "geo/project/map";
- }
-
- /**
- * 鍦板浘鏁版嵁
- * @param holeId
- * @return
- */
- @GetMapping("/holedata")
- @ResponseBody
- public AjaxResult holedata(@RequestParam("holeId") String holeId) {
-
- AjaxResult ajaxResult = new AjaxResult();
- ajaxResult= projectWorkService.holeRecordList(holeId);
- return ajaxResult;
- }
-
-
- /**
- * 鍦拌川閽诲瓟鐨勬煴鐘跺浘椤甸潰
- */
- @GetMapping("/histogram")
- public String histogram(@RequestParam("id") String id, ModelMap mmap) {
-
- mmap.put("holdId",id);
- return "geo/project/holehistogram";
- }
-
- /**
- * 缁樺埗閽诲瓟鏌辩姸鍥�
- * @param holeId
- * @return
- */
- @RequestMapping(value = "histogramJson")
- @ResponseBody
- public List<Map<Object,Object>> histogramJson(String holeId) {
- return projectWorkService.histogramJson(holeId);
- }
-
- /**
- * 鑾峰彇閽诲瓟淇℃伅
- * @param holeId
- * @return
- */
- @RequestMapping("/holeInfo")
- @ResponseBody
- public Map<String,Object> findHoleInfoByHoleId(String holeId){
-
- String msg1 = "";
- String msg2 = "";
-
- Hole hole = holeService.selectHoleById(holeId);
- if (!ObjectUtils.isEmpty(hole)){
-
- Project project = projectService.selectProjectById(hole.getProjectId());
-
- if (!ObjectUtils.isEmpty(project)){
- msg1 += "鎵�灞為」鐩細"+ project.getFullName();
- msg1 += " 鍕樺療鍗曚綅锛�"+project.getCompanyName();
-
- msg2+="閽诲瓟缂栧彿锛�"+hole.getCode();
- msg2+=" 瀛旀繁锛�"+hole.getDepth();
-
- if (!ObjectUtils.isEmpty(project.getCreateTime())){
- msg2+=" 寮�濮嬫椂闂达細"+ DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",project.getCreateTime());
- }else {
- msg2+=" 寮�濮嬫椂闂达細";
- }
-
- if (!ObjectUtils.isEmpty(project.getEndTime())){
- msg2+=" 缁撴潫鏃堕棿锛�"+DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",project.getEndTime());
- }else {
- msg2+=" 缁撴潫鏃堕棿锛�";
- }
- }else {
- msg1 += "鎵�灞為」鐩細";
- msg1 += " 鍕樺療鍗曚綅锛�";
-
- msg2+="閽诲瓟缂栧彿锛�"+hole.getCode();
- msg2+=" 瀛旀繁锛�";
- msg2+=" 寮�濮嬫椂闂达細";
- msg2+=" 缁撴潫鏃堕棿锛�";
- }
-
- }
-
- Map<String,Object> map = new HashMap<>();
- map.put("msg1", msg1);
- map.put("msg2", msg2);
- return map;
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
index dccb42b..30c8989 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/Project.java
@@ -42,10 +42,41 @@
/** 鍖哄幙 */
@Excel(name = "鍖哄幙")
- private Integer district;
+ private String district;
private String districtName;
+ /** 缁忓害 */
+ private Double lng;
+ /** 绾害 */
+ private Double lat;
+
+ /** 杩涘害 */
+ private String rate;
+
+ public Double getLng() {
+ return lng;
+ }
+
+ public void setLng(Double lng) {
+ this.lng = lng;
+ }
+
+ public Double getLat() {
+ return lat;
+ }
+
+ public void setLat(Double lat) {
+ this.lat = lat;
+ }
+
+ public String getRate() {
+ return rate;
+ }
+
+ public void setRate(String rate) {
+ this.rate = rate;
+ }
public String getDistrictName() {
return districtName;
@@ -95,6 +126,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
private Date endTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
+ private Date startTime;
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
/** 閽诲瓟缂栧彿 */
private Integer holeNum;
@@ -177,12 +219,12 @@
{
return companyId;
}
- public void setDistrict(Integer district)
+ public void setDistrict(String district)
{
this.district = district;
}
- public Integer getDistrict()
+ public String getDistrict()
{
return district;
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CollectStatisticsMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CollectStatisticsMapper.java
deleted file mode 100644
index 5383822..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CollectStatisticsMapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.CollectStatistics;
-import java.util.List;
-
-/**
- * 缁熻姹囨�籑apper鎺ュ彛
- *
- * @author cxy
- * @date 2022-12-26
- */
-public interface CollectStatisticsMapper
-{
- /**
- * 鏌ヨ缁熻姹囨��
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁熻姹囨��
- */
- public CollectStatistics selectCollectStatisticsById(String ids);
-
- /**
- * 鏌ヨ缁熻姹囨�诲垪琛�
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁熻姹囨�婚泦鍚�
- */
- public List<CollectStatistics> selectCollectStatisticsList(CollectStatistics collectStatistics);
-
- /**
- * 鏂板缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- public int insertCollectStatistics(CollectStatistics collectStatistics);
-
- /**
- * 淇敼缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- public int updateCollectStatistics(CollectStatistics collectStatistics);
-
- /**
- * 鍒犻櫎缁熻姹囨��
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁撴灉
- */
- public int deleteCollectStatisticsById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎缁熻姹囨��
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCollectStatisticsByIds(String[] idss);
-
- /**
- * 鍒犻櫎琛ㄤ腑鎵�鏈夋暟鎹�
- */
- void emptyTable();
-
- /**
- * 缁熻姹囨�伙紝浼佷笟鍚嶇О銆侀」鐩暟閲忋�佸嫎鎺㈢偣鏁伴噺銆佸紓甯搁」鐩�佸紓甯告暟閲忋�佽繘灏烘�婚噺
- * @return
- */
- List<CollectStatistics> selectCollectStatistic();
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyMapper.java
deleted file mode 100644
index a785f83..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyMapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.Company;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 鍕樺療鍗曚綅Mapper鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-14
- */
-public interface CompanyMapper
-{
- /**
- * 鏌ヨ鍕樺療鍗曚綅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 鍕樺療鍗曚綅
- */
- public Company selectCompanyById(String ids);
-
- /**
- * 鏌ヨ鍕樺療鍗曚綅鍒楄〃
- *
- * @param company 鍕樺療鍗曚綅
- * @return 鍕樺療鍗曚綅闆嗗悎
- */
- public List<Company> selectCompanyList(Company company);
-
- /**
- * 鏂板鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- public int insertCompany(Company company);
-
- /**
- * 淇敼鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- public int updateCompany(Company company);
-
- /**
- * 鍒犻櫎鍕樺療鍗曚綅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 缁撴灉
- */
- public int deleteCompanyById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎鍕樺療鍗曚綅
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCompanyByIds(String[] idss);
-
- Long selectAllCompanyNum();
-
- Long selectCompanyNum();
-
- List<Company> selectCompanProjectNums(@Param("startTime") String startTime,@Param("endTime") String endTime);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyUserMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyUserMapper.java
deleted file mode 100644
index cf16d98..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/CompanyUserMapper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.CompanyUser;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 浼佷笟-浜哄憳Mapper鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-14
- */
-public interface CompanyUserMapper
-{
- /**
- * 鏌ヨ浼佷笟-浜哄憳
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 浼佷笟-浜哄憳
- */
- public CompanyUser selectCompanyUserById(String ids);
-
- /**
- * 鏌ヨ浼佷笟-浜哄憳鍒楄〃
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 浼佷笟-浜哄憳闆嗗悎
- */
- public List<CompanyUser> selectCompanyUserList(CompanyUser companyUser);
-
- /**
- * 鏂板浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- public int insertCompanyUser(CompanyUser companyUser);
-
- /**
- * 淇敼浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- public int updateCompanyUser(CompanyUser companyUser);
-
- /**
- * 鍒犻櫎浼佷笟-浜哄憳
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 缁撴灉
- */
- public int deleteCompanyUserById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎浼佷笟-浜哄憳
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCompanyUserByIds(String[] idss);
-
- /**
- * 鏇存柊鐘舵��
- * @param companyUser
- * @return
- */
- public int changeStatus(CompanyUser companyUser);
-
- List<CompanyUser> selectCompanyUserBypaper3(@Param("paper") String paper,@Param("companyId") String companyId);
-
- List<CompanyUser> selectCompanyUserBypaper4(@Param("paper") String paper,@Param("companyId") String companyId);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/DataSourceMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/DataSourceMapper.java
deleted file mode 100644
index 5094491..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/DataSourceMapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.DataSource;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 鏁版嵁鏉ユ簮Mapper鎺ュ彛
- *
- * @author cxy
- * @date 2022-12-30
- */
-public interface DataSourceMapper
-{
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 鏁版嵁鏉ユ簮
- */
- public DataSource selectDataSourceById(String ids);
-
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮鍒楄〃
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 鏁版嵁鏉ユ簮闆嗗悎
- */
- public List<DataSource> selectDataSourceList(DataSource dataSource);
-
- /**
- * 鏂板鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- public int insertDataSource(DataSource dataSource);
-
- /**
- * 淇敼鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- public int updateDataSource(DataSource dataSource);
-
- /**
- * 鍒犻櫎鏁版嵁鏉ユ簮
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 缁撴灉
- */
- public int deleteDataSourceById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎鏁版嵁鏉ユ簮
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteDataSourceByIds(String[] idss);
-
- String selectDataSourceBySecretKey(@Param("secretKey") String secretKey);
-
- String selectCompanyIdBySecretKey(@Param("secretKey") String secretKey);
-
- int updateDataSourceBySecretKey(@Param("secretKey") String secretKey , @Param("companyId") String companyId);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ExceptionConfigMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ExceptionConfigMapper.java
deleted file mode 100644
index 36ed587..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ExceptionConfigMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.ExceptionConfig;
-import java.util.List;
-
-/**
- * 寮傚父閰嶇疆Mapper鎺ュ彛
- *
- * @author cxy
- * @date 2022-11-14
- */
-public interface ExceptionConfigMapper
-{
- /**
- * 鏌ヨ寮傚父閰嶇疆
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 寮傚父閰嶇疆
- */
- public ExceptionConfig selectExceptionConfigById(Long ids);
-
- /**
- * 鏌ヨ寮傚父閰嶇疆鍒楄〃
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 寮傚父閰嶇疆闆嗗悎
- */
- public List<ExceptionConfig> selectExceptionConfigList(ExceptionConfig exceptionConfig);
-
- /**
- * 鏂板寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- public int insertExceptionConfig(ExceptionConfig exceptionConfig);
-
- /**
- * 淇敼寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- public int updateExceptionConfig(ExceptionConfig exceptionConfig);
-
- /**
- * 鍒犻櫎寮傚父閰嶇疆
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 缁撴灉
- */
- public int deleteExceptionConfigById(Long ids);
-
- /**
- * 鎵归噺鍒犻櫎寮傚父閰嶇疆
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteExceptionConfigByIds(String[] idss);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleExceptionMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleExceptionMapper.java
deleted file mode 100644
index c9bb471..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleExceptionMapper.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.HandleException;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 寮傚父澶勭悊Mapper鎺ュ彛
- *
- * @author cxy
- * @date 2022-11-14
- */
-public interface HandleExceptionMapper
-{
- /**
- * 鏌ヨ寮傚父澶勭悊
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 寮傚父澶勭悊
- */
- public HandleException selectHandleExceptionById(String ids);
-
- /**
- * 鏌ヨ寮傚父澶勭悊鍒楄〃
- *
- * @param handleException 寮傚父澶勭悊
- * @return 寮傚父澶勭悊闆嗗悎
- */
- public List<HandleException> selectHandleExceptionList(HandleException handleException);
-
- /**
- * 鏂板寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- public int insertHandleException(HandleException handleException);
-
- /**
- * 淇敼寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- public int updateHandleException(HandleException handleException);
-
- /**
- * 鍒犻櫎寮傚父澶勭悊
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 缁撴灉
- */
- public int deleteHandleExceptionById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎寮傚父澶勭悊
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteHandleExceptionByIds(String[] idss);
-
- Long selectAllExceptionNum();
-
- Long selectExceptionNum();
-
- List<HandleException> selectListByProjectId(@Param("projectId") String projectId);
-
- List<HandleException> selectListByHoleId(@Param("holeId") String holeId);
-
- /**
- * 璁＄畻寮傚父鏁伴噺
- */
- int selectExceptionNumByCompanyId(@Param("companyId") String companyId);
-
- /**
- * 璁＄畻寮傚父椤圭洰
- */
- int selectExceptionNumByProjectId(@Param("projectId") String projectId);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleOpinionMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleOpinionMapper.java
deleted file mode 100644
index 4ed0e73..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/HandleOpinionMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.HandleOpinion;
-import java.util.List;
-
-/**
- * 澶勭悊鎰忚Mapper鎺ュ彛
- *
- * @author zmk
- * @date 2022-11-14
- */
-public interface HandleOpinionMapper
-{
- /**
- * 鏌ヨ澶勭悊鎰忚
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 澶勭悊鎰忚
- */
- public HandleOpinion selectHandleOpinionById(String ids);
-
- /**
- * 鏌ヨ澶勭悊鎰忚鍒楄〃
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 澶勭悊鎰忚闆嗗悎
- */
- public List<HandleOpinion> selectHandleOpinionList(HandleOpinion handleOpinion);
-
- /**
- * 鏂板澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- public int insertHandleOpinion(HandleOpinion handleOpinion);
-
- /**
- * 淇敼澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- public int updateHandleOpinion(HandleOpinion handleOpinion);
-
- /**
- * 鍒犻櫎澶勭悊鎰忚
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 缁撴灉
- */
- public int deleteHandleOpinionById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎澶勭悊鎰忚
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteHandleOpinionByIds(String[] idss);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/LaborUnitMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/LaborUnitMapper.java
deleted file mode 100644
index 1fd3124..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/LaborUnitMapper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.mapper;
-
-import com.javaweb.geo.domain.LaborUnit;
-import java.util.List;
-
-/**
- * 鍔冲姟鍗曚綅Mapper鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-20
- */
-public interface LaborUnitMapper
-{
- /**
- * 鏌ヨ鍔冲姟鍗曚綅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 鍔冲姟鍗曚綅
- */
- public LaborUnit selectLaborUnitById(String ids);
-
- /**
- * 鏌ヨ鍔冲姟鍗曚綅鍒楄〃
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 鍔冲姟鍗曚綅闆嗗悎
- */
- public List<LaborUnit> selectLaborUnitList(LaborUnit laborUnit);
-
- /**
- * 鏂板鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- public int insertLaborUnit(LaborUnit laborUnit);
-
- /**
- * 淇敼鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- public int updateLaborUnit(LaborUnit laborUnit);
-
- /**
- * 鍒犻櫎鍔冲姟鍗曚綅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 缁撴灉
- */
- public int deleteLaborUnitById(String ids);
-
- /**
- * 鎵归噺鍒犻櫎鍔冲姟鍗曚綅
- *
- * @param idss 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteLaborUnitByIds(String[] idss);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java
index 1bc0e1d..b5b4a6c 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/ProjectMapper.java
@@ -29,13 +29,7 @@
* @return 椤圭洰闆嗗悎
*/
public List<Project> selectProjectList(Project project);
-
- /**
- * 鏍规嵁搴忓垪鍙锋煡璇�
- * @param project
- * @return
- */
- public Project selectProjectBySerialNumber(@Param("serialNumber") String serialNumber);
+
/**
* 鏂板椤圭洰
@@ -69,9 +63,5 @@
*/
public int deleteProjectByIds(String[] idss);
- Long selectAllProjectNum();
- Long selectProjectNum();
-
- List<Project> proExceptionList();
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICollectStatisticsService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICollectStatisticsService.java
deleted file mode 100644
index 4c614f4..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICollectStatisticsService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.CollectStatistics;
-import java.util.List;
-
-/**
- * 缁熻姹囨�籗ervice鎺ュ彛
- *
- * @author cxy
- * @date 2022-12-26
- */
-public interface ICollectStatisticsService
-{
- /**
- * 鏌ヨ缁熻姹囨��
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁熻姹囨��
- */
- public CollectStatistics selectCollectStatisticsById(String ids);
-
- /**
- * 鏌ヨ缁熻姹囨�诲垪琛�
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁熻姹囨�婚泦鍚�
- */
- public List<CollectStatistics> selectCollectStatisticsList(CollectStatistics collectStatistics);
-
- /**
- * 鏂板缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- public int insertCollectStatistics(CollectStatistics collectStatistics);
-
- /**
- * 淇敼缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- public int updateCollectStatistics(CollectStatistics collectStatistics);
-
- /**
- * 鎵归噺鍒犻櫎缁熻姹囨��
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCollectStatisticsByIds(String ids);
-
- /**
- * 鍒犻櫎缁熻姹囨�讳俊鎭�
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁撴灉
- */
- public int deleteCollectStatisticsById(String ids);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyService.java
deleted file mode 100644
index 091a76b..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.Company;
-import java.util.List;
-
-/**
- * 鍕樺療鍗曚綅Service鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-14
- */
-public interface ICompanyService
-{
- /**
- * 鏌ヨ鍕樺療鍗曚綅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 鍕樺療鍗曚綅
- */
- public Company selectCompanyById(String ids);
-
- /**
- * 鏌ヨ鍕樺療鍗曚綅鍒楄〃
- *
- * @param company 鍕樺療鍗曚綅
- * @return 鍕樺療鍗曚綅闆嗗悎
- */
- public List<Company> selectCompanyList(Company company);
-
- /**
- * 鏂板鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- public int insertCompany(Company company);
-
- /**
- * 淇敼鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- public int updateCompany(Company company);
-
- /**
- * 鎵归噺鍒犻櫎鍕樺療鍗曚綅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCompanyByIds(String ids);
-
- /**
- * 鍒犻櫎鍕樺療鍗曚綅淇℃伅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 缁撴灉
- */
- public int deleteCompanyById(String ids);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyUserService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyUserService.java
deleted file mode 100644
index 630820f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ICompanyUserService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.CompanyUser;
-import java.util.List;
-
-/**
- * 浼佷笟-浜哄憳Service鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-14
- */
-public interface ICompanyUserService
-{
- /**
- * 鏌ヨ浼佷笟-浜哄憳
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 浼佷笟-浜哄憳
- */
- public CompanyUser selectCompanyUserById(String ids);
-
- /**
- * 鏌ヨ浼佷笟-浜哄憳鍒楄〃
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 浼佷笟-浜哄憳闆嗗悎
- */
- public List<CompanyUser> selectCompanyUserList(CompanyUser companyUser);
-
- /**
- * 鏂板浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- public int insertCompanyUser(CompanyUser companyUser);
-
- /**
- * 淇敼浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- public int updateCompanyUser(CompanyUser companyUser);
-
- /**
- * 鎵归噺鍒犻櫎浼佷笟-浜哄憳
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteCompanyUserByIds(String ids);
-
- /**
- * 鍒犻櫎浼佷笟-浜哄憳淇℃伅
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 缁撴灉
- */
- public int deleteCompanyUserById(String ids);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDataSourceService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDataSourceService.java
deleted file mode 100644
index 893775f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDataSourceService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.DataSource;
-import java.util.List;
-
-/**
- * 鏁版嵁鏉ユ簮Service鎺ュ彛
- *
- * @author cxy
- * @date 2022-12-30
- */
-public interface IDataSourceService
-{
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 鏁版嵁鏉ユ簮
- */
- public DataSource selectDataSourceById(String ids);
-
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮鍒楄〃
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 鏁版嵁鏉ユ簮闆嗗悎
- */
- public List<DataSource> selectDataSourceList(DataSource dataSource);
-
- /**
- * 鏂板鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- public int insertDataSource(DataSource dataSource);
-
- /**
- * 淇敼鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- public int updateDataSource(DataSource dataSource);
-
- /**
- * 鎵归噺鍒犻櫎鏁版嵁鏉ユ簮
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteDataSourceByIds(String ids);
-
- /**
- * 鍒犻櫎鏁版嵁鏉ユ簮淇℃伅
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 缁撴灉
- */
- public int deleteDataSourceById(String ids);
-
- /**
- * 鏍￠獙key鏄惁瀛樺湪
- * @param secretKey
- * @return true鏍￠獙閫氳繃锛宖alse涓嶉�氳繃
- */
- Boolean checkSecretKey(String secretKey);
-
- String selectDataSourceBySecretKey(String secretKey);
-
- String selectCompanyIdBySecretKey(String secretKey);
-
- int updateDataSourceBySecretKey(String secretKey , String companyId);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IExceptionConfigService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IExceptionConfigService.java
deleted file mode 100644
index 3072e51..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IExceptionConfigService.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.geo.domain.ExceptionConfig;
-import com.javaweb.geotdp.domain.ResponseResult;
-
-import java.util.List;
-
-/**
- * 寮傚父閰嶇疆Service鎺ュ彛
- *
- * @author cxy
- * @date 2022-11-14
- */
-public interface IExceptionConfigService
-{
- /**
- * 鏌ヨ寮傚父閰嶇疆
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 寮傚父閰嶇疆
- */
- public ExceptionConfig selectExceptionConfigById(Long ids);
-
- /**
- * 鏌ヨ寮傚父閰嶇疆鍒楄〃
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 寮傚父閰嶇疆闆嗗悎
- */
- public List<ExceptionConfig> selectExceptionConfigList(ExceptionConfig exceptionConfig);
-
- /**
- * 鏂板寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- public AjaxResult insertExceptionConfig(ExceptionConfig exceptionConfig);
-
- /**
- * 淇敼寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- public int updateExceptionConfig(ExceptionConfig exceptionConfig);
-
- /**
- * 鎵归噺鍒犻櫎寮傚父閰嶇疆
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteExceptionConfigByIds(String ids);
-
- /**
- * 鍒犻櫎寮傚父閰嶇疆淇℃伅
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 缁撴灉
- */
- public int deleteExceptionConfigById(Long ids);
-
- ResponseResult configInfo();
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleExceptionService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleExceptionService.java
deleted file mode 100644
index 425ed9d..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleExceptionService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.HandleException;
-import com.javaweb.geo.domain.HandleOpinion;
-import com.javaweb.geo.vo.ExceptionDistanceVo;
-import com.javaweb.geo.vo.ExceptionTimeVo;
-import com.javaweb.geotdp.domain.ResponseResult;
-
-import java.util.List;
-
-/**
- * 寮傚父澶勭悊Service鎺ュ彛
- *
- * @author cxy
- * @date 2022-11-14
- */
-public interface IHandleExceptionService
-{
- /**
- * 鏌ヨ寮傚父澶勭悊
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 寮傚父澶勭悊
- */
- public HandleException selectHandleExceptionById(String ids);
-
- /**
- * 鏌ヨ寮傚父澶勭悊鍒楄〃
- *
- * @param handleException 寮傚父澶勭悊
- * @return 寮傚父澶勭悊闆嗗悎
- */
- public List<HandleException> selectHandleExceptionList(HandleException handleException);
-
- /**
- * 鏂板寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- public int insertHandleException(HandleException handleException);
-
- /**
- * 淇敼寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- public int updateHandleException(HandleException handleException);
-
- /**
- * 鎵归噺鍒犻櫎寮傚父澶勭悊
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteHandleExceptionByIds(String ids);
-
- /**
- * 鍒犻櫎寮傚父澶勭悊淇℃伅
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 缁撴灉
- */
- public int deleteHandleExceptionById(String ids);
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯�(鏃堕棿寮傚父)
- */
- List<ExceptionTimeVo> holeTimeDetails(String holeId);
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯咃紙浣嶇疆寮傚父锛�
- */
- List<ExceptionDistanceVo> holeDistanceDetails(String holeId);
-
- /**
- * 寮傚父澶勭悊鎰忚璇︽儏
- */
- List<HandleOpinion> handleOpinionDetails(String exceptionId);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleOpinionService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleOpinionService.java
deleted file mode 100644
index 7be2d7f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IHandleOpinionService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.HandleOpinion;
-import java.util.List;
-
-/**
- * 澶勭悊鎰忚Service鎺ュ彛
- *
- * @author zmk
- * @date 2022-11-14
- */
-public interface IHandleOpinionService
-{
- /**
- * 鏌ヨ澶勭悊鎰忚
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 澶勭悊鎰忚
- */
- public HandleOpinion selectHandleOpinionById(String ids);
-
- /**
- * 鏌ヨ澶勭悊鎰忚鍒楄〃
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 澶勭悊鎰忚闆嗗悎
- */
- public List<HandleOpinion> selectHandleOpinionList(HandleOpinion handleOpinion);
-
- /**
- * 鏂板澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- public int insertHandleOpinion(HandleOpinion handleOpinion);
-
- /**
- * 淇敼澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- public int updateHandleOpinion(HandleOpinion handleOpinion);
-
- /**
- * 鎵归噺鍒犻櫎澶勭悊鎰忚
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteHandleOpinionByIds(String ids);
-
- /**
- * 鍒犻櫎澶勭悊鎰忚淇℃伅
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 缁撴灉
- */
- public int deleteHandleOpinionById(String ids);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ILaborUnitService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ILaborUnitService.java
deleted file mode 100644
index 2d51925..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/ILaborUnitService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.javaweb.geo.service;
-
-import com.javaweb.geo.domain.LaborUnit;
-import java.util.List;
-
-/**
- * 鍔冲姟鍗曚綅Service鎺ュ彛
- *
- * @author zmk
- * @date 2022-10-20
- */
-public interface ILaborUnitService
-{
- /**
- * 鏌ヨ鍔冲姟鍗曚綅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 鍔冲姟鍗曚綅
- */
- public LaborUnit selectLaborUnitById(String ids);
-
- /**
- * 鏌ヨ鍔冲姟鍗曚綅鍒楄〃
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 鍔冲姟鍗曚綅闆嗗悎
- */
- public List<LaborUnit> selectLaborUnitList(LaborUnit laborUnit);
-
- /**
- * 鏂板鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- public int insertLaborUnit(LaborUnit laborUnit);
-
- /**
- * 淇敼鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- public int updateLaborUnit(LaborUnit laborUnit);
-
- /**
- * 鎵归噺鍒犻櫎鍔冲姟鍗曚綅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteLaborUnitByIds(String ids);
-
- /**
- * 鍒犻櫎鍔冲姟鍗曚綅淇℃伅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 缁撴灉
- */
- public int deleteLaborUnitById(String ids);
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java
index 80f6667..4ff19bb 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectService.java
@@ -61,8 +61,5 @@
*/
public int deleteProjectById(String ids);
- /**
- * 鏌ヨ寮傚父椤圭洰鍒楄〃
- */
- List<ExceptionProjectVo> proExceptionList();
+
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java
index 9a02d69..f39c04a 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IProjectWorkService.java
@@ -10,21 +10,6 @@
*/
public interface IProjectWorkService {
- /**
- * 宸ヤ綔閲忕粺璁�
- *
- * @return
- */
- AjaxResult workloadAccount(String projectId);
-
- /**
- * 鑾峰彇閽诲瓟鏁版嵁
- * @return
- */
- AjaxResult holeRecordList(String holeId);
-
-
- List<Map<Object,Object>> histogramJson(String holeId);
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CollectStatisticsServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CollectStatisticsServiceImpl.java
deleted file mode 100644
index 4ffa18f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CollectStatisticsServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.List;
-import com.javaweb.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.CollectStatisticsMapper;
-import com.javaweb.geo.domain.CollectStatistics;
-import com.javaweb.geo.service.ICollectStatisticsService;
-import com.javaweb.common.core.text.Convert;
-
-/**
- * 缁熻姹囨�籗ervice涓氬姟灞傚鐞�
- *
- * @author cxy
- * @date 2022-12-26
- */
-@Service
-public class CollectStatisticsServiceImpl implements ICollectStatisticsService
-{
- @Autowired
- private CollectStatisticsMapper collectStatisticsMapper;
-
- /**
- * 鏌ヨ缁熻姹囨��
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁熻姹囨��
- */
- @Override
- public CollectStatistics selectCollectStatisticsById(String ids)
- {
- return collectStatisticsMapper.selectCollectStatisticsById(ids);
- }
-
- /**
- * 鏌ヨ缁熻姹囨�诲垪琛�
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁熻姹囨��
- */
- @Override
- public List<CollectStatistics> selectCollectStatisticsList(CollectStatistics collectStatistics)
- {
- return collectStatisticsMapper.selectCollectStatisticsList(collectStatistics);
- }
-
- /**
- * 鏂板缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- @Override
- public int insertCollectStatistics(CollectStatistics collectStatistics)
- {
- collectStatistics.setCreateTime(DateUtils.getNowDate());
- return collectStatisticsMapper.insertCollectStatistics(collectStatistics);
- }
-
- /**
- * 淇敼缁熻姹囨��
- *
- * @param collectStatistics 缁熻姹囨��
- * @return 缁撴灉
- */
- @Override
- public int updateCollectStatistics(CollectStatistics collectStatistics)
- {
- return collectStatisticsMapper.updateCollectStatistics(collectStatistics);
- }
-
- /**
- * 鍒犻櫎缁熻姹囨�诲璞�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteCollectStatisticsByIds(String ids)
- {
- return collectStatisticsMapper.deleteCollectStatisticsByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎缁熻姹囨�讳俊鎭�
- *
- * @param ids 缁熻姹囨�籌D
- * @return 缁撴灉
- */
- @Override
- public int deleteCollectStatisticsById(String ids)
- {
- return collectStatisticsMapper.deleteCollectStatisticsById(ids);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyServiceImpl.java
deleted file mode 100644
index f9518b2..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyServiceImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.javaweb.common.utils.IdGenerate;
-import com.javaweb.common.utils.StringUtils;
-import com.javaweb.framework.util.ShiroUtils;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.system.domain.SysRole;
-import com.javaweb.system.domain.SysUser;
-import com.javaweb.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.CompanyMapper;
-import com.javaweb.geo.domain.Company;
-import com.javaweb.geo.service.ICompanyService;
-import com.javaweb.common.core.text.Convert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * 鍕樺療鍗曚綅Service涓氬姟灞傚鐞�
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Service
-public class CompanyServiceImpl implements ICompanyService
-{
- @Autowired
- private CompanyMapper companyMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- /**
- * 鏌ヨ鍕樺療鍗曚綅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 鍕樺療鍗曚綅
- */
- @Override
- public Company selectCompanyById(String ids)
- {
- return companyMapper.selectCompanyById(ids);
- }
-
- /**
- * 鏌ヨ鍕樺療鍗曚綅鍒楄〃
- *
- * @param company 鍕樺療鍗曚綅
- * @return 鍕樺療鍗曚綅
- */
- @Override
- public List<Company> selectCompanyList(Company company)
- {
- // return companyMapper.selectCompanyList(company);
- List<Company> resultList = new ArrayList<>();
-
- SysUser sysUser = ShiroUtils.getSysUser();
- List<SysRole> roles = sysUser.getRoles();
-
- if (!ObjectUtils.isEmpty(roles)){
- LinkedHashSet<String> collect = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toCollection(LinkedHashSet::new));
-
- // 绠＄悊鍛樿鑹�
- if (collect.contains(RecordType.role_admin.getId())){
- resultList = companyMapper.selectCompanyList(company);
- }
- // 鏅�氳鑹�
- if (collect.contains(RecordType.role_gongsi.getId())){
- SysUser u = sysUserMapper.selectUserById(sysUser.getUserId());
- company.setIds(u.getCompanyId());
- resultList = companyMapper.selectCompanyList(company);
- }
-
- }
-
- return resultList;
- }
-
- /**
- * 鏂板鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- @Override
- public int insertCompany(Company company)
- {
- if(StringUtils.isEmpty(company.getIds())){
- company.setIds(IdGenerate.nextId());
- }
- if(company.getAddTime()==null){
- company.setAddTime(new Date());
- }
- company.setCity(1);//鍖椾含
- company.setProvince(1);//鍖椾含
- return companyMapper.insertCompany(company);
- }
-
- /**
- * 淇敼鍕樺療鍗曚綅
- *
- * @param company 鍕樺療鍗曚綅
- * @return 缁撴灉
- */
- @Override
- public int updateCompany(Company company)
- {
- return companyMapper.updateCompany(company);
- }
-
- /**
- * 鍒犻櫎鍕樺療鍗曚綅瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteCompanyByIds(String ids)
- {
- return companyMapper.deleteCompanyByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎鍕樺療鍗曚綅淇℃伅
- *
- * @param ids 鍕樺療鍗曚綅ID
- * @return 缁撴灉
- */
- @Override
- public int deleteCompanyById(String ids)
- {
- return companyMapper.deleteCompanyById(ids);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyUserServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyUserServiceImpl.java
deleted file mode 100644
index b6865ad..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/CompanyUserServiceImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.javaweb.framework.util.ShiroUtils;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.system.domain.SysRole;
-import com.javaweb.system.domain.SysUser;
-import com.javaweb.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.CompanyUserMapper;
-import com.javaweb.geo.domain.CompanyUser;
-import com.javaweb.geo.service.ICompanyUserService;
-import com.javaweb.common.core.text.Convert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * 浼佷笟-浜哄憳Service涓氬姟灞傚鐞�
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Service
-public class CompanyUserServiceImpl implements ICompanyUserService
-{
- @Autowired
- private CompanyUserMapper companyUserMapper;
-
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- /**
- * 鏌ヨ浼佷笟-浜哄憳
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 浼佷笟-浜哄憳
- */
- @Override
- public CompanyUser selectCompanyUserById(String ids)
- {
- return companyUserMapper.selectCompanyUserById(ids);
- }
-
- /**
- * 鏌ヨ浼佷笟-浜哄憳鍒楄〃
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 浼佷笟-浜哄憳
- */
- @Override
- public List<CompanyUser> selectCompanyUserList(CompanyUser companyUser)
- {
- //return companyUserMapper.selectCompanyUserList(companyUser);
- List<CompanyUser> resultList = new ArrayList<>();
-
- SysUser sysUser = ShiroUtils.getSysUser();
- List<SysRole> roles = sysUser.getRoles();
-
- if (!ObjectUtils.isEmpty(roles)){
- LinkedHashSet<String> collect = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toCollection(LinkedHashSet::new));
-
- // 绠＄悊鍛樿鑹�
- if (collect.contains(RecordType.role_admin.getId())){
- resultList = companyUserMapper.selectCompanyUserList(companyUser);
- }
- // 鏅�氳鑹�
- if (collect.contains(RecordType.role_gongsi.getId())){
- SysUser u = sysUserMapper.selectUserById(sysUser.getUserId());
- companyUser.setCompanyId(u.getCompanyId());
- resultList = companyUserMapper.selectCompanyUserList(companyUser);
- }
-
- }
-
- return resultList;
- }
-
- /**
- * 鏂板浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- @Override
- public int insertCompanyUser(CompanyUser companyUser)
- {
- return companyUserMapper.insertCompanyUser(companyUser);
- }
-
- /**
- * 淇敼浼佷笟-浜哄憳
- *
- * @param companyUser 浼佷笟-浜哄憳
- * @return 缁撴灉
- */
- @Override
- public int updateCompanyUser(CompanyUser companyUser)
- {
- return companyUserMapper.updateCompanyUser(companyUser);
- }
-
- /**
- * 鍒犻櫎浼佷笟-浜哄憳瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteCompanyUserByIds(String ids)
- {
- return companyUserMapper.deleteCompanyUserByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎浼佷笟-浜哄憳淇℃伅
- *
- * @param ids 浼佷笟-浜哄憳ID
- * @return 缁撴灉
- */
- @Override
- public int deleteCompanyUserById(String ids)
- {
- return companyUserMapper.deleteCompanyUserById(ids);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DataSourceServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DataSourceServiceImpl.java
deleted file mode 100644
index adbbefa..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DataSourceServiceImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.List;
-import java.util.UUID;
-
-import com.javaweb.common.utils.IdGenerate;
-import com.javaweb.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.DataSourceMapper;
-import com.javaweb.geo.domain.DataSource;
-import com.javaweb.geo.service.IDataSourceService;
-import com.javaweb.common.core.text.Convert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * 鏁版嵁鏉ユ簮Service涓氬姟灞傚鐞�
- *
- * @author cxy
- * @date 2022-12-30
- */
-@Service
-public class DataSourceServiceImpl implements IDataSourceService {
-
- @Autowired
- private DataSourceMapper dataSourceMapper;
-
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 鏁版嵁鏉ユ簮
- */
- @Override
- public DataSource selectDataSourceById(String ids)
- {
- return dataSourceMapper.selectDataSourceById(ids);
- }
-
- /**
- * 鏌ヨ鏁版嵁鏉ユ簮鍒楄〃
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 鏁版嵁鏉ユ簮
- */
- @Override
- public List<DataSource> selectDataSourceList(DataSource dataSource)
- {
- return dataSourceMapper.selectDataSourceList(dataSource);
- }
-
- /**
- * 鏂板鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- @Override
- public int insertDataSource(DataSource dataSource)
- {
- dataSource.setIds(IdGenerate.nextId());
- dataSource.setSecretKey(IdGenerate.uuid());
- return dataSourceMapper.insertDataSource(dataSource);
- }
-
- /**
- * 淇敼鏁版嵁鏉ユ簮
- *
- * @param dataSource 鏁版嵁鏉ユ簮
- * @return 缁撴灉
- */
- @Override
- public int updateDataSource(DataSource dataSource)
- {
- if (StringUtils.isEmpty(dataSource.getIds())){
- return dataSourceMapper.insertDataSource(dataSource);
- }
- return dataSourceMapper.updateDataSource(dataSource);
- }
-
- /**
- * 鍒犻櫎鏁版嵁鏉ユ簮瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteDataSourceByIds(String ids)
- {
- return dataSourceMapper.deleteDataSourceByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎鏁版嵁鏉ユ簮淇℃伅
- *
- * @param ids 鏁版嵁鏉ユ簮ID
- * @return 缁撴灉
- */
- @Override
- public int deleteDataSourceById(String ids)
- {
- return dataSourceMapper.deleteDataSourceById(ids);
- }
-
-
- /**
- * 鏍￠獙key鏄惁瀛樺湪
- * @param secretKey
- * @return true鏍￠獙閫氳繃锛宖alse涓嶉�氳繃
- */
- @Override
- public Boolean checkSecretKey(String secretKey) {
- DataSource dataSource = new DataSource();
- dataSource.setSecretKey(secretKey);
-
- List<DataSource> dataSources = selectDataSourceList(dataSource);
- if (ObjectUtils.isEmpty(dataSources)){
- return false;
- }
- return true;
- }
-
-
- @Override
- public String selectDataSourceBySecretKey(String secretKey) {
- return dataSourceMapper.selectDataSourceBySecretKey(secretKey);
- }
-
- @Override
- public String selectCompanyIdBySecretKey(String secretKey) {
- return dataSourceMapper.selectCompanyIdBySecretKey(secretKey);
- }
-
- @Override
- public int updateDataSourceBySecretKey(String secretKey,String companyId) {
- return dataSourceMapper.updateDataSourceBySecretKey(secretKey,companyId);
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ExceptionConfigServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ExceptionConfigServiceImpl.java
deleted file mode 100644
index af89984..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ExceptionConfigServiceImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.List;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.javaweb.common.core.domain.AjaxResult;
-import com.javaweb.common.utils.IdGenerate;
-import com.javaweb.common.utils.StringUtils;
-import com.javaweb.geotdp.domain.ResponseResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.ExceptionConfigMapper;
-import com.javaweb.geo.domain.ExceptionConfig;
-import com.javaweb.geo.service.IExceptionConfigService;
-import com.javaweb.common.core.text.Convert;
-
-/**
- * 寮傚父閰嶇疆Service涓氬姟灞傚鐞�
- *
- * @author cxy
- * @date 2022-11-14
- */
-@Service
-public class ExceptionConfigServiceImpl implements IExceptionConfigService
-{
- @Autowired
- private ExceptionConfigMapper exceptionConfigMapper;
-
- /**
- * 鏌ヨ寮傚父閰嶇疆
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 寮傚父閰嶇疆
- */
- @Override
- public ExceptionConfig selectExceptionConfigById(Long ids)
- {
- return exceptionConfigMapper.selectExceptionConfigById(ids);
- }
-
- /**
- * 鏌ヨ寮傚父閰嶇疆鍒楄〃
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 寮傚父閰嶇疆
- */
- @Override
- public List<ExceptionConfig> selectExceptionConfigList(ExceptionConfig exceptionConfig)
- {
- return exceptionConfigMapper.selectExceptionConfigList(exceptionConfig);
- }
-
- /**
- * 鏂板寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- @Override
- public AjaxResult insertExceptionConfig(ExceptionConfig exceptionConfig)
- {
- if (ObjectUtil.isEmpty(exceptionConfig.getIds())){
- String id = IdGenerate.nextId();
- exceptionConfig.setIds(id);
- exceptionConfigMapper.insertExceptionConfig(exceptionConfig);
- }else {
- exceptionConfigMapper.updateExceptionConfig(exceptionConfig);
- }
- return AjaxResult.success("鏁版嵁淇濆瓨鎴愬姛");
- }
-
- /**
- * 淇敼寮傚父閰嶇疆
- *
- * @param exceptionConfig 寮傚父閰嶇疆
- * @return 缁撴灉
- */
- @Override
- public int updateExceptionConfig(ExceptionConfig exceptionConfig)
- {
- return exceptionConfigMapper.updateExceptionConfig(exceptionConfig);
- }
-
- /**
- * 鍒犻櫎寮傚父閰嶇疆瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteExceptionConfigByIds(String ids)
- {
- return exceptionConfigMapper.deleteExceptionConfigByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎寮傚父閰嶇疆淇℃伅
- *
- * @param ids 寮傚父閰嶇疆ID
- * @return 缁撴灉
- */
- @Override
- public int deleteExceptionConfigById(Long ids)
- {
- return exceptionConfigMapper.deleteExceptionConfigById(ids);
- }
-
- @Override
- public ResponseResult configInfo() {
- ExceptionConfig data = exceptionConfigMapper.selectExceptionConfigById(1L);
- if (ObjectUtil.isNotEmpty(data)){
- return ResponseResult.success("鏌ヨ鎴愬姛锛�",data);
- }
- return ResponseResult.error("鏌ヨ澶辫触锛�",null);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleExceptionServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleExceptionServiceImpl.java
deleted file mode 100644
index 3d95ada..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleExceptionServiceImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.javaweb.common.exception.BusinessException;
-import com.javaweb.common.utils.NumberUtils;
-import com.javaweb.geo.domain.*;
-import com.javaweb.geo.mapper.*;
-import com.javaweb.geo.service.IHandleOpinionService;
-import com.javaweb.geo.utils.ExceptionDistanceUtils;
-import com.javaweb.geo.utils.ExceptionTimeUtils;
-import com.javaweb.geo.vo.ExceptionDistanceVo;
-import com.javaweb.geo.vo.ExceptionTimeVo;
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.enums.RecordType;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.service.IHandleExceptionService;
-import com.javaweb.common.core.text.Convert;
-
-/**
- * 寮傚父澶勭悊Service涓氬姟灞傚鐞�
- *
- * @author cxy
- * @date 2022-11-14
- */
-@Service
-public class HandleExceptionServiceImpl implements IHandleExceptionService {
- @Autowired
- private HandleExceptionMapper handleExceptionMapper;
-
- @Autowired
- private HoleMapper holeMapper;
-
- @Autowired
- private HoleYantuMapper holeYantuMapper;
-
- @Autowired
- private HoleHuiciMapper holeHuiciMapper;
-
-
- @Autowired
- private HoleQutuMapper holeQutuMapper;
-
- @Autowired
- private HoleBiaoguanMapper holeBiaoguanMapper;
-
- @Autowired
- private HoleShuiweiMapper holeShuiweiMapper;
-
- @Autowired
- private IHandleOpinionService handleOpinionService;
-
- /**
- * 鏌ヨ寮傚父澶勭悊
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 寮傚父澶勭悊
- */
- @Override
- public HandleException selectHandleExceptionById(String ids) {
- return handleExceptionMapper.selectHandleExceptionById(ids);
- }
-
- /**
- * 鏌ヨ寮傚父澶勭悊鍒楄〃
- *
- * @param handleException 寮傚父澶勭悊
- * @return 寮傚父澶勭悊
- */
- @Override
- public List<HandleException> selectHandleExceptionList(HandleException handleException) {
- return handleExceptionMapper.selectHandleExceptionList(handleException);
- }
-
- /**
- * 鏂板寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- @Override
- public int insertHandleException(HandleException handleException) {
- return handleExceptionMapper.insertHandleException(handleException);
- }
-
- /**
- * 淇敼寮傚父澶勭悊
- *
- * @param handleException 寮傚父澶勭悊
- * @return 缁撴灉
- */
- @Override
- public int updateHandleException(HandleException handleException) {
- return handleExceptionMapper.updateHandleException(handleException);
- }
-
- /**
- * 鍒犻櫎寮傚父澶勭悊瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteHandleExceptionByIds(String ids) {
- return handleExceptionMapper.deleteHandleExceptionByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎寮傚父澶勭悊淇℃伅
- *
- * @param ids 寮傚父澶勭悊ID
- * @return 缁撴灉
- */
- @Override
- public int deleteHandleExceptionById(String ids) {
- return handleExceptionMapper.deleteHandleExceptionById(ids);
- }
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯�(鏃堕棿寮傚父)
- */
- @Override
- public List<ExceptionTimeVo> holeTimeDetails(String holeId) {
-
- List<ExceptionTimeVo> resultList = new ArrayList<>();
- ExceptionTimeVo exceptionTimeVo;
-
- List<HoleYantu> yantuList = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
- if (ObjectUtil.isNotEmpty(yantuList)) {
- for (int i = 0; i < yantuList.size() ; i++) {
- exceptionTimeVo = new ExceptionTimeVo();
- BeanUtil.copyProperties(yantuList.get(i), exceptionTimeVo);
- exceptionTimeVo.setCode(yantuList.get(i).getCode());
- exceptionTimeVo.setRecordType(RecordType.yt.getName());
- exceptionTimeVo.setGpsTime(yantuList.get(i).getGpsTime());
- if(i==0){
- exceptionTimeVo.setSpead(0d);
- resultList.add(exceptionTimeVo);
- continue;
- }
- HoleYantu holeYantu1 = yantuList.get(i-1);
- HoleYantu holeYantu2 = yantuList.get(i);
- // 璁＄畻閫熷害
- Double spead = ExceptionTimeUtils.spead(holeYantu1.getGpsTime(), holeYantu1.getEndDepth(), holeYantu2.getGpsTime(), holeYantu2.getEndDepth());
- exceptionTimeVo.setSpead(spead);
-
-
-
- resultList.add(exceptionTimeVo);
- }
- }
-
- return resultList;
- }
-
-
- /**
- * 鏌ョ湅鍕樻帰鐐圭紪鍙蜂笅鐨勮鎯�(璺濈寮傚父)
- */
- @Override
- public List<ExceptionDistanceVo> holeDistanceDetails(String holeId) {
-
- Hole hole = holeMapper.selectHoleById(holeId);
- if (ObjectUtil.isEmpty(hole)) {
- throw new BusinessException("鏈煡璇㈠埌鏁版嵁");
- }
-
- List<ExceptionDistanceVo> resultList = new ArrayList<>();
- ExceptionDistanceVo distanceVo;
- double holeLon = hole.getLongitude(), holeLat = hole.getLatitude();
-
- List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(holeId);
- List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(holeId);
- List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(holeId);
- List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(holeId);
- List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuListByHoleId(holeId);
-
- // 鏍囨儻銆佸姩鎺�
- if (ObjectUtil.isNotEmpty(biaoguans)) {
- for (HoleBiaoguan item : biaoguans) {
- distanceVo = new ExceptionDistanceVo();
- distanceVo.setIds(item.getIds());
- distanceVo.setBeginDepth(item.getBegin1());
- distanceVo.setEndDepth(item.getEnd1());
- distanceVo.setCode(item.getCode());
- distanceVo.setLat(item.getLongitude());
- distanceVo.setLng(item.getLatitude());
- distanceVo.setRecordType(item.getType());
- distanceVo.setGpsTime(item.getGpsTime());
- distanceVo.setDistance(ExceptionDistanceUtils.distance(holeLon, holeLat, item.getLongitude(), item.getLatitude()));
- resultList.add(distanceVo);
- }
- }
- // 鍥炴
- if (ObjectUtil.isNotEmpty(holeHuicis)) {
- for (HoleHuici item : holeHuicis) {
- distanceVo = new ExceptionDistanceVo();
- distanceVo.setIds(item.getIds());
- distanceVo.setBeginDepth(item.getBeginDepth());
- distanceVo.setEndDepth(item.getEndDepth());
- distanceVo.setCode(item.getCode());
- distanceVo.setLat(item.getLongitude());
- distanceVo.setLng(item.getLatitude());
- distanceVo.setRecordType(RecordType.hc.getName());
- distanceVo.setGpsTime(item.getGpsTime());
- distanceVo.setDistance(ExceptionDistanceUtils.distance(holeLon, holeLat, item.getLongitude(), item.getLatitude()));
- resultList.add(distanceVo);
- }
- }
- // 鍙栧湡
- if (ObjectUtil.isNotEmpty(qutus)) {
- for (HoleQutu item : qutus) {
- distanceVo = new ExceptionDistanceVo();
- distanceVo.setIds(item.getIds());
- distanceVo.setBeginDepth(item.getBeginDepth());
- distanceVo.setEndDepth(item.getEndDepth());
- distanceVo.setCode(item.getCode());
- distanceVo.setLat(item.getLongitude());
- distanceVo.setLng(item.getLatitude());
- distanceVo.setRecordType(RecordType.qt.getName());
- distanceVo.setGpsTime(item.getGpsTime());
- distanceVo.setDistance(ExceptionDistanceUtils.distance(holeLon, holeLat, item.getLongitude(), item.getLatitude()));
- resultList.add(distanceVo);
- }
- }
- // 姘翠綅
- if (ObjectUtil.isNotEmpty(shuiweis)) {
- for (HoleShuiwei item : shuiweis) {
- distanceVo = new ExceptionDistanceVo();
- distanceVo.setIds(item.getIds());
- distanceVo.setBeginDepth(item.getShownWaterLevel());
- distanceVo.setEndDepth(item.getWaterDepth());
- distanceVo.setCode(item.getCode());
- distanceVo.setLat(item.getLongitude());
- distanceVo.setLng(item.getLatitude());
- distanceVo.setRecordType(RecordType.sw.getName());
- distanceVo.setGpsTime(item.getGpsTime());
- distanceVo.setDistance(ExceptionDistanceUtils.distance(holeLon, holeLat, item.getLongitude(), item.getLatitude()));
- resultList.add(distanceVo);
- }
- }
- // 宀╁湡
- if (ObjectUtil.isNotEmpty(yantus)) {
- for (HoleYantu item : yantus) {
- distanceVo = new ExceptionDistanceVo();
- distanceVo.setIds(item.getIds());
- distanceVo.setBeginDepth(item.getBeginDepth());
- distanceVo.setEndDepth(item.getEndDepth());
- distanceVo.setCode(item.getCode());
- distanceVo.setLat(item.getLongitude());
- distanceVo.setLng(item.getLatitude());
- distanceVo.setRecordType(RecordType.yt.getName());
- distanceVo.setGpsTime(item.getGpsTime());
- distanceVo.setDistance(ExceptionDistanceUtils.distance(holeLon, holeLat, item.getLongitude(), item.getLatitude()));
- resultList.add(distanceVo);
- }
- }
- return resultList;
- }
-
-
- /**
- * 寮傚父澶勭悊鎰忚璇︽儏
- * @param exceptionId
- * @return
- */
- @Override
- public List<HandleOpinion> handleOpinionDetails(String exceptionId) {
- HandleOpinion handleOpinion = new HandleOpinion();
- handleOpinion.setExceptionId(exceptionId);
- return handleOpinionService.selectHandleOpinionList(handleOpinion);
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleOpinionServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleOpinionServiceImpl.java
deleted file mode 100644
index 59f3b70..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HandleOpinionServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.HandleOpinionMapper;
-import com.javaweb.geo.domain.HandleOpinion;
-import com.javaweb.geo.service.IHandleOpinionService;
-import com.javaweb.common.core.text.Convert;
-
-/**
- * 澶勭悊鎰忚Service涓氬姟灞傚鐞�
- *
- * @author zmk
- * @date 2022-11-14
- */
-@Service
-public class HandleOpinionServiceImpl implements IHandleOpinionService
-{
- @Autowired
- private HandleOpinionMapper handleOpinionMapper;
-
- /**
- * 鏌ヨ澶勭悊鎰忚
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 澶勭悊鎰忚
- */
- @Override
- public HandleOpinion selectHandleOpinionById(String ids)
- {
- return handleOpinionMapper.selectHandleOpinionById(ids);
- }
-
- /**
- * 鏌ヨ澶勭悊鎰忚鍒楄〃
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 澶勭悊鎰忚
- */
- @Override
- public List<HandleOpinion> selectHandleOpinionList(HandleOpinion handleOpinion)
- {
- return handleOpinionMapper.selectHandleOpinionList(handleOpinion);
- }
-
- /**
- * 鏂板澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- @Override
- public int insertHandleOpinion(HandleOpinion handleOpinion)
- {
- return handleOpinionMapper.insertHandleOpinion(handleOpinion);
- }
-
- /**
- * 淇敼澶勭悊鎰忚
- *
- * @param handleOpinion 澶勭悊鎰忚
- * @return 缁撴灉
- */
- @Override
- public int updateHandleOpinion(HandleOpinion handleOpinion)
- {
- return handleOpinionMapper.updateHandleOpinion(handleOpinion);
- }
-
- /**
- * 鍒犻櫎澶勭悊鎰忚瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteHandleOpinionByIds(String ids)
- {
- return handleOpinionMapper.deleteHandleOpinionByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎澶勭悊鎰忚淇℃伅
- *
- * @param ids 澶勭悊鎰忚ID
- * @return 缁撴灉
- */
- @Override
- public int deleteHandleOpinionById(String ids)
- {
- return handleOpinionMapper.deleteHandleOpinionById(ids);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/LaborUnitServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/LaborUnitServiceImpl.java
deleted file mode 100644
index a6f9fe3..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/LaborUnitServiceImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.javaweb.geo.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.javaweb.geo.mapper.LaborUnitMapper;
-import com.javaweb.geo.domain.LaborUnit;
-import com.javaweb.geo.service.ILaborUnitService;
-import com.javaweb.common.core.text.Convert;
-
-/**
- * 鍔冲姟鍗曚綅Service涓氬姟灞傚鐞�
- *
- * @author zmk
- * @date 2022-10-20
- */
-@Service
-public class LaborUnitServiceImpl implements ILaborUnitService
-{
- @Autowired
- private LaborUnitMapper laborUnitMapper;
-
- /**
- * 鏌ヨ鍔冲姟鍗曚綅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 鍔冲姟鍗曚綅
- */
- @Override
- public LaborUnit selectLaborUnitById(String ids)
- {
- return laborUnitMapper.selectLaborUnitById(ids);
- }
-
- /**
- * 鏌ヨ鍔冲姟鍗曚綅鍒楄〃
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 鍔冲姟鍗曚綅
- */
- @Override
- public List<LaborUnit> selectLaborUnitList(LaborUnit laborUnit)
- {
- return laborUnitMapper.selectLaborUnitList(laborUnit);
- }
-
- /**
- * 鏂板鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- @Override
- public int insertLaborUnit(LaborUnit laborUnit)
- {
- return laborUnitMapper.insertLaborUnit(laborUnit);
- }
-
- /**
- * 淇敼鍔冲姟鍗曚綅
- *
- * @param laborUnit 鍔冲姟鍗曚綅
- * @return 缁撴灉
- */
- @Override
- public int updateLaborUnit(LaborUnit laborUnit)
- {
- return laborUnitMapper.updateLaborUnit(laborUnit);
- }
-
- /**
- * 鍒犻櫎鍔冲姟鍗曚綅瀵硅薄
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- @Override
- public int deleteLaborUnitByIds(String ids)
- {
- return laborUnitMapper.deleteLaborUnitByIds(Convert.toStrArray(ids));
- }
-
- /**
- * 鍒犻櫎鍔冲姟鍗曚綅淇℃伅
- *
- * @param ids 鍔冲姟鍗曚綅ID
- * @return 缁撴灉
- */
- @Override
- public int deleteLaborUnitById(String ids)
- {
- return laborUnitMapper.deleteLaborUnitById(ids);
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java
index 2c29380..4b4bedc 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectServiceImpl.java
@@ -1,26 +1,15 @@
package com.javaweb.geo.service.impl;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
import java.util.List;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
import com.javaweb.common.utils.DateUtils;
-import com.javaweb.framework.util.ShiroUtils;
+import com.javaweb.common.utils.IdGenerate;
+import com.javaweb.common.utils.StringUtils;
import com.javaweb.geo.domain.*;
import com.javaweb.geo.mapper.*;
import com.javaweb.geo.service.*;
-import com.javaweb.geo.vo.ExceptionProjectVo;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.system.domain.SysRole;
-import com.javaweb.system.domain.SysUser;
-import com.javaweb.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.javaweb.common.core.text.Convert;
-import org.springframework.util.ObjectUtils;
/**
* 椤圭洰Service涓氬姟灞傚鐞�
@@ -32,33 +21,6 @@
public class ProjectServiceImpl implements IProjectService {
@Autowired
private ProjectMapper projectMapper;
-
- @Autowired
- private HandleExceptionMapper handleExceptionMapper;
-
- @Autowired
- private SysUserMapper sysUserMapper;
-
- @Autowired
- private HoleMapper holeMapper;
-
- @Autowired
- private HoleBiaoguanMapper holeBiaoguanMapper;
-
- @Autowired
- private HoleHuiciMapper holeHuiciMapper;
-
- @Autowired
- private HolePersonMapper holePersonMapper;
-
- @Autowired
- private HoleQutuMapper holeQutuMapper;
-
- @Autowired
- private HoleShuiweiMapper holeShuiweiMapper;
-
- @Autowired
- private HoleYantuMapper holeYantuMapper;
/**
* 鏌ヨ椤圭洰
@@ -79,29 +41,7 @@
*/
@Override
public List<Project> selectProjectList(Project project) {
- //return projectMapper.selectProjectList(project);
- List<Project> resultList = new ArrayList<>();
-
- SysUser sysUser = ShiroUtils.getSysUser();
- List<SysRole> roles = sysUser.getRoles();
-
- if (!ObjectUtils.isEmpty(roles)) {
- LinkedHashSet<String> collect = roles.stream().map(SysRole::getRoleKey).collect(Collectors.toCollection(LinkedHashSet::new));
-
- // 绠＄悊鍛樿鑹�
- if (collect.contains(RecordType.role_admin.getId())) {
- resultList = projectMapper.selectProjectList(project);
- }
- // 鏅�氳鑹�
- if (collect.contains(RecordType.role_gongsi.getId())) {
- SysUser u = sysUserMapper.selectUserById(sysUser.getUserId());
- project.setCompanyId(u.getCompanyId());
- resultList = projectMapper.selectProjectList(project);
- }
-
- }
-
- return resultList;
+ return projectMapper.selectProjectList(project);
}
/**
@@ -112,7 +52,9 @@
*/
@Override
public int insertProject(Project project) {
- project.setCreateTime(DateUtils.getNowDate());
+ if(StringUtils.isEmpty(project.getIds())){
+ project.setIds(IdGenerate.nextId());
+ }
return projectMapper.insertProject(project);
}
@@ -147,82 +89,8 @@
@Override
public int deleteProjectById(String ids) {
- // 鍒犻櫎椤圭洰鍏宠仈鐨勯捇瀛旀暟鎹�
- String[] strings = Convert.toStrArray(ids);
- if (!ObjectUtils.isEmpty(strings)) {
- for (String projectId : strings) {
-
- // =======閽诲瓟==========
- List<Hole> holes = holeMapper.selectHoleByProjectId(projectId);
- String[] holeIds = holes.stream().map(Hole::getIds).toArray(String[]::new);
-
- // =======鏍囪疮==========
- List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByProjectId(projectId);
- String[] biaoguanIds = biaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
-
- // =======鍥炴==========
- List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByProjectId(projectId);
- String[] huiCiIds = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
-
- // =======浜哄憳==========
- List<HolePerson> persons = holePersonMapper.selectHolePersonByProjectId(projectId);
- String[] personIds = persons.stream().map(HolePerson::getIds).toArray(String[]::new);
-
- // =======鍙栧湡==========
- List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByProjectId(projectId);
- String[] qutuIds = qutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
-
- // =======姘翠綅==========
- List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByProjectId(projectId);
- String[] shuiweiIds = shuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
-
- // =======宀╁湡==========
- List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuByProjectId(projectId);
- String[] yantusIds = yantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
-
- holeMapper.deleteHoleByIds(holeIds);
- holeBiaoguanMapper.deleteHoleBiaoguanByIds(biaoguanIds);
- holeHuiciMapper.deleteHoleHuiciByIds(huiCiIds);
- holePersonMapper.deleteHolePersonByIds(personIds);
- holeQutuMapper.deleteHoleQutuByIds(qutuIds);
- holeShuiweiMapper.deleteHoleShuiweiByIds(shuiweiIds);
- holeYantuMapper.deleteHoleYantuByIds(yantusIds);
- }
- }
-
return projectMapper.deleteProjectById(ids);
}
- /**
- * 鏌ヨ寮傚父椤圭洰鍒楄〃
- */
- @Override
- public List<ExceptionProjectVo> proExceptionList() {
- List<Project> list = projectMapper.proExceptionList();
-
- List<ExceptionProjectVo> resultList = new ArrayList<>();
- ExceptionProjectVo item;
-
- if (ObjectUtil.isNotEmpty(list)) {
- for (Project project : list) {
- item = new ExceptionProjectVo();
- BeanUtil.copyProperties(project, item);
-
- List<HandleException> exceptionList = handleExceptionMapper.selectListByProjectId(project.getIds());
-
- String holeCodes = "", time = "";
- if (ObjectUtil.isNotEmpty(exceptionList)) {
- holeCodes = exceptionList.stream().map(HandleException::getHoleCode).collect(Collectors.joining(",", "", ""));
- time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, exceptionList.get(0).getMapTime()) + "~" + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, exceptionList.get(exceptionList.size() - 1).getMapTime());
- }
-
- item.setExceptionNum(exceptionList.size());
- item.setHoleCodes(holeCodes);
- item.setTime(time);
- resultList.add(item);
- }
- }
- return resultList;
- }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
index a3da4d3..bbd61af 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/ProjectWorkServiceImpl.java
@@ -2,7 +2,6 @@
import com.javaweb.common.core.domain.AjaxResult;
import com.javaweb.common.exception.BusinessException;
-import com.javaweb.common.json.JSON;
import com.javaweb.common.utils.NumberUtils;
import com.javaweb.common.utils.StringUtils;
import com.javaweb.geo.domain.*;
@@ -10,9 +9,6 @@
import com.javaweb.geo.service.IProjectWorkService;
import com.javaweb.geo.vo.ProjectWorkVo;
import com.javaweb.geo.vo.YanTuVo;
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.enums.RecordType;
-import com.javaweb.platform.domain.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,431 +21,6 @@
@Autowired
private ProjectMapper projectMapper;
- @Autowired
- private HoleMapper holeMapper;
-
- @Autowired
- private HoleHuiciMapper holeHuiciMapper;
-
- @Autowired
- private HoleYantuMapper holeYantuMapper;
-
- @Autowired
- private HoleQutuMapper holeQutuMapper;
-
- @Autowired
- private HoleBiaoguanMapper holeBiaoguanMapper;
-
- @Autowired
- private HoleShuiweiMapper holeShuiweiMapper;
-
- @Autowired
- private HolePersonMapper holePersonMapper;
-
- @Autowired
- private HoleMediaMapper holeMediaMapper;
-
-
- /**
- * 宸ヤ綔閲忕粺璁�
- */
- @Override
- public AjaxResult workloadAccount(String projectId) {
- ProjectWorkVo projectWorkVo;
- try {
- projectWorkVo = getProjectWork(projectId);
- } catch (Exception e) {
- e.printStackTrace();
- return AjaxResult.error("鑾峰彇宸ヤ綔閲忕粺璁″け璐�");
- }
- return AjaxResult.success("鑾峰彇宸ヤ綔閲忕粺璁℃垚鍔�", projectWorkVo);
- }
-
- /**
- * 鑾峰彇閽诲瓟鏁版嵁
- * @param holeId
- * @return
- */
- @Override
- public AjaxResult holeRecordList(String holeId){
-
- AjaxResult ajaxResult = AjaxResult.success("鑾峰彇閽诲瓟鏁版嵁鎴愬姛");
- try{
-
- Hole hole = holeMapper.selectHoleById(holeId);
- ajaxResult.put("hole",hole);
-
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setHoleId(holeId);
- holeYantu.setIsDelete(false);
- holeYantuMapper.selectHoleYantuList(holeYantu);
- List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu);
-
- ajaxResult.put("yantuList",yantus);
-
- }catch (Exception e){
- e.printStackTrace();
- return AjaxResult.error("鍙栭捇瀛旀暟鎹け璐�");
- }
-
- return ajaxResult;
- }
-
- /**
- * 鍦拌川閽诲瓟鏌辩姸鍥�
- * @param holeId
- * @return
- */
- @Override
- public List<Map<Object, Object>> histogramJson(String holeId) {
- List<Map<Object,Object>> mapList=new ArrayList<>();
- //====================宀╁湡==================
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setHoleId(holeId);
- holeYantu.setIsDelete(false);
-
- List<HoleYantu> holeYantuList =holeYantuMapper.selectHoleYantuList(holeYantu);
-
- holeYantuList= holeYantuList.stream().filter(v->v.getBeginDepth() !=null && v.getEndDepth() !=null).collect(Collectors.toList());
- holeYantuList = holeYantuList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(HoleYantu:: getEndDepth))), ArrayList::new));
-
- try {
- holeYantuList.sort((x, y) -> Double.compare(x.getEndDepth(), y.getEndDepth()));
- }
- catch(Exception e) {
- throw new BusinessException("宀╁湡鏁版嵁鎺掑簭寮傚父:"+e.toString());
- }
- for(HoleYantu yantu:holeYantuList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", yantu.getIds());
- map.put("type", "宀╁湡");
- map.put("code", yantu.getCode());
- map.put("typeName", yantu.getFrequencyType());
- map.put("layerName", yantu.getLayerName());
- map.put("begin", yantu.getBeginDepth());
- map.put("end", yantu.getEndDepth());
- map.put("medias",new String[0]);
-
- String title="";
-
- if(!StringUtils.isEmpty(yantu.getFrequencyType())){
- title+="宀╁湡绫诲瀷锛�"+yantu.getFrequencyType()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getLayerName())){
- title+="宀╁湡瀹氬悕锛�"+yantu.getLayerName()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getYs())) {
- title+="棰滆壊锛�"+yantu.getYs()+";";
- }
- if(!StringUtils.isEmpty(yantu.getMsd())) {
- title+="瀵嗗疄搴︼細"+yantu.getMsd()+";";
- }
- if(!StringUtils.isEmpty(yantu.getSd())) {
- title+="婀垮害锛�"+yantu.getSd()+";";
- }
-
- if(!StringUtils.isEmpty(yantu.getYbljx())) {
- title+="涓�鑸矑寰勫皬锛�"+yantu.getYbljx()+";";
- }
- if(!StringUtils.isEmpty(yantu.getYbljd())) {
- title+="涓�鑸矑寰勫ぇ锛�"+yantu.getYbljd()+";";
- }
- if(!StringUtils.isEmpty(yantu.getZdlj())) {
- title+="鏈�澶х矑寰勶細"+yantu.getZdlj()+";";
- }
- if(!StringUtils.isEmpty(yantu.getZt())) {
- title+="鐘舵�侊細"+yantu.getZt()+";";
- }
- if(!StringUtils.isEmpty(yantu.getBhw())) {
- title+="鍖呭惈鐗╋細"+yantu.getBhw()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKlxz())) {
- title+="棰楃矑褰㈢姸锛�"+yantu.getKlxz()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKlpl())) {
- title+="棰楃矑鎺掑垪锛�"+yantu.getKlpl()+";";
- }
- if(!StringUtils.isEmpty(yantu.getKljp())) {
- title+="棰楃矑绾ч厤锛�"+yantu.getKljp()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- //=========================姘翠綅==================================
- HoleShuiwei holeShuiwei = new HoleShuiwei();
- holeShuiwei.setHoleId(holeId);
- holeShuiwei.setIsDelete(false);
-
- List<HoleShuiwei> shuiweiList = holeShuiweiMapper.selectHoleShuiweiList(holeShuiwei);
-
- shuiweiList=shuiweiList.stream().filter(v->v.getShownWaterLevel()!=null&&v.getStillWaterLevel()!=null).collect(Collectors.toList());
- try {
- shuiweiList.sort((x, y) -> Double.compare(x.getShownWaterLevel(),y.getShownWaterLevel()));
- }
- catch(Exception e) {
- throw new BusinessException("姘翠綅鏁版嵁鎺掑簭寮傚父:"+e.toString());
- }
- for(HoleShuiwei shuiwei:shuiweiList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", shuiwei.getIds());
- map.put("type", "姘翠綅");
- map.put("code", shuiwei.getCode());
- map.put("typeName", "鍦颁笅姘�");
- map.put("begin", shuiwei.getShownTime());
- map.put("end", shuiwei.getStillWaterLevel());
- map.put("medias",new String[0]);
- String title="";
- if(shuiwei.getShownWaterLevel() !=null){
- title+="鍒濊姘翠綅锛�"+shuiwei.getShownWaterLevel()+";";
- }
- if(shuiwei.getStillWaterLevel() !=null){
- title+="绋冲畾姘翠綅锛�"+shuiwei.getStillWaterLevel()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- try {
- mapList.sort((x, y) -> Double.compare(Double.parseDouble(x.get("begin").toString()),Double.parseDouble(y.get("begin").toString())));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- //==========================鍥炴==========================
- HoleHuici holeHuici = new HoleHuici();
- holeHuici.setHoleId(holeId);
- holeHuici.setIsDelete(false);
- List<HoleHuici> huiciList = holeHuiciMapper.selectHoleHuiciList(holeHuici);
-
- huiciList=huiciList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList());
- try {
- huiciList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleHuici huici:huiciList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", huici.getIds());
- map.put("type", "鍥炴");
- map.put("code", huici.getCode());
- map.put("typeName", huici.getFrequencyType()+'-'+huici.getFrequencyMode());
- map.put("begin", huici.getBeginDepth());
- map.put("end", huici.getEndDepth());
- map.put("medias",new String[0]);
- String title="";
- if(!StringUtils.isEmpty(huici.getFrequencyType())) {
- title+="閽昏繘鏂规硶锛�"+huici.getFrequencyType()+";";
- }
- if(!StringUtils.isEmpty(huici.getFrequencyMode())) {
- title+="鎶ゅ鏂规硶锛�"+huici.getFrequencyMode()+";";
- }
- if(huici.getAperture() !=null ) {
- title+="閽诲瓟瀛斿緞锛�"+huici.getAperture()+";";
- }
- if(huici.getBeginDepth() != null ) {
- title+="璧峰娣卞害锛�"+huici.getBeginDepth()+";";
- }
- if(huici.getEndDepth() !=null) {
- title+="缁堟娣卞害锛�"+huici.getEndDepth()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
-
- //=======================鍙栨牱 / 鍙栧湡==========================
-
- HoleQutu holeQutu = new HoleQutu();
- holeQutu.setHoleId(holeId);
- holeQutu.setIsDelete(false);
-
- List<HoleQutu> qutuList = holeQutuMapper.selectHoleQutuList(holeQutu);
-
- qutuList=qutuList.stream().filter(v->v.getBeginDepth()!=null&&v.getEndDepth()!=null).collect(Collectors.toList());
- try {
- qutuList.sort((x, y) -> Double.compare(x.getEndDepth(),y.getEndDepth()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleQutu qutu:qutuList) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", qutu.getIds());
- map.put("type", "鍙栧湡");
- map.put("code",qutu.getCode());
- map.put("typeName", "鍙栧湡");
- map.put("begin", qutu.getBeginDepth());
- map.put("end", qutu.getEndDepth());
- map.put("medias",new String[0]);
- String title="";
- if(!StringUtils.isEmpty(qutu.getEarthType())) {
- title+="鍦熸牱璐ㄩ噺绛夌骇锛�"+qutu.getEarthType()+";";
- }
- if(!StringUtils.isEmpty(qutu.getGetMode())) {
- title+="鍙栨牱宸ュ叿鍜屾柟娉曪細"+qutu.getGetMode()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
-
- //==================鍔ㄦ帰/鏍囪疮===========================
- HoleBiaoguan holeBiaoguan = new HoleBiaoguan();
- holeBiaoguan.setHoleId(holeId);
- holeBiaoguan.setIsDelete(false);
-
- List<HoleBiaoguan> biaoguanList = holeBiaoguanMapper.selectHoleBiaoguanList(holeBiaoguan);
- try {
- biaoguanList.sort((x, y) -> Double.compare(x.getBegin1(),y.getBegin1()));
- }
- catch(Exception e) {
- System.out.print(e);
- }
- for(HoleBiaoguan biaogaun:biaoguanList) {
- if(biaogaun.getBegin1() != null && biaogaun.getBegin1() !=0 ) {
- Map<Object,Object> map=new HashMap<Object,Object>();
- map.put("id", biaogaun.getIds());
- if(biaogaun.getType().equals(RecordType.dt.getId())) {
- map.put("type", "鍔ㄦ帰");
- map.put("typeName", "鍔ㄦ帰");
- }
- else if(biaogaun.getType().equals(RecordType.bg.getId())) {
- map.put("type", "鏍囪疮");
- map.put("typeName", "鏍囪疮");
- }
- map.put("code", biaogaun.getCode());
- map.put("begin", biaogaun.getBegin1());
-// Double endDepth=0.0;
- //姝ゅend 鏈夌枒闂�
- map.put("end", biaogaun.getEnd1());
- map.put("medias",new String[0]);
- String title="";
-
- if(biaogaun.getDrillLength()!=null) {
- title+="閽绘潌闀垮害锛�"+biaogaun.getDrillLength()+";";
- }
- if(biaogaun.getBegin1()!=null && biaogaun.getBlow1() !=null) {
- title+="<br/>棰勶細"+biaogaun.getBegin1()+"m~"+biaogaun.getEnd1()+"m="+biaogaun.getBlow1()+";";
- }
- if(biaogaun.getBegin2()!=null && biaogaun.getBlow2() !=null) {
- title+="<br/>1锛�"+biaogaun.getBegin2()+"m~"+biaogaun.getEnd2()+"m="+biaogaun.getBlow2()+";";
- }
- if(biaogaun.getBegin3()!=null&&biaogaun.getBlow3() !=null) {
- title+="<br/>2锛�"+biaogaun.getBegin3()+"m~"+biaogaun.getEnd3()+"m="+biaogaun.getBlow3()+";";
- }
- if(biaogaun.getBegin4()!=null&&biaogaun.getBlow4() !=null) {
- title+="<br/>3锛�"+biaogaun.getBegin4()+"m~"+biaogaun.getEnd4()+"m="+biaogaun.getBlow4()+";";
- }
- map.put("title", title);
- mapList.add(map);
- }
- }
- return mapList;
- }
-
-
- /**
- * 宸ヤ綔閲忕粺璁�
- * @param projectId
- * @return
- */
- private ProjectWorkVo getProjectWork(String projectId){
-
- // 姘翠綅 + 鍙栨按
- Long shuiWeiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.sw.getName());
- Long quShuiCount = holeShuiweiMapper.countNumberByProjectId(projectId, RecordType.qs.getName());
-
- // 鏍囪疮 + 鍔ㄦ帰
- Long biaoGuanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.bg.getName());
- Long dongKanCount = holeBiaoguanMapper.countNumberByProjectId(projectId, RecordType.dt.getName());
-
- // 鐓х墖
- Long zhaoPianCount = holeMediaMapper.countNumberByProjectId(projectId);
-
- //鍙栨牱(鍥炴)
- Long huiCiCount = holeHuiciMapper.countNumberByProjectId(projectId);
-
- //TODO 鍥炴鎬昏繘灏恒�佹�绘鏁�
-
- //TODO 宀╁湡瀵硅薄
-
- ProjectWorkVo projectWorkVo = new ProjectWorkVo();
- projectWorkVo.setHuiciCount(-1d);
- projectWorkVo.setHuiciNumber(huiCiCount);
-
- projectWorkVo.setShuiWeiNumber(shuiWeiCount);
- projectWorkVo.setQuYangNumber(huiCiCount);
- projectWorkVo.setQuShuiNumber(quShuiCount);
- projectWorkVo.setDongTanNumber(dongKanCount);
- projectWorkVo.setBiaoGuanNumber(biaoGuanCount);
- projectWorkVo.setZhaoPianNumber(zhaoPianCount);
-
- //鑾峰彇宀╁湡鐨勫璞￠泦鍚�
- List<YanTuVo> yantuList = YanTuVoList(projectId);
- projectWorkVo.setYanTuList(yantuList);
-
- return projectWorkVo;
- }
-
-
- /**
- * 鑾峰彇宀╁湡宸ヤ綔閲忚〃鏍�
- * @return
- */
- private List<YanTuVo> YanTuVoList(String projectId){
- HoleYantu holeYantu = new HoleYantu();
- holeYantu.setProjectId(projectId);
- holeYantu.setIsDelete(false);
-
- //List<HoleYantu> yantus = holeYantuMapper.selectHoleYantuList(holeYantu);
- List<HoleYantu> yantus = holeYantuMapper.selectTongjiHoleYantuList(holeYantu);
- Map <String,Integer> cishuMap= new HashMap<>();
- Map<String,Double> jinchiMap = new HashMap<>();
-
- for(HoleYantu tu : yantus){
- String ftype = tu.getFrequencyType();
- if(StringUtils.isEmpty(ftype)){
- continue;
- }
- Double begin = tu.getBeginDepth();
- Double end = tu.getEndDepth();
- if(begin==null || end ==null){
- continue;
- }
- Double total = end-begin;
- if(cishuMap.containsKey(ftype)){
- cishuMap.put(ftype,cishuMap.get(ftype)+1);
- jinchiMap.put(ftype,jinchiMap.get(ftype)+total);
- }else{
- cishuMap.put(ftype,1);
- jinchiMap.put(ftype,total);
- }
- }
- Integer CISHU = 0;
- Double JINCHI=0d;
- List<YanTuVo> list = new ArrayList<>();
- for(Map.Entry<String,Integer> entry : cishuMap.entrySet() ){
- CISHU +=entry.getValue();
- JINCHI += jinchiMap.get(entry.getKey());
-
- //璁剧疆vo瀵硅薄
- YanTuVo yanTuVo = new YanTuVo();
- yanTuVo.setFrequencyType(entry.getKey());
- yanTuVo.setCishuNumber(entry.getValue().longValue());
- yanTuVo.setJinchiCount(NumberUtils.div(jinchiMap.get(entry.getKey()),1,2));
- list.add(yanTuVo);
- }
-
- YanTuVo yan = new YanTuVo();
- yan.setFrequencyType("鎬昏");
- yan.setJinchiCount(NumberUtils.div(JINCHI,1,2));
- yan.setCishuNumber(CISHU.longValue());
-
- List<YanTuVo> result = new ArrayList<>();
- result.add(yan);
- result.addAll(list);
- return result;
- }
}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/controller/GeoDataController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/controller/GeoDataController.java
deleted file mode 100644
index 89f7eb3..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/controller/GeoDataController.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.javaweb.geotdp.controller;
-
-import javax.validation.Valid;
-
-import com.javaweb.geo.domain.HandleException;
-import com.javaweb.geo.domain.HandleOpinion;
-import com.javaweb.geotdp.vo.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import com.javaweb.common.core.controller.BaseController;
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.service.impl.GeoDataServiceImpl;
-
-@Controller
-@RequestMapping("/geotdp")
-public class GeoDataController extends BaseController {
-
- @Autowired
- private GeoDataServiceImpl geoDataServiceImpl;
-
- @PostMapping("/test")
- @ResponseBody
- public ResponseResult test() {
- return ResponseResult.success("缃戠粶閫氱晠");
- }
-
-
- /**
- * 涓婁紶鍏徃淇℃伅
- *
- * @param
- * @return
- * @throws Exception
- */
- @PostMapping("/company/uploadCompany")
- @ResponseBody
- public ResponseResult uploadCompany(@Valid @RequestBody CompanyVo companyVo, BindingResult bindingResult) throws Exception {
- if (bindingResult.hasErrors()) {
-
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.uploadCompany(companyVo);
- }
-
-
- /**
- * 涓婁紶浜哄憳
- *
- * @return
- * @throws Exception
- */
- @PostMapping("/compileUser/uploadUser")
- @ResponseBody
- public ResponseResult uploadUser(@Valid @RequestBody CompanyUserVo companyUserVo, BindingResult bindingResult) throws Exception {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.uploadUser(companyUserVo);
- }
-
-
- /**
- * 涓婁紶椤圭洰
- *
- * @return
- * @throws Exception
- */
- @PostMapping("/project/uploadProject")
- @ResponseBody
- public ResponseResult uploadProject(@Valid @RequestBody ProjectVo projectVo, BindingResult bindingResult) throws Exception {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.uploadProject(projectVo);
- }
-
-
- /**
- * 涓婁紶鍕樻帰鐐规暟鎹帴鍙�
- *
- * @return
- */
- @PostMapping("/hole/uploadHole")
- @ResponseBody
- public ResponseResult uploadHole(@Valid @RequestBody HoleVo holeVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.uploadHole(holeVo);
-
- }
-
-
- /**
- * 椤圭洰楠屾敹鎺ュ彛
- *
- * @return
- */
- @PostMapping("/project/checkComplete")
- @ResponseBody
- public ResponseResult checkComplete(@Valid @RequestBody ProjectCheckVo projectCheckVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.checkComplete(projectCheckVo);
- }
-
-
- /**
- * 椤圭洰楠屾敹鐘舵�佸彉鏇存帴鍙�
- *
- * @return
- */
- @PostMapping("/project/updateStatus")
- @ResponseBody
- public ResponseResult updateStatus(@Valid @RequestBody ProjectCheckVo projectCheckVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.updateStatus(projectCheckVo);
- }
-
-
- /**
- * 鍒犻櫎椤圭洰鎺ュ彛
- *
- * @return
- */
- @PostMapping("/project/deleteProject")
- @ResponseBody
- public ResponseResult deleteProject(@RequestBody ProjectCheckVo projectCheckVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.deleteProject(projectCheckVo);
- }
-
-
- /**
- * 鍕樻帰鐐圭姸鎬佸彉鏇存帴鍙�
- *
- * @return
- */
- @PostMapping("/hole/updateStatus")
- @ResponseBody
- public ResponseResult holeUpdateStatus(@RequestBody HoleVo holeVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.holeUpdateStatus(holeVo);
- }
-
-
- /**
- * 鑾峰彇鍔冲姟鍗曚綅鎺ュ彛
- *
- * @return
- */
- @PostMapping("/company/getLaborList")
- @ResponseBody
- public ResponseResult getLaborList(@Valid @RequestBody LaborUnitVo laborUnitVo, BindingResult bindingResult) throws Exception {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.getLaborList(laborUnitVo);
- }
-
-
- /**
- * 鑾峰彇涓夊憳淇℃伅鎺ュ彛
- *
- * @return
- */
- @PostMapping("/people/detail")
- @ResponseBody
- public ResponseResult getPeopleDetail(@Valid @RequestBody PeopleDetailVo peopleDetailVo, BindingResult bindingResult) throws Exception {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.getPeopleDetail(peopleDetailVo);
- }
-
- /**
- * 棣栭〉姹囨�绘帴鍙�
- *
- * @return
- */
- @GetMapping("/index/indexCollect")
- @ResponseBody
- public ResponseResult indexCollect() {
- return geoDataServiceImpl.indexCollect();
- }
-
- /**
- * 棣栭〉椤圭洰鐜暟閲忔眹鎬绘帴鍙�
- *
- * @return
- */
- @GetMapping("/index/indexProjectNumsCollect")
- @ResponseBody
- public ResponseResult indexProjectNumsCollect(@RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
- return geoDataServiceImpl.indexProjectNumsCollect(startTime, endTime);
- }
-
- /**
- * 涓婁紶寮傚父澶勭悊鎰忚鎺ュ彛
- */
- @PostMapping("/uploadHandle")
- @ResponseBody
- public ResponseResult uploadHandle(@Valid @RequestBody HandleOpinion handleOpinion, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.uploadHandle(handleOpinion);
- }
-
- /**
- * 鑾峰彇椤圭洰鎵�鏈夊紓甯告暟鎹帴鍙�
- */
- @PostMapping("/exception/getProjectException")
- @ResponseBody
- public ResponseResult getProjectException(@Valid @RequestBody ExceptionVo exceptionVo, BindingResult bindingResult) {
- if (bindingResult.hasErrors()) {
- return ResponseResult.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
- }
- return geoDataServiceImpl.getProjectException(exceptionVo);
- }
-
- /**
- * 鑾峰彇寮傚父璇︽儏鎺ュ彛
- */
- @GetMapping("/exception/getExceptionDetail")
- @ResponseBody
- public ResponseResult getExceptionDetail(@RequestParam("secretKey") String secretKey, @RequestParam("exceptionID") String exceptionID) {
- return geoDataServiceImpl.getExceptionDetail(secretKey,exceptionID);
- }
-
-
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/domain/ResponseResult.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/domain/ResponseResult.java
deleted file mode 100644
index f5f9e73..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/domain/ResponseResult.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.javaweb.geotdp.domain;
-
-import com.javaweb.common.utils.StringUtils;
-
-import java.util.HashMap;
-
-public class ResponseResult extends HashMap<String, Object> {
-
- private static final long serialVersionUID = 1L;
-
- /** 鐘舵�佺爜 */
- public static final String CODE_TAG = "status";
-
- /** 杩斿洖鍐呭 */
- public static final String MSG_TAG = "message";
-
- /** 鏁版嵁瀵硅薄 */
- public static final String DATA_TAG = "result";
-
-
- public static final String TOTAL = "totalPage";
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄锛屼娇鍏惰〃绀轰竴涓┖娑堟伅銆�
- */
- public ResponseResult()
- {
- }
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
- * @param bool 鐘舵�佺被鍨�
- * @param msg 杩斿洖鍐呭
- */
- public ResponseResult(Boolean bool, String msg)
- {
- super.put(CODE_TAG, bool);
- super.put(MSG_TAG, msg);
- super.put(TOTAL, 0);
- }
-
- /**
- * 鍒濆鍖栦竴涓柊鍒涘缓鐨� AjaxResult 瀵硅薄
- *
- * @param bool 鐘舵�佺被鍨�
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- */
- public ResponseResult(Boolean bool, String msg, Object data)
- {
- super.put(CODE_TAG, bool);
- super.put(MSG_TAG, msg);
- super.put(TOTAL, 0);
- if (StringUtils.isNotNull(data))
- {
- super.put(DATA_TAG, data);
- }
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @return 鎴愬姛娑堟伅
- */
- public static ResponseResult success()
- {
- return ResponseResult.success("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 杩斿洖鎴愬姛鏁版嵁
- *
- * @return 鎴愬姛娑堟伅
- */
- public static ResponseResult success(Object data)
- {
- return ResponseResult.success("鎿嶄綔鎴愬姛", data);
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 鎴愬姛娑堟伅
- */
- public static ResponseResult success(String msg)
- {
- return ResponseResult.success(msg, null);
- }
-
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 鎴愬姛娑堟伅
- */
- public static ResponseResult success(String msg, Object data)
- {
- return new ResponseResult(true, msg, data);
- }
-
-
-
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @return
- */
- public static ResponseResult error()
- {
- return ResponseResult.error("鎿嶄綔澶辫触");
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
- */
- public static ResponseResult error(String msg)
- {
- return ResponseResult.error(msg, null);
- }
-
- /**
- * 杩斿洖閿欒娑堟伅
- *
- * @param msg 杩斿洖鍐呭
- * @param data 鏁版嵁瀵硅薄
- * @return 璀﹀憡娑堟伅
- */
- public static ResponseResult error(String msg, Object data)
- {
- return new ResponseResult(false, msg, data);
- }
- /**
- * 杩斿洖鎴愬姛娑堟伅
- *
- * @param key 閿��
- * @param value 鍐呭
- * @return 鎴愬姛娑堟伅
- */
- @Override
- public ResponseResult put(String key, Object value)
- {
- super.put(key, value);
- return this;
- }
-
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/CityConst.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/CityConst.java
deleted file mode 100644
index cad7674..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/CityConst.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.javaweb.geotdp.enums;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class CityConst {
-
- private static Map<Integer,String> cityMap = new HashMap<Integer, String>();
-
- static{
- cityMap.put(1, "涓滃煄鍖�");
- cityMap.put(2, "瑗垮煄鍖�");
- cityMap.put(5, "鏈濋槼鍖�");
- cityMap.put(6, "涓板彴鍖�");
- cityMap.put(7, "鐭虫櫙灞�");
-
- cityMap.put(8, "娴锋穩鍖�");
- cityMap.put(9, "闂ㄥご娌熷尯");
-
- cityMap.put(10, "鎴垮北鍖�");
-
- cityMap.put(11, "閫氬窞鍖�");
-
- cityMap.put(12, "椤轰箟鍖�");
-
- cityMap.put(13, "鏄屽钩鍖�");
- cityMap.put(14, "澶у叴鍖�");
- cityMap.put(15, "鎬�鏌斿尯");
- cityMap.put(16, "骞宠胺鍖�");
- cityMap.put(17, "瀵嗕簯鍘�");
- cityMap.put(18, "寤跺簡鍘�");
- cityMap.put(99, "澶栧煚");
-
- }
-
- public static String getCitName(Integer key){
-
- if(key != null && cityMap.containsKey(key)){
- return cityMap.get(key);
- }
- return null;
-
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/RecordType.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/RecordType.java
deleted file mode 100644
index 84014f2..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/enums/RecordType.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.javaweb.geotdp.enums;
-
-public enum RecordType {
-
- /**
- * 浜哄憳瑙掕壊 1-绠＄悊鍛橈紝2-鏅�氳鑹诧紝3-鐩戠浜哄憳 4-鍏徃浜哄憳
- */
- role_admin("admin","绠＄悊鍛�"),
- role_common("common","鏅�氳鑹�"),
- role_jianguan("jianguan","鐩戠浜哄憳"),
- role_gongsi("gongsi","鍏徃浜哄憳"),
-
- /**
- * 璁板綍鍒嗙被锛堝繀濉紝鐩存帴濉啓姹夊瓧锛屽洜鑰冭檻鍘嗗彶鏁版嵁鍘熷洜锛�
- * 鈥滄満闀库�濊〃绀哄徃閽诲憳锛�
- * 鍥炴銆佸博鍦熴�佸彇鍦熴�佹爣璐�佸姩鎺€�佹按浣嶃�佸彇姘淬�佽礋璐ｄ汉銆佸伐绋嬪笀銆佹満闀裤�侀捇鏈�
- */
- hc("鍥炴","鍥炴"),
- yt("宀╁湡","宀╁湡"),
- qt("鍙栧湡","鍙栧湡"),
- bg("鏍囪疮","鏍囪疮"),
- dt("鍔ㄦ帰","鍔ㄦ帰"),
- sw("姘翠綅","姘翠綅"),
- qs("鍙栨按","鍙栨按"),
- fzr("璐熻矗浜�","璐熻矗浜�"),
- gcs("宸ョ▼甯�","宸ョ▼甯�"),
- jz("鏈洪暱","鏈洪暱"),
- zj("閽绘満","閽绘満"),
- msy("鎻忚堪鍛�","鎻忚堪鍛�"),
- beizhu("澶囨敞","澶囨敞"),
- changjing("鍦烘櫙","鍦烘櫙"),
- tizuanluxiang("鎻愰捇褰曞儚","鎻愰捇褰曞儚"),
-
- /**
- * 椤圭洰鐘舵��
- */
- projectStatus0("0","椤圭洰鏈畬鎴�"),
- projectStatus1("1","椤圭洰楠屾敹瀹屾垚"),
-
- /**
- * 鏄惁鍒犻櫎
- */
- isDelete0("0","鏈垹闄�"),
- isDelete1("1","宸插垹闄�"),
-
- /**
- * 鍕樻帰鐐圭姸鎬� 1-楠屾敹閫氳繃锛�2-楠屾敹涓嶉�氳繃锛�3-搴熷瓟
- */
- holeStatus1("1","楠屾敹閫氳繃"),
- holeStatus2("2","楠屾敹涓嶉�氳繃"),
- holeStatus3("3","搴熷瓟"),
-
- /**
- * 寮傚父绛夌骇 1-杞诲井锛�2-涓�鑸紝3-涓ラ噸锛�9-鏈垎绾�
- */
- exceptionLevel1("1","杞诲井"),
- exceptionLevel2("2","涓�鑸�"),
- exceptionLevel3("3","涓ラ噸"),
- exceptionLevel9("9","鏈垎绾�"),
-
- /**
- * 寮傚父绫诲瀷 1-璺濈寮傚父锛�2-鏃堕棿寮傚父锛�3-鏈畾浣嶅紓甯革紝4-(鏈娇鐢�)锛�5-浜哄憳寮傚父
- */
- exceptionType1("1","璺濈寮傚父"),
- exceptionType2("2","鏃堕棿寮傚父"),
- exceptionType3("3","鏈畾浣嶅紓甯�"),
- exceptionType4("4","(鏈娇鐢�)"),
- exceptionType5("5","浜哄憳寮傚父"),
-
- /**
- * 寮傚父鐘舵�� 1-宸插鐞嗭紝1-鏈鐞�
- */
- exceptionStatus0("0","鏈鐞�"),
- exceptionStatus1("1","宸插鐞�"),
-
- /**
- * 鏄惁琚紓甯告壂鎻忥紙0-鏈壂鎻忥紝1宸�-鎵弿锛�
- */
- isFlag0("0","鏈壂鎻�"),
- isFlag1("1","宸叉壂鎻�"),
-
- /**
- * 韬唤绫诲瀷锛�1-鎻忚堪鍛橈紱2-鍙搁捇鍛橈紱3-瀹為獙鍛橈級
- */
- peopleDetail1("1","鎻忚堪鍛�"),
- peopleDetail2("2","鍙搁捇鍛�"),
- peopleDetail3("3","瀹為獙鍛�");
-
-
- private String id ;
- private String name ;
-
- private RecordType(String id, String name) {
- this.id = id;
- this.name = name;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/service/impl/GeoDataServiceImpl.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/service/impl/GeoDataServiceImpl.java
deleted file mode 100644
index 67fb3c1..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/service/impl/GeoDataServiceImpl.java
+++ /dev/null
@@ -1,1503 +0,0 @@
-package com.javaweb.geotdp.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.javaweb.common.exception.BusinessException;
-import com.javaweb.common.json.JSON;
-import com.javaweb.common.utils.DateUtils;
-import com.javaweb.common.utils.IdGenerate;
-import com.javaweb.common.utils.NumberUtils;
-import com.javaweb.common.utils.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.javaweb.geo.domain.*;
-import com.javaweb.geo.mapper.*;
-import com.javaweb.geo.service.IDataSourceService;
-import com.javaweb.geo.service.IHandleExceptionService;
-import com.javaweb.geo.utils.ExceptionDistanceUtils;
-import com.javaweb.geo.utils.ExceptionTimeUtils;
-import com.javaweb.geo.vo.ExceptionDistanceVo;
-import com.javaweb.geo.vo.ExceptionTimeVo;
-import com.javaweb.geotdp.vo.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.yaml.snakeyaml.constructor.BaseConstructor;
-
-import com.javaweb.geotdp.domain.ResponseResult;
-import com.javaweb.geotdp.enums.RecordType;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-
-/**
- * 椤圭洰Service涓氬姟灞傚鐞�
- *
- * @author zmk
- * @date 2022-10-14
- */
-@Service
-public class GeoDataServiceImpl extends BaseConstructor {
-
- @Autowired
- private CompanyMapper companyMapper;
-
- @Autowired
- private CompanyUserMapper companyUserMapper;
-
- @Autowired
- private ProjectMapper projectMapper;
-
- @Autowired
- private HoleMapper holeMapper;
-
- @Autowired
- private HoleHuiciMapper holeHuiciMapper;
-
- @Autowired
- private HoleYantuMapper holeYantuMapper;
-
- @Autowired
- private HoleQutuMapper holeQutuMapper;
-
- @Autowired
- private HoleBiaoguanMapper holeBiaoguanMapper;
-
- @Autowired
- private HoleShuiweiMapper holeShuiweiMapper;
-
- @Autowired
- private HolePersonMapper holePersonMapper;
-
- @Autowired
- private HoleMediaMapper holeMediaMapper;
-
- @Autowired
- private LaborUnitMapper laborUnitMapper;
-
- @Autowired
- private HandleExceptionMapper handleExceptionMapper;
-
- @Autowired
- private ExceptionConfigMapper exceptionConfigMapper;
-
- @Autowired
- private CollectStatisticsMapper statisticsMapper;
-
- @Autowired
- private HandleOpinionMapper handleOpinionMapper;
-
- @Autowired
- private IDataSourceService dataSourceService;
-
- @Autowired
- private IHandleExceptionService handleExceptionService;
-
- /**
- * 涓婁紶鍏徃淇℃伅
- *
- * @return
- * @throws Exception
- */
- public ResponseResult uploadCompany(CompanyVo companyVo) throws Exception {
-
- String secretKey = companyVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- //姝ゅ闇�瑕佹牴鎹閽ュ垽鏂�
- String datasourceStr = dataSourceService.selectDataSourceBySecretKey(secretKey);
- if (StringUtils.isEmpty(datasourceStr)){
- companyVo.setDatasource("-1");
- }else {
- companyVo.setDatasource(datasourceStr);
- }
-
- Company company = new Company();
- BeanUtil.copyProperties(companyVo, company);
- String companyId = IdGenerate.nextId();
-
- // =========================鏂板銆佹洿鏂�==============================
- if (StringUtils.isEmpty(companyVo.getIds())) {
- company.setIds(companyId);
- companyVo.setIds(companyId);
- companyMapper.insertCompany(company);
-
- // 鏇存柊dataSource琛ㄤ腑鐨勬暟鎹�
- dataSourceService.updateDataSourceBySecretKey(secretKey , companyId);
- } else {
- companyMapper.updateCompany(company);
- }
-
- return ResponseResult.success("鍏徃淇℃伅涓婁紶鎴愬姛", JSON.marshal(companyVo));
- }
-
- /**
- * 涓婁紶浜哄憳
- *
- * @return
- * @throws Exception
- */
- public ResponseResult uploadUser(CompanyUserVo companyUserVo) throws Exception {
-
- String secretKey = companyUserVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦紒");
- }
-
- CompanyUser companyUser = new CompanyUser();
- BeanUtil.copyProperties(companyUserVo, companyUser);
- companyUser.setCompanyId(companyUserVo.getCompanyID());
- String userIds = companyUser.getIds();
-
- // 鏂板
- if (StringUtils.isEmpty(userIds)){
- String id = IdGenerate.nextId();
- companyUser.setIds(id);
- companyUserVo.setIds(id);
- companyUserMapper.insertCompanyUser(companyUser);
- return ResponseResult.success("浜哄憳涓婁紶鎴愬姛", JSON.marshal(companyUserVo));
- }else {
-
- // ==========================鏍￠獙鏁版嵁==========================
- Company company = companyMapper.selectCompanyById(companyUserVo.getCompanyID());
- if (ObjectUtils.isEmpty(company)){
- return ResponseResult.error("浜哄憳鏇存柊澶辫触锛屽叕鍙镐笉瀛樺湪锛侊紒");
- }
- CompanyUser companyUser1 = companyUserMapper.selectCompanyUserById(userIds);
- if (ObjectUtils.isEmpty(companyUser1)){
- return ResponseResult.error("浜哄憳鏇存柊澶辫触锛屼汉鍛樹笉瀛樺湪锛侊紒");
- }
- companyUserMapper.updateCompanyUser(companyUser);
- return ResponseResult.success("浜哄憳鏇存柊鎴愬姛", JSON.marshal(companyUserVo));
- }
- }
-
- /**
- * 涓婁紶椤圭洰
- *
- * @param projectVo
- * @return
- * @throws Exception
- */
-
- public ResponseResult uploadProject(ProjectVo projectVo) throws Exception {
- String secretKey = projectVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- // 椤圭洰搴忓垪鍙凤紙淇濆瓨鏃堕�夊～锛堝鏋滄彁渚涘垯蹇呴』淇濊瘉鍞竴锛屼笉濉垯鐢辨湇鍔＄鐢熸垚锛夛紝鏇存柊鏃跺繀濉級
- String serialNumber = projectVo.getSerialNumber();
- String companyId = projectVo.getCompanyID();
- //==============================濡傛灉涓虹┖鍒欎负淇濆瓨鎿嶄綔锛屾湇鍔＄鐢熸垚搴忓垪鍙�==========================
- if (StringUtils.isEmpty(serialNumber)) {
- String num = IdGenerate.nextId();
-
- projectVo.setSerialNumber(num);
- projectVo.setIds(IdGenerate.nextId());
- saveProject(projectVo);
- return ResponseResult.success("椤圭洰涓婁紶鎴愬姛", JSON.marshal(projectVo));
- }else {
-
- //=============================濡傛灉涓嶄负绌猴紝杩橀渶瑕佽繘涓�姝ュ垽鏂�===========================
- Project query = new Project();
- query.setCompanyId(companyId);
- query.setSerialNumber(serialNumber);
- List<Project> list = projectMapper.selectProjectList(query);
- // 濡傛灉鏌ヨ涓嶅埌搴忓垪鍙凤紝鍒欎负鏂板锛屾湇鍔＄鐢熸垚搴忓垪鍙�
- if (StringUtils.isEmpty(list)) {
- projectVo.setIds(IdGenerate.nextId());
- saveProject(projectVo);
- return ResponseResult.success("椤圭洰涓婁紶鎴愬姛", JSON.marshal(projectVo));
-
- } else {
- // 鏌ヨ鍒板簭鍒楀彿锛屽垯涓烘洿鏂�
- Project project = list.get(0);
- Project updateProject = new Project();
- BeanUtil.copyProperties(projectVo, updateProject);
- updateProject.setIds(project.getIds());
- projectVo.setIds(project.getIds());
- projectMapper.updateProject(updateProject);
- return ResponseResult.success("椤圭洰鏇存柊鎴愬姛", JSON.marshal(projectVo));
- }
- }
-
-
- }
-
- //淇濆瓨椤圭洰
- private Project saveProject(ProjectVo projectVo) {
-
- Project project = new Project();
- BeanUtil.copyProperties(projectVo, project);
- project.setCompanyId(projectVo.getCompanyID());
-
- String secretKey = projectVo.getSecretKey();
- String dataSource = dataSourceService.selectDataSourceBySecretKey(secretKey);
- project.setDataSource(dataSource);
-
- projectMapper.insertProject(project);
- return project;
- }
-
- /**
- * 涓婁紶鍕樻帰鐐规暟鎹帴鍙�
- */
- public ResponseResult uploadHole(HoleVo holeVo) {
- String secretKey = holeVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- try {
- holeVo = convertBean(holeVo);
- } catch (Exception e) {
- return ResponseResult.error("鏁版嵁涓婁紶寮傚父锛�" + e.toString());
- }
-
- try {
- Boolean resultFlag = insertHoleData(holeVo);
- if (!resultFlag) {
- return ResponseResult.error("楠屾敹瀹屾垚鐨勯」鐩互鍙婂簾瀛旂姸鎬佺殑鍕樻帰鐐癸紝鍧囦笉鍐嶆帴鏀跺悗缁暟鎹殑涓婁紶銆�");
- }
- } catch (Exception e) {
- return ResponseResult.error("鏁版嵁鍏ュ簱寮傚父锛�" + e.toString());
- }
- return ResponseResult.success("涓婁紶鎴愬姛");
- }
-
- /**
- * 鎻掑叆閽诲瓟鏁版嵁
- */
- @Transactional(rollbackFor = Exception.class)
- Boolean insertHoleData(HoleVo holeVo) {
-
- //鏍规嵁椤圭洰搴忓垪鍙锋煡鎵惧敮涓�鐨勯」鐩�
- Project project = projectMapper.selectProjectBySerialNumber(holeVo.getProjectID());
-
- // 1銆侀獙鏀跺畬鎴愮殑椤圭洰涓嶅啀鎺ユ敹鍚庣画鏁版嵁鐨勪笂浼犮��
- if (ObjectUtil.isEmpty(project)) {
- throw new BusinessException("搴忓垪鍙锋湭鏌ユ壘鍒伴」鐩�");
- }
- if (project.getStatus().equals(RecordType.projectStatus1.getId())) {
- return false;
- }
-
- // 椤圭洰鐨勪富閿甶d 鍦ㄤ笟鍔¤〃涓仛鍏宠仈瀛樺偍浣跨敤
- String projectId = project.getIds();
- Hole hole = holeMapper.selectHoleBySerNum(projectId, holeVo.getCode());
- String holeId = IdGenerate.nextId();
- // 2銆佸簾瀛旂姸鎬佺殑鍕樻帰鐐逛笉鍐嶆帴鏀跺悗缁暟鎹殑涓婁紶銆�
- if (ObjectUtil.isNotEmpty(hole) && RecordType.holeStatus3.getId().equals(hole.getStatus())) {
- return false;
- }
- boolean exsitHole = false;
- if (ObjectUtil.isNotEmpty(hole)) {
- exsitHole = true;
- holeId = hole.getIds();
- }
-
- // 鎷疯礉灞炴��
- Hole holeEntity = new Hole();
- BeanUtil.copyProperties(holeVo, holeEntity);
- holeEntity.setIds(holeId);
- holeEntity.setProjectId(projectId);
- holeEntity.setIsFlag(RecordType.isFlag0.getId());
-
- List<HoleHuici> holeHuicis = new ArrayList<>();
- List<HoleYantu> holeYantus = new ArrayList<>();
- List<HoleQutu> holeQutus = new ArrayList<>();
- List<HoleBiaoguan> holeBiaoguans = new ArrayList<>();
- List<HoleShuiwei> holeShuiweis = new ArrayList<>();
- List<HolePerson> holePersons = new ArrayList<>();
- List<HoleMedia> holeMedias = new ArrayList<>();
-
- HoleHuici holeHuici;
- HoleYantu holeYantu;
- HoleQutu holeQutu;
- HoleBiaoguan holeBiaoguan;
- HoleShuiwei holeShuiwei;
- HolePerson holePerson;
-
- //鍥炴鏁版嵁
- List<RecordHCVo> recordHCVos = holeVo.getRecordHCVos();
- for (RecordHCVo recordHCVo : recordHCVos) {
-
- holeHuici = new HoleHuici();
- BeanUtil.copyProperties(recordHCVo, holeHuici);
- holeHuici.setProjectId(projectId);
- holeHuici.setHoleId(holeId);
- holeHuicis.add(holeHuici);
-
- //濯掍綋鏁版嵁
- List<MediaVo> mediaVos = recordHCVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordHCVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
- }
-
- // 宀╁湡
- List<RecordYTVo> recordYTVos = holeVo.getRecordYTVos();
- for (RecordYTVo recordYTVo : recordYTVos) {
- holeYantu = new HoleYantu();
- BeanUtil.copyProperties(recordYTVo, holeYantu);
- holeYantu.setProjectId(projectId);
- holeYantu.setHoleId(holeId);
- holeYantu.setFrequencyType(recordYTVo.getLayerType());
- holeYantu.setLayerName(recordYTVo.getLayerName());
- holeYantus.add(holeYantu);
-
- List<MediaVo> mediaVos = recordYTVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordYTVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
- }
-
- //鍙栧湡鏁版嵁
- List<RecordQTVo> recordQTVos = holeVo.getRecordQTVos();
- for (RecordQTVo recordQTVo : recordQTVos) {
- holeQutu = new HoleQutu();
-
- BeanUtil.copyProperties(recordQTVo, holeQutu);
- holeQutu.setProjectId(projectId);
- holeQutu.setHoleId(holeId);
- holeQutus.add(holeQutu);
-
- List<MediaVo> mediaVos = recordQTVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordQTVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
-
-
- }
-
- //鏍囪疮+ 鍔ㄦ帰
- List<RecordYWVo> recordYWVos = holeVo.getRecordYWVos();
- for (RecordYWVo recordYWVo : recordYWVos) {
-
- holeBiaoguan = new HoleBiaoguan();
- BeanUtil.copyProperties(recordYWVo, holeBiaoguan);
- holeBiaoguan.setProjectId(projectId);
- holeBiaoguan.setHoleId(holeId);
- holeBiaoguans.add(holeBiaoguan);
-
- List<MediaVo> mediaVos = recordYWVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordYWVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
-
-
- }
-
- //姘翠綅
- List<RecordSWVo> recordSWVos = holeVo.getRecordSWVos();
- for (RecordSWVo recordSWVo : recordSWVos) {
-
- holeShuiwei = new HoleShuiwei();
- BeanUtil.copyProperties(recordSWVo, holeShuiwei);
- holeShuiwei.setProjectId(projectId);
- holeShuiwei.setHoleId(holeId);
- holeShuiweis.add(holeShuiwei);
-
- List<MediaVo> mediaVos = recordSWVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordSWVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
-
-
- }
-
- // 璐熻矗浜� + 宸ョ▼甯� + 鏈洪暱 + 閽绘満
- List<RecordPersonVo> recordPersonVos = holeVo.getPersonVos();
- for (RecordPersonVo recordPersonVo : recordPersonVos) {
-
- holePerson = new HolePerson();
- BeanUtil.copyProperties(recordPersonVo, holePerson);
- holePerson.setProjectId(projectId);
- holePerson.setHoleId(holeId);
- holePersons.add(holePerson);
-
- List<MediaVo> mediaVos = recordPersonVo.getMediaListStr();
- if(!ObjectUtils.isEmpty(mediaVos)){
- for (MediaVo mediaVo : mediaVos) {
- HoleMedia holeMedia = new HoleMedia();
- BeanUtil.copyProperties(mediaVo, holeMedia);
- holeMedia.setIds(IdGenerate.nextId());
- holeMedia.setRecordId(recordPersonVo.getIds());
- holeMedia.setProjectId(projectId);
- holeMedias.add(holeMedia);
- }
- }
- }
-
- // 鎻掑叆鏁版嵁
- insertHole(holeEntity, exsitHole);
- insertHuici(holeHuicis);
- insertYantu(holeYantus);
- insertQutu(holeQutus);
- insertBiaoguan(holeBiaoguans);
- insertShuiwei(holeShuiweis);
- insertPersons(holePersons);
- insertMedia(holeMedias);
-
- // 鍒犻櫎鍘嗗彶鏁版嵁
- List<DeletedVo> deletedVos = holeVo.getDeletedVos();
- deleteHistory(deletedVos);
- return true;
- }
-
-
-
- private void deleteHistory(List<DeletedVo> deletedVos){
- String[] ids = deletedVos.stream().map(DeletedVo::getIds).toArray(String[]::new);
-
- if (!ObjectUtils.isEmpty(ids)){
- holeHuiciMapper.deleteHoleHuiciByIds(ids);
- holeYantuMapper.deleteHoleYantuByIds(ids);
- holeQutuMapper.deleteHoleQutuByIds(ids);
- holeQutuMapper.deleteHoleQutuByIds(ids);
- holeBiaoguanMapper.deleteHoleBiaoguanByIds(ids);
- holeShuiweiMapper.deleteHoleShuiweiByIds(ids);
- holePersonMapper.deleteHolePersonByIds(ids);
- }
- }
-
- //鎻掑叆閽诲瓟
- @Transactional(rollbackFor = Exception.class)
- void insertHole(Hole hole, boolean isExist) {
- if (isExist) {
- holeMapper.updateHole(hole);
- } else {
- holeMapper.insertHole(hole);
- }
- }
-
- //鎻掑叆鍥炴鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertHuici(List<HoleHuici> holeHuicis) {
- if (!ObjectUtils.isEmpty(holeHuicis)){
- String[] ids = holeHuicis.stream().map(HoleHuici::getIds).toArray(String[]::new);
- holeHuiciMapper.deleteHoleHuiciByIds(ids);
- holeHuiciMapper.insertHoleHuiciList(holeHuicis);
- }
- }
-
- //鎻掑叆宀╁湡鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertYantu(List<HoleYantu> holeYantus) {
- if (!ObjectUtils.isEmpty(holeYantus)){
- String[] ids = holeYantus.stream().map(HoleYantu::getIds).toArray(String[]::new);
- holeYantuMapper.deleteHoleYantuByIds(ids);
- holeYantuMapper.insertHoleYantuList(holeYantus);
- }
- }
-
-
- //鎻掑叆鍙栧湡鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertQutu(List<HoleQutu> holeQutus) {
- if (!ObjectUtils.isEmpty(holeQutus)){
- String[] ids = holeQutus.stream().map(HoleQutu::getIds).toArray(String[]::new);
- holeQutuMapper.deleteHoleQutuByIds(ids);
- holeQutuMapper.insertHoleQutuList(holeQutus);
- }
- }
-
- //鎻掑叆鏍囪疮鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertBiaoguan(List<HoleBiaoguan> holeBiaoguans) {
- if (!ObjectUtils.isEmpty(holeBiaoguans)){
- String[] ids = holeBiaoguans.stream().map(HoleBiaoguan::getIds).toArray(String[]::new);
- holeBiaoguanMapper.deleteHoleBiaoguanByIds(ids);
- holeBiaoguanMapper.insertHoleBiaoguanList(holeBiaoguans);
- }
- }
-
- //鎻掑叆姘翠綅鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertShuiwei(List<HoleShuiwei> holeShuiweis) {
- if (!ObjectUtils.isEmpty(holeShuiweis)){
- String[] ids = holeShuiweis.stream().map(HoleShuiwei::getIds).toArray(String[]::new);
- holeShuiweiMapper.deleteHoleShuiweiByIds(ids);
- holeShuiweiMapper.insertHoleShuiweiList(holeShuiweis);
- }
- }
-
- //鎻掑叆浜哄憳
- @Transactional(rollbackFor = Exception.class)
- void insertPersons(List<HolePerson> holePersons) {
- if (!ObjectUtils.isEmpty(holePersons)){
- String[] ids = holePersons.stream().map(HolePerson::getIds).toArray(String[]::new);
- holePersonMapper.deleteHolePersonByIds(ids);
- holePersonMapper.insertHolePersonList(holePersons);
- }
- }
-
- //鎻掑叆濯掍綋鏁版嵁
- @Transactional(rollbackFor = Exception.class)
- void insertMedia(List<HoleMedia> holeMedias) {
- for (HoleMedia holeMedia : holeMedias) {
- holeMediaMapper.deleteHoleMediaByRecordId(holeMedia.getRecordId());
- holeMediaMapper.insertHoleMedia(holeMedia);
- }
- }
-
- /**
- * 杞寲鏁版嵁
- */
- HoleVo convertBean(HoleVo holeVo) {
-
- List<Object> recordList = holeVo.getRecordListStr();
-
- List<RecordHCVo> recordHCVos = new ArrayList<>();
- List<RecordYTVo> recordYTVos = new ArrayList<>();
- List<RecordQTVo> recordQTVos = new ArrayList<>();
- List<RecordYWVo> recordYWVos = new ArrayList<>();
- List<RecordSWVo> recordSWVos = new ArrayList<>();
- List<DeletedVo> deletedVos = new ArrayList<>();
- List<RecordPersonVo> recordPersonVos = new ArrayList<>();
-
-
- for (Object object : recordList) {
- JSONObject jsonObject = JSONUtil.parseObj(object);
- // 鏍规嵁绫诲瀷鍒ゆ柇锛岃浆涓轰粈涔� 瀹炰綋绫�
- String type = jsonObject.getStr("type");
-
-
- // =========================== 澶勭悊isDeleted==true 鐨勫璞� ===========================
- if (StringUtils.isEmpty(type)){
- DeletedVo deletedVo = JSONUtil.toBean(jsonObject, DeletedVo.class);
- if (deletedVo.getIsDelete()){
- deletedVos.add(deletedVo);
- }
- continue;
- }
- // =========================== 鍥炴 ===========================
- if (RecordType.hc.getName().equals(type)) {
- RecordHCVo recordHCVo = JSONUtil.toBean(jsonObject, RecordHCVo.class);
- recordHCVos.add(recordHCVo);
- // =========================== 宀╁湡 ===========================
- } else if (RecordType.yt.getName().equals(type)) {
- RecordYTVo recordYTVo = JSONUtil.toBean(jsonObject, RecordYTVo.class);
- recordYTVos.add(recordYTVo);
- // =========================== 鍙栧湡 ===========================
- } else if (RecordType.qt.getName().equals(type)) {
- RecordQTVo recordQTVo = JSONUtil.toBean(jsonObject, RecordQTVo.class);
- recordQTVos.add(recordQTVo);
- // =========================== 鏍囪疮 + 鍔ㄦ帰 ===========================
- } else if (RecordType.bg.getName().equals(type) || RecordType.dt.getName().equals(type)) {
- RecordYWVo recordYWVo = JSONUtil.toBean(jsonObject, RecordYWVo.class);
- recordYWVo.setType(type);
- recordYWVos.add(recordYWVo);
- // =========================== 姘翠綅 + 鍙栨按 ===========================
- } else if (RecordType.sw.getName().equals(type) || RecordType.qs.getName().equals(type)) {
- RecordSWVo recordSWVo = JSONUtil.toBean(jsonObject, RecordSWVo.class);
- recordSWVo.setType(type);
- recordSWVos.add(recordSWVo);
- // =========================== 璐熻矗浜� + 宸ョ▼甯� + 鏈洪暱 + 閽绘満 + 鎻忚堪鍛� + 澶囨敞 + 鍦烘櫙 + 鎻愰捇褰曞儚 ===========================
- } else if (RecordType.fzr.getName().equals(type) || RecordType.gcs.getName().equals(type)
- || RecordType.jz.getName().equals(type) || RecordType.zj.getName().equals(type)
- || RecordType.msy.getName().equals(type)|| RecordType.beizhu.getName().equals(type)
- || RecordType.changjing.getName().equals(type)|| RecordType.tizuanluxiang.getName().equals(type)) {
- RecordPersonVo recordPersonVo = JSONUtil.toBean(jsonObject, RecordPersonVo.class);
- recordPersonVo.setType(type);
- recordPersonVos.add(recordPersonVo);
- }
-
- }
- holeVo.setRecordHCVos(recordHCVos);
- holeVo.setRecordQTVos(recordQTVos);
- holeVo.setRecordSWVos(recordSWVos);
- holeVo.setRecordYTVos(recordYTVos);
- holeVo.setRecordYWVos(recordYWVos);
- holeVo.setPersonVos(recordPersonVos);
- holeVo.setDeletedVos(deletedVos);
- return holeVo;
- }
-
- /**
- * 椤圭洰楠屾敹鎺ュ彛
- *
- * @param projectCheckVo
- * @return
- */
- public ResponseResult checkComplete(ProjectCheckVo projectCheckVo) {
-
- String secretKey = projectCheckVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- if (StringUtils.isNotEmpty(projectCheckVo.getUserID())) {
- if (!checkUserIdAndUserName(projectCheckVo.getUserID(), projectCheckVo.getUserName())) {
- return ResponseResult.error("闇�鍜寀serName瀵瑰簲鐨刬ds淇濇寔涓�鑷�!");
- }
- }
-
- Project project = projectMapper.selectProjectBySerialNumber(projectCheckVo.getProjectID());
- if (ObjectUtil.isNotEmpty(project)) {
- project.setStatus(RecordType.projectStatus1.getId());
- if (projectMapper.updateProject(project) > 0) {
- return ResponseResult.success("椤圭洰楠屾敹瀹屾垚");
- }
- }
- return ResponseResult.error("椤圭洰楠屾敹閿欒锛�");
- }
-
- /**
- * 椤圭洰楠屾敹鐘舵�佸彉鏇存帴鍙�
- *
- * @return
- */
- public ResponseResult updateStatus(ProjectCheckVo projectCheckVo) {
- String secretKey = projectCheckVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- if (StringUtils.isNotEmpty(projectCheckVo.getUserID())) {
- if (!checkUserIdAndUserName(projectCheckVo.getUserID(), projectCheckVo.getUserName())) {
- return ResponseResult.error("闇�鍜寀serName瀵瑰簲鐨刬ds淇濇寔涓�鑷�!");
- }
- }
-
- Project project = projectMapper.selectProjectBySerialNumber(projectCheckVo.getProjectID());
- if (ObjectUtil.isNotEmpty(project)) {
- project.setStatus(RecordType.projectStatus0.getId());
- project.setEndTime(DateUtils.getNowDate());
- project.setStatusChangeUser(projectCheckVo.getUserName());
- project.setStatusChangeReason(projectCheckVo.getReason());
-
- if (projectMapper.updateProject(project) > 0) {
- return ResponseResult.success("椤圭洰楠屾敹鐘舵�佸彉鏇存垚鍔�");
- }
- }
- return ResponseResult.error("椤圭洰楠屾敹鐘舵�佸彉鏇撮敊璇紒");
- }
-
-
- /**
- * 鍒犻櫎椤圭洰鎺ュ彛
- *
- * @return
- */
- public ResponseResult deleteProject(ProjectCheckVo projectCheckVo) {
-
- if (StringUtils.isEmpty(projectCheckVo.getSecretKey()) || StringUtils.isEmpty(projectCheckVo.getSerialNumber())) {
- return ResponseResult.error("鍙傛暟閿欒锛�");
- }
-
- String secretKey = projectCheckVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- String serialNumber = projectCheckVo.getSerialNumber();
-
- Project project = projectMapper.selectProjectBySerialNumber(serialNumber);
- if (ObjectUtil.isNotEmpty(project)) {
- project.setIsDeleted(RecordType.isDelete1.getId());
- if (projectMapper.updateProject(project) > 0) {
- return ResponseResult.success("椤圭洰鍒犻櫎鎴愬姛");
- }
- }
- return ResponseResult.error("椤圭洰鍒犻櫎澶辫触锛�");
- }
-
- /**
- * 鍕樻帰鐐圭姸鎬佸彉鏇存帴鍙�
- *
- * @return
- */
- public ResponseResult holeUpdateStatus(HoleVo holeVo) {
- String secretKey = holeVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- String projectID = holeVo.getProjectID();
- String code = holeVo.getCode();
- String status = holeVo.getCheckStatus();
- if (StringUtils.isEmpty(projectID) || StringUtils.isEmpty(code) || StringUtils.isEmpty(status)) {
- return ResponseResult.error("鍙傛暟閿欒锛�");
- }
-
- Hole hole = holeMapper.selectHoleBySerNum(projectID, code);
- if (ObjectUtil.isNotEmpty(hole)) {
- if (hole.getStatus().equals(RecordType.holeStatus3.getId())) {
- return ResponseResult.error("搴熷瓟鐘舵�佺殑鍕樻帰鐐逛笉鑳藉啀娆′慨鏀瑰叾鐘舵�侊紝璇疯皑鎱庤皟鐢ㄥ簾瀛斿姛鑳姐��");
- }
- hole.setStatus(holeVo.getStatus());
- if (holeMapper.updateHole(hole) > 0) {
- return ResponseResult.success("鎴愬姛淇敼鍕樻帰鐐圭姸鎬侊紒");
- }
- }
- return ResponseResult.error("淇敼鍕樻帰鐐圭姸鎬佸け璐ワ紒");
- }
-
- /**
- * 鑾峰彇鍔冲姟鍗曚綅鎺ュ彛
- *
- * @return
- */
- public ResponseResult getLaborList(LaborUnitVo laborUnitVo) throws Exception {
- String secretKey = laborUnitVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- List<LaborUnit> laborUnits = laborUnitMapper.selectLaborUnitList(new LaborUnit());
- return ResponseResult.success("鑾峰彇鍔冲姟鍗曚綅鍒楄〃鎴愬姛", JSON.marshal(laborUnits));
- }
-
-
- /**
- * 鑾峰彇涓夊憳淇℃伅鎺ュ彛
- */
- public ResponseResult getPeopleDetail(PeopleDetailVo peopleDetailVo) throws Exception {
-
- String secretKey = peopleDetailVo.getSecretKey();
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- PeopleDetail peopleDetail;
- String companyId = dataSourceService.selectCompanyIdBySecretKey(secretKey);
- String paper = peopleDetailVo.getPaper();
-
- //鏌ヨcertificate_number3锛屾弿杩板憳璇佷功鍙风爜锛堟弿杩板憳瑙掕壊寤鸿濉啓锛�
- List<CompanyUser> companyUser3List = companyUserMapper.selectCompanyUserBypaper3(paper,companyId);
- if (!ObjectUtils.isEmpty(companyUser3List)){
- peopleDetail = getPeopleDetail(companyUser3List.get(0));
- peopleDetail.setState(Integer.valueOf(RecordType.peopleDetail1.getId()));
- peopleDetail.setType(Integer.valueOf(RecordType.peopleDetail1.getId()));
- return ResponseResult.success("鑾峰彇涓夊厓淇℃伅鎴愬姛", JSON.marshal(peopleDetail));
- }
-
- //鏌ヨcertificate_number4锛屽徃閽诲憳璇佷功鍙风爜锛堝徃閽诲憳瑙掕壊寤鸿濉啓锛�
- List<CompanyUser> companyUser4List = companyUserMapper.selectCompanyUserBypaper4(paper,companyId);
- if (!ObjectUtils.isEmpty(companyUser4List)){
- peopleDetail = getPeopleDetail(companyUser4List.get(0));
- peopleDetail.setState(Integer.valueOf(RecordType.peopleDetail2.getId()));
- peopleDetail.setType(Integer.valueOf(RecordType.peopleDetail2.getId()));
- return ResponseResult.success("鑾峰彇涓夊厓淇℃伅鎴愬姛", JSON.marshal(peopleDetail));
- }
-
- return ResponseResult.error("鏌ユ棤姝や汉");
- }
-
- /**
- * 杞寲鏁版嵁瀵硅薄
- */
- private PeopleDetail getPeopleDetail(CompanyUser data){
- PeopleDetail result = new PeopleDetail();
-
- String companyName = "";
- Company company = companyMapper.selectCompanyById(data.getCompanyId());
- if (!ObjectUtils.isEmpty(company)){
- companyName = company.getFullName();
- }
-
- result.setCardID(data.getIdCard());
- result.setCompany(companyName);
- result.setIds(data.getIds());
- result.setName(data.getRealName());
- result.setRemark(data.getRemark());
- result.setUpdateTime(data.getUpdateTime());
- return result;
- }
-
-
- private Boolean checkUserIdAndUserName(String userID, String userName) {
- Boolean flag = false;
-
- CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userID);
- if (ObjectUtil.isNotEmpty(companyUser) && userName.equals(companyUser.getRealName())) {
- flag = true;
- }
- return flag;
- }
-
-
- /**
- * 鎵弿寮傚父
- */
- @Transactional(rollbackFor = Exception.class)
- public void scanHandleException() {
-
- List<HandleException> handleExceptions = new ArrayList<>();
-
- // 鑾峰彇寮傚父閰嶇疆琛ㄤ腑鐨勫弬鏁帮紝鍙湁涓�鏉℃暟鎹�
- List<ExceptionConfig> configList = exceptionConfigMapper.selectExceptionConfigList(new ExceptionConfig());
- ExceptionConfig configData = configList.get(0);
-
- // 鏌ヨ鍑篎lag=0鐨勯捇瀛旇褰曪紝鐒跺悗寮�濮嬭绠�
- List<Hole> holeList = holeMapper.selectHoleListByFlag0();
- if (ObjectUtil.isNotEmpty(holeList)) {
- for (Hole hole : holeList) {
- Project project = projectMapper.selectProjectById(hole.getProjectId());
-
- HandleException timeException = timeExceptionFun(hole, configData, project);
- HandleException distanceException = distanceExceptionFun(hole, configData,project);
-
- // HandleException persionException = personException(hole, configData);
-
- if (ObjectUtil.isNotEmpty(timeException)) {
- handleExceptions.add(timeException);
- }
- if (ObjectUtil.isNotEmpty(distanceException)) {
- handleExceptions.add(distanceException);
- }
- // handleExceptions.add(persionException);
- hole.setIsFlag(RecordType.isFlag1.getId());
- holeMapper.updateHole(hole);
- }
- }
- insertHandleException(handleExceptions);
- }
-
- /**
- * TODO 浜哄憳寮傚父
- * 浠庝笟浜哄憳鎸佽瘉妫�鏌ワ細鏄�/鍚�
- * 鍦▁灏忔椂鍐呭悓鏃跺嚭鐜板湪涓や釜浠ヤ笂椤圭洰
- */
- private HandleException personException(Hole hole, ExceptionConfig configData) {
- return null;
- }
-
- private void insertHandleException(List<HandleException> handleExceptions) {
- if (ObjectUtil.isNotEmpty(handleExceptions)) {
- for (HandleException item : handleExceptions) {
- if (StringUtils.isNotEmpty(item.getIds())) {
- handleExceptionMapper.insertHandleException(item);
- } else {
- handleExceptionMapper.updateHandleException(item);
- }
- }
- }
- }
-
- /**
- * 浣嶇疆寮傚父
- * 璺濈鍩哄噯鐐瑰潗鏍囧ぇ浜巟绫�
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩噚%锛堣交寰紓甯革級
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩�20-50%锛堜竴鑸紓甯革級
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩噚%鎴栨渶澶у亸绉诲�煎ぇ浜�*绫筹紙涓ラ噸寮傚父锛�
- */
- private HandleException distanceExceptionFun(Hole hole, ExceptionConfig configData, Project project) {
- HandleException handleException = new HandleException();
-
- String companyId = "";
- if (ObjectUtil.isNotEmpty(project)) {
- companyId = project.getCompanyId();
- }
- double addrDistance = Double.parseDouble(configData.getAddrDistance());
- double addrNum1 = Double.parseDouble(configData.getAddrNum1());
- double addrNum2 = Double.parseDouble(configData.getAddrNum2());
- double addrMaxDistance = Double.parseDouble(configData.getAddrMaxDistance());
- double count = 0, max = 0;
-
- Double holeLon = hole.getLongitude();
- Double holeLat = hole.getLatitude();
- List<HoleBiaoguan> biaoguans = holeBiaoguanMapper.selectHoleBiaoguanByHoleId(hole.getIds());
- //璁＄畻鏍囪疮
- if (ObjectUtil.isNotEmpty(biaoguans)) {
- for(HoleBiaoguan o : biaoguans){
- double distance = ExceptionDistanceUtils.distance(holeLon,holeLat,o.getLongitude(),o.getLatitude());
- if (distance > addrDistance){ count++;}
- if (distance > max){ max = distance;}
- }
- }
-
-
- List<HoleHuici> holeHuicis = holeHuiciMapper.selectHoleHuiciByHoleId(hole.getIds()); // [] null
- if (ObjectUtil.isNotEmpty(holeHuicis)) {
- for(HoleHuici o : holeHuicis){
- double distance = ExceptionDistanceUtils.distance(holeLon,holeLat,o.getLongitude(),o.getLatitude());
- if (distance > addrDistance){ count++;}
- if (distance > max){ max = distance;}
- }
- }
-
-
- List<HoleQutu> qutus = holeQutuMapper.selectHoleQutuByHoleId(hole.getIds());
- if (ObjectUtil.isNotEmpty(qutus)) {
- for(HoleQutu o : qutus){
- double distance = ExceptionDistanceUtils.distance(holeLon,holeLat,o.getLongitude(),o.getLatitude());
- if (distance > addrDistance){ count++;}
- if (distance > max){ max = distance;}
- }
- }
-
-
- List<HoleShuiwei> shuiweis = holeShuiweiMapper.selectHoleShuiWeiByHoleId(hole.getIds());
- if (ObjectUtil.isNotEmpty(shuiweis)) {
- for(HoleShuiwei o : shuiweis){
- double distance = ExceptionDistanceUtils.distance(holeLon,holeLat,o.getLongitude(),o.getLatitude());
- if (distance > addrDistance){ count++;}
- if (distance > max){ max = distance;}
- }
- }
-
-
- List<HoleYantu> yantuList = holeYantuMapper.selectHoleYantuListByHoleId(hole.getIds());
- if (ObjectUtil.isNotEmpty(yantuList)) {
- for(HoleYantu o : yantuList){
- double distance = ExceptionDistanceUtils.distance(holeLon,holeLat,o.getLongitude(),o.getLatitude());
- if (distance > addrDistance){ count++;}
- if (distance > max){ max = distance;}
- }
- }
-
-
- int size = biaoguans.size() + holeHuicis.size() + qutus.size() + shuiweis.size() + yantuList.size();
- //濡傛灉閽诲瓟涓嬫棤鏁版嵁
- if (size == 0) {
- setException(handleException, hole, companyId, "鏈煡璇㈠埌鏁版嵁璁板綍", RecordType.exceptionType3.getId());
- return handleException;
- }
-
- double percent = count / size;
- percent=NumberUtils.div(percent,1,4);
-
- //濡傛灉鐧惧垎姣斾负0 涓嶆槸寮傚父鏁版嵁
- if (percent <= 0) {
- return null;
- }
-
- String desc;
- if (percent > 0 && percent < addrNum1) {
- handleException.setLevel(RecordType.exceptionLevel1.getId());
- } else if (percent > 0.2 && percent < 0.5) {
- handleException.setLevel(RecordType.exceptionLevel2.getId());
- } else if (percent > addrNum2) {
- handleException.setLevel(RecordType.exceptionLevel3.getId());
- }
- desc = percent * 100 + "%" + "鐨勮褰曡窛绂诲熀鍑嗙偣瀹氫綅鍧愭爣鐨勫亸宸秴杩�" + addrDistance + "绫�";
-
- if (max > addrMaxDistance) {
- handleException.setLevel(RecordType.exceptionLevel3.getId());
- desc = "鏈�澶ц窛绂诲熀鍑嗙偣瀹氫綅鍧愭爣鐨勫亸宸秴杩�" + addrDistance + "绫�";
- }
- setException(handleException, hole, companyId, desc, RecordType.exceptionType1.getId());
-
- return handleException;
- }
-
-
- /**
- * @param paramList 鍥炴 鏍囪疮 鍙栧湡 宀╁湡绛夐泦鍚堝弬鏁�
- * @param hole 閽诲瓟
- * @param count 璁℃暟鍣�
- * @param max 鏈�澶у�艰鏁板櫒
- * @param addrDistance 瓒呮爣鐨勮窛绂诲弬鏁�
- */
-
- private void jisuanDistanceFun(List<?> paramList, Hole hole, double count, double max, double addrDistance) {
-
- if (ObjectUtil.isNotEmpty(paramList)) {
- Double holeLon = hole.getLongitude();
- Double holeLat = hole.getLatitude();
- for (Object o : paramList) {
- double distance = 0.0d;
- if (o instanceof HoleBiaoguan) {
- distance = ExceptionDistanceUtils.distance(holeLon, holeLat, ((HoleBiaoguan) o).getLongitude(), ((HoleBiaoguan) o).getLatitude());
- } else if (o instanceof HoleHuici) {
- distance = ExceptionDistanceUtils.distance(holeLon, holeLat, ((HoleHuici) o).getLongitude(), ((HoleHuici) o).getLatitude());
- } else if (o instanceof HoleQutu) {
- distance = ExceptionDistanceUtils.distance(holeLon, holeLat, ((HoleQutu) o).getLongitude(), ((HoleQutu) o).getLatitude());
- } else if (o instanceof HoleShuiwei) {
- distance = ExceptionDistanceUtils.distance(holeLon, holeLat, ((HoleShuiwei) o).getLongitude(), ((HoleShuiwei) o).getLatitude());
- } else if (o instanceof HoleYantu) {
- distance = ExceptionDistanceUtils.distance(holeLon, holeLat, ((HoleYantu) o).getLongitude(), ((HoleYantu) o).getLatitude());
- }
- if (distance > addrDistance) {
- count++;
- }
- if (distance > max) {
- max = distance;
- }
- }
- }
- }
-
- /**
- * 鏃堕棿寮傚父
- * 閽诲瓟閫熷害澶т簬x绫�/灏忔椂
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩噚%锛堣交寰紓甯革級
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩�20-50%锛堜竴鑸紓甯革級
- * 涓斿悓涓�閽诲瓟涓嬬殑寮傚父璁板綍鍗犳瘮涓嶈秴杩噚%鎴栨渶澶ч捇杩涢�熷害澶т簬*绫筹紙涓ラ噸寮傚父锛�
- */
- public HandleException timeExceptionFun(Hole hole, ExceptionConfig configData,Project project) {
- HandleException item = new HandleException();
-
- List<HoleYantu> yantuList = holeYantuMapper.selectHoleYantuListByHoleId(hole.getIds());
-
- String companyId = "";
- if (ObjectUtil.isNotEmpty(project)) {
- companyId = project.getCompanyId();
- }
-
- // 鎵弿宀╁湡琛�
- if (ObjectUtil.isNotEmpty(yantuList)) {
- double timeSpead = Double.parseDouble(configData.getTimeSpead());
- double timeNum1 = Double.parseDouble(configData.getTimeNum1());
- double timeNum2 = Double.parseDouble(configData.getTimeNum2());
- double timeMaxSpead = Double.parseDouble(configData.getTimeMaxSpead());
-
- double count = 0;
- double max = 0;
-
- String desc = "";
- for (int i = 0; i < yantuList.size() - 1; i++) {
- HoleYantu holeYantu1 = yantuList.get(i);
- HoleYantu holeYantu2 = yantuList.get(i + 1);
- // 璁＄畻閫熷害
- Double spead = ExceptionTimeUtils.spead(holeYantu1.getGpsTime(), holeYantu1.getEndDepth(), holeYantu2.getGpsTime(), holeYantu2.getEndDepth());
- if (spead == null) {
- continue;
- }
- if (spead > timeSpead) {
- count++;
- }
- if (spead > max) {
- max = spead;
- }
- }
- //璁＄畻鐧惧垎姣�
- double percent = count / yantuList.size();
-
- if (percent <= 0) {
- //濡傛灉鐧惧垎姣斾负0 涓嶆槸寮傚父鏁版嵁
- return null;
- }
-
- if (percent > 0 && percent < timeNum1) {
- item.setLevel(RecordType.exceptionLevel1.getId());
- } else if (percent > 0.2 && percent < 0.5) {
- item.setLevel(RecordType.exceptionLevel2.getId());
- } else if (percent > timeNum2) {
- item.setLevel(RecordType.exceptionLevel3.getId());
- }
- desc = percent * 100 + "%" + "鐨勫博鍦熻褰曞嫎瀵熼�熷害瓒呰繃" + timeSpead + "绫�/灏忔椂";
- if (max > timeMaxSpead) {
- item.setLevel(RecordType.exceptionLevel3.getId());
- desc = "鏈�澶у嫎瀵熼�熷害瓒呰繃" + timeMaxSpead + "绫�/灏忔椂";
- }
- setException(item, hole, companyId, desc, RecordType.exceptionType2.getId());
- return item;
-
- } else {
- setException(item, hole, companyId, "鏈煡璇㈠埌宀╁湡鏁版嵁寮傚父", RecordType.exceptionType3.getId());
- return item;
- }
- }
-
- /**
- * 璁剧疆寮傚父淇℃伅
- *
- * @param item
- * @param hole
- * @param companyId
- * @param desc
- * @param type 寮傚父绫诲瀷
- */
- private void setException(HandleException item, Hole hole, String companyId, String desc, String type) {
- item.setIds(IdGenerate.nextId());
- item.setCompanyId(companyId);
- item.setHandleStatus(RecordType.exceptionStatus0.getId());
- item.setHoleId(hole.getIds());
- item.setHoleCode(hole.getCode());
- item.setMapTime(hole.getMapTime());
- item.setProjectId(hole.getProjectId());
- item.setType(type);
- item.setIsDelete(false);
- item.setDescription(desc);
- }
-
- /**
- * 棣栭〉姹囨��
- */
- public ResponseResult indexCollect() {
- IndexCollectVo resultData = new IndexCollectVo();
-
- // =======================椤圭洰======================
- Long allProjectNum = projectMapper.selectAllProjectNum();
- Long projectNum = projectMapper.selectProjectNum();
-
- // =======================浼佷笟=======================
- Long allCompanyNum = companyMapper.selectAllCompanyNum();
- Long companyNum = companyMapper.selectCompanyNum();
-
- // =======================鍕樻祴鐐�=======================
- Long allHoleNum = holeMapper.selectAllHoleNum();
- Long holeNum = holeMapper.selectHoleNum();
-
- // =======================杩涘昂=======================
- List<HoleYantu> yantuList1 = holeYantuMapper.selectHoleYantuByProject0();
- List<HoleYantu> yantuList2 = holeYantuMapper.selectHoleYantuByProject1();
- /**
- * 鍦ㄦ柦杩涘昂鎬婚噺
- * 娌℃湁鍦ㄦ柦杩涘昂鎬婚噺
- * 鎬昏繘灏烘�婚噺 = 鍦ㄦ柦杩涘昂鎬婚噺 + 娌℃湁鍦ㄦ柦杩涘昂鎬婚噺
- */
- double yatuNum = 0.00;
- if (ObjectUtil.isNotEmpty(yantuList1)) {
- for (HoleYantu item : yantuList1) {
- double num = NumberUtils.sub(item.getEndDepth(), item.getBeginDepth());
- yatuNum += num;
- }
- }
- double tempNum = 0.00;
- if (ObjectUtil.isNotEmpty(yantuList2)) {
- for (HoleYantu item : yantuList2) {
- double num = NumberUtils.sub(item.getEndDepth(), item.getBeginDepth());
- tempNum += num;
- }
- }
- Double allYantuNum = yatuNum + tempNum;
-
- // =======================寮傚父=======================
- Long allExceptionNum = handleExceptionMapper.selectAllExceptionNum();
- Long exceptionNum = handleExceptionMapper.selectExceptionNum();
-
- resultData.setAllProjectNum(allProjectNum);
- resultData.setProjectNum(projectNum);
- resultData.setAllCompanyNum(allCompanyNum);
- resultData.setCompanyNum(companyNum);
- resultData.setAllHoleNum(allHoleNum);
- resultData.setHoleNum(holeNum);
- resultData.setAllJinChiNum(NumberUtils.formatDouble(yatuNum));
- resultData.setJinChiNum(NumberUtils.formatDouble(allYantuNum));
- resultData.setAllExceptionNum(allExceptionNum);
- resultData.setExceptionNum(exceptionNum);
-
- return ResponseResult.success(resultData);
- }
-
- /**
- * 棣栭〉椤圭洰鏁伴噺姹囨��
- */
- public ResponseResult indexProjectNumsCollect(String startTime, String endTime) {
- List<Company> companyData = companyMapper.selectCompanProjectNums(startTime,endTime);
- return ResponseResult.success(companyData);
- }
-
-
- /**
- * 鎵弿姹囨�荤粺璁�
- */
- @Transactional(rollbackFor = Exception.class)
- public void scanCollectStatistics() {
-
- List<CollectStatistics> resultList = statisticsMapper.selectCollectStatistic();
-
- if (!ObjectUtils.isEmpty(resultList)){
- for (CollectStatistics item : resultList) {
-
- String companyId = item.getCompanyId();
-
- int holeNum = 0;
- int exceptionProject = 0;
- double yatuNum = 0.00;
-
- // 鏌ヨ浼佷笟涓嬮潰鐨勯」鐩�
- Project project = new Project();
- project.setCompanyId(companyId);
-
- List<Project> projects = projectMapper.selectProjectList(project);
-
- if (!ObjectUtils.isEmpty(projects)){
- for (Project pro : projects) {
- String projectId = pro.getIds();
-
- // =======================鍕樻帰鐐规暟閲�=======================
- int num1 = holeMapper.selectHoleNumByProjectId(projectId);
- holeNum += num1;
-
- // =======================寮傚父椤圭洰=======================
- int num2 = handleExceptionMapper.selectExceptionNumByProjectId(projectId);
- exceptionProject += num2;
-
- // =======================杩涘昂鎬婚噺=======================
- List<HoleYantu> yantuList = holeYantuMapper.selectHoleYantuByProjectId(projectId);
- if (ObjectUtil.isNotEmpty(yantuList)) {
- for (HoleYantu yantu : yantuList) {
- double num3 = NumberUtils.sub(yantu.getEndDepth(), yantu.getBeginDepth());
- yatuNum += num3;
- }
- }
- }
- }
- // =======================寮傚父鏁伴噺=======================
- int exceptionNum = handleExceptionMapper.selectExceptionNumByCompanyId(companyId);
-
- item.setIds(IdGenerate.nextId());
- item.setHoleNum((long) holeNum);
- item.setExceptionProject((long) exceptionProject);
- item.setExceptionNum((long) exceptionNum);
- item.setJinchiNum(yatuNum);
- }
- }
- insertCollectStatistics(resultList);
- }
-
- /**
- * 鏂板鎵弿姹囨�昏〃
- * ==============鍥犱负鏄畾鏃朵换鍔★紝鍏堟竻绌鸿〃閲岄潰鐨勬暟鎹紝鍐嶆柊澧�=====================
- */
- private void insertCollectStatistics(List<CollectStatistics> statistics) {
- if (!ObjectUtils.isEmpty(statistics)){
- statisticsMapper.emptyTable();
- for (CollectStatistics item : statistics) {
- if (StringUtils.isNotEmpty(item.getIds())){
- statisticsMapper.insertCollectStatistics(item);
- }else {
- statisticsMapper.updateCollectStatistics(item);
- }
- }
- }
- }
-
-
- /**
- * 涓婁紶寮傚父澶勭悊鎰忚鎺ュ彛
- */
- public ResponseResult uploadHandle(HandleOpinion handleOpinion) {
-
- if (!dataSourceService.checkSecretKey(handleOpinion.getSecretKey())){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- handleOpinion.setIds(IdGenerate.nextId());
- int i = handleOpinionMapper.insertHandleOpinion(handleOpinion);
- if (i > 0){
- return ResponseResult.success("涓婁紶鎴愬姛锛�");
- }
- return ResponseResult.error("涓婁紶澶辫触锛�");
- }
-
-
- /**
- * 鑾峰彇椤圭洰鎵�鏈夊紓甯告暟鎹帴鍙�
- * @param exceptionVo
- * @return
- */
- public ResponseResult getProjectException(ExceptionVo exceptionVo) {
- if (!dataSourceService.checkSecretKey(exceptionVo.getSecretKey())){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
-
- List<ExceptionResponseVo> resultList = new ArrayList<>();
- ExceptionResponseVo responseVo;
-
- HandleException param = new HandleException();
- param.setProjectId(exceptionVo.getProjectID());
- param.setHandleStatus(exceptionVo.getHandleStatus());
- List<HandleException> list = handleExceptionService.selectHandleExceptionList(param);
-
- if (!ObjectUtils.isEmpty(list)){
- for (HandleException item : list) {
- responseVo = new ExceptionResponseVo();
- responseVo.setDescription(item.getDescription());
- responseVo.setHandleStatus(item.getHandleStatus());
- responseVo.setHoleCode(item.getHoleCode());
- responseVo.setHoleID(item.getHoleId());
- responseVo.setIds(item.getIds());
- responseVo.setLevel(item.getLevel());
- responseVo.setType(item.getType());
- responseVo.setHandleList(getExceptionHandle(item.getProjectId()));
-
- resultList.add(responseVo);
- }
- }
- return ResponseResult.success("鑾峰彇椤圭洰鎵�鏈夊紓甯告暟鎹垚鍔�!" , resultList);
- }
-
-
- /**
- * 鏍规嵁椤圭洰搴忓垪鍙凤紝鑾峰彇ExceptionHandle淇℃伅
- */
- private List<ExceptionHandle> getExceptionHandle(String projectID){
- List<ExceptionHandle> resultList = new ArrayList<>();
- ExceptionHandle exceptionHandle = new ExceptionHandle();
-
- HandleOpinion param = new HandleOpinion();
- param.setProjectId(projectID);
- List<HandleOpinion> list = handleOpinionMapper.selectHandleOpinionList(param);
-
- if (!ObjectUtils.isEmpty(list)){
- for (HandleOpinion item : list) {
- exceptionHandle.setCreateTime(item.getCreateTime());
- exceptionHandle.setExceptionID(item.getExceptionId());
- exceptionHandle.setGroupName(item.getGroupname());
- exceptionHandle.setIds(item.getIds());
- exceptionHandle.setOpinion(item.getOpinion());
- exceptionHandle.setUserName(item.getUsername());
-
- resultList.add(exceptionHandle);
- }
- }
- return resultList;
- }
-
-
- /**
- * 鑾峰彇寮傚父璇︽儏鎺ュ彛
- */
- public ResponseResult getExceptionDetail(String secretKey, String exceptionID) {
- if (!dataSourceService.checkSecretKey(secretKey)){
- return ResponseResult.error("骞冲彴绉橀挜涓嶅瓨鍦�");
- }
- if (StringUtils.isEmpty(exceptionID)){
- return ResponseResult.error("exceptionID涓嶈兘涓虹┖");
- }
-
- ExceptionDetailVo resultData = new ExceptionDetailVo();
- List<ExceptionDetailRecordVo> detailRecordVos = new ArrayList<>();
-
- HandleException handleException = handleExceptionMapper.selectHandleExceptionById(exceptionID);
-
- HandleOpinion opinion = new HandleOpinion();
- opinion.setExceptionId(exceptionID);
- List<HandleOpinion> handleOpinions = handleOpinionMapper.selectHandleOpinionList(opinion);
-
- /**
- * 寮傚父璇︽儏鐨勭粨鏋勮鏄庡涓�
- * 璺濈寮傚父浼氳繑鍥炶鍕樻帰鐐逛笅鎵�鏈夎褰曠殑beginDepth-type锛堥櫎layerType銆乴ayerName锛夊叡9涓瓧娈靛��
- * 鏃堕棿寮傚父浼氳繑鍥炴墍鏈夊博鍦熺被鍨嬭褰曠殑beginDepth-speed鍏�12涓瓧娈靛�硷紝绗竴鏉″博鍦熻褰曠殑閫熷害涓�0锛屽悗闈㈡瘡涓�鏉¤褰曠殑閫熷害=鍜屼笂涓�鏉¤褰曠殑娣卞害宸�/鏃堕棿宸墍寰楋紱
- * 浜哄憳寮傚父浼氳繑鍥炲綋鍓嶆墍灞為」鐩墠鍚�5灏忔椂锛堣鍒欒瀹氾級褰撳墠鎻忚堪鍛樻墍鍋氬叾浠栭」鐩殑璁板綍锛宐eginDepthprojectName锛堥櫎layerType銆乴ayerName銆乻peed锛夊叡14涓瓧娈靛��
- */
- if (!ObjectUtils.isEmpty(handleException)){
- String holeId = handleException.getHoleId();
- String type = handleException.getType();
- // 璺濈寮傚父
- if (RecordType.exceptionType1.getId().equals(type)){
- detailRecordVos = getDistanceDetail(holeId);
- }
- // 鏃堕棿寮傚父
- if (RecordType.exceptionType2.getId().equals(type)){
- detailRecordVos = getTimeDetail(holeId);
- }
- // 浜哄憳寮傚父
- if (RecordType.exceptionType5.getId().equals(type)){
- detailRecordVos = getPersonDetail(holeId);
- }
- }
-
- BeanUtil.copyProperties(handleException, handleException);
- resultData.setHandleList(handleOpinions);
- resultData.setRecordList(detailRecordVos);
- return ResponseResult.success("鑾峰彇鎴愬姛",resultData);
- }
-
-
- /**
- * 璺濈寮傚父
- */
- private List<ExceptionDetailRecordVo> getDistanceDetail(String hole){
- List<ExceptionDetailRecordVo> recordVos = new ArrayList<>();
- ExceptionDetailRecordVo detailRecordVo;
-
- List<ExceptionDistanceVo> distanceVos = handleExceptionService.holeDistanceDetails(hole);
- if (!ObjectUtils.isEmpty(distanceVos)){
- for (ExceptionDistanceVo item : distanceVos) {
- detailRecordVo = new ExceptionDetailRecordVo();
- detailRecordVo.setBeginDepth(item.getBeginDepth());
- detailRecordVo.setCode(item.getCode());
- detailRecordVo.setDistance(item.getDistance());
- detailRecordVo.setEndDepth(item.getEndDepth());
- detailRecordVo.setIds(item.getIds());
- detailRecordVo.setGpsTime(item.getGpsTime());
- detailRecordVo.setLongitude(item.getLng());
- detailRecordVo.setLatitude(item.getLat());
- detailRecordVo.setType(item.getRecordType());
- recordVos.add(detailRecordVo);
- }
- }
- return recordVos;
- }
-
- /**
- * 鏃堕棿寮傚父
- */
- private List<ExceptionDetailRecordVo> getTimeDetail(String hole){
- List<ExceptionDetailRecordVo> recordVos = new ArrayList<>();
- ExceptionDetailRecordVo detailRecordVo;
-
- List<ExceptionTimeVo> timeVos = handleExceptionService.holeTimeDetails(hole);
- if (!ObjectUtils.isEmpty(timeVos)){
- for (ExceptionTimeVo item : timeVos) {
-
- detailRecordVo = new ExceptionDetailRecordVo();
- detailRecordVo.setBeginDepth(item.getBeginDepth());
- detailRecordVo.setCode(item.getCode());
- detailRecordVo.setEndDepth(item.getEndDepth());
- detailRecordVo.setIds(item.getIds());
- detailRecordVo.setGpsTime(item.getGpsTime());
- detailRecordVo.setLongitude(item.getLongitude());
- detailRecordVo.setLatitude(item.getLatitude());
- detailRecordVo.setType(item.getRecordType());
- detailRecordVo.setLayerType(item.getFrequencyType());
- detailRecordVo.setLayerName(item.getLayerName());
- detailRecordVo.setSpeed(item.getSpead());
-
- recordVos.add(detailRecordVo);
- }
- }
- return recordVos;
- }
-
- /**
- * TODO 浜哄憳寮傚父
- */
- private List<ExceptionDetailRecordVo> getPersonDetail(String hole){
- List<ExceptionDetailRecordVo> recordVos = new ArrayList<>();
-
-
- return recordVos;
- }
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyUserVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyUserVo.java
deleted file mode 100644
index 16fcfdf..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyUserVo.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.*;
-
-/**
- * 浼佷笟-浜哄憳绫�
- */
-public class CompanyUserVo {
-
-
- private String code ;// 浜哄憳缂栧彿
-
- @NotBlank(message="鐪熷疄濮撳悕涓嶈兘涓虹┖")
- private String realName ;// 鐪熷疄濮撳悕锛堝繀濉級
-
- @NotBlank(message="浼佷笟ID涓嶈兘涓虹┖")
- private String companyID ;// 浼佷笟ID锛堝繀濉級
-
- @NotBlank(message="瑙掕壊ID涓嶈兘涓虹┖")
- private String roleID ;// 瑙掕壊ID锛堝繀濉級锛�1-椤圭洰璐熻矗浜恒��2-鎶�鏈汉鍛樸��3-鎵瑰噯浜� 銆�4-鏈洪暱銆�5-鎻忚堪鍛樸��6-瀹℃牳浜恒��7-瀹″畾浜猴級
-
- @NotBlank(message="绉诲姩鐢佃瘽涓嶈兘涓虹┖")
- private String mobilePhone ;// 绉诲姩鐢佃瘽锛堝繀濉級
-
- @NotBlank(message="閭涓嶈兘涓虹┖")
- @Email(message="閭鏍煎紡涓嶆纭�")
- private String email ;// 閭锛堝繀濉級
-
- @NotBlank(message="韬唤璇佸彿涓嶈兘涓虹┖")
- private String idCard ;// 韬唤璇佸彿锛堝繀濉級
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey ;// 骞冲彴瀵嗛挜锛堝繀濉級
-
- private String ids ;// 涓婚敭锛堜繚瀛樻椂涓虹┖锛屾洿鏂版椂蹇呭～锛�
-
- private String officePhone ;// 鍔炲叕鐢佃瘽
-
- private String authorities1 ;// 鎵т笟璧勬牸璇佷功棰佸彂鏈烘瀯
-
- private String certificateNumber1 ;// 鎵т笟璧勬牸璇佷功鍙风爜
-
- private String authorities2 ;// 鑱岀О璇佷功棰佸彂鏈烘瀯
-
- private String certificateNumber2 ;// 鑱岀О璇佷功鍙风爜
-
- private String authorities3 ;// 鎻忚堪鍛樿瘉涔﹂鍙戞満鏋�
-
- private String certificateNumber3 ;// 鎻忚堪鍛樿瘉涔﹀彿鐮侊紙鎻忚堪鍛樿鑹插缓璁～鍐欙級
-
- private String authorities4 ;// 鍙搁捇鍛樿瘉涔﹂鍙戞満鏋�
-
- private String certificateNumber4 ;// 鍙搁捇鍛樿瘉涔﹀彿鐮侊紙鍙搁捇鍛樿鑹插缓璁～鍐欙級
-
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getRealName() {
- return realName;
- }
-
- public void setRealName(String realName) {
- this.realName = realName;
- }
-
- public String getCompanyID() {
- return companyID;
- }
-
- public void setCompanyID(String companyID) {
- this.companyID = companyID;
- }
-
- public String getRoleID() {
- return roleID;
- }
-
- public void setRoleID(String roleID) {
- this.roleID = roleID;
- }
-
- public String getMobilePhone() {
- return mobilePhone;
- }
-
- public void setMobilePhone(String mobilePhone) {
- this.mobilePhone = mobilePhone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getOfficePhone() {
- return officePhone;
- }
-
- public void setOfficePhone(String officePhone) {
- this.officePhone = officePhone;
- }
-
- public String getAuthorities1() {
- return authorities1;
- }
-
- public void setAuthorities1(String authorities1) {
- this.authorities1 = authorities1;
- }
-
- public String getCertificateNumber1() {
- return certificateNumber1;
- }
-
- public void setCertificateNumber1(String certificateNumber1) {
- this.certificateNumber1 = certificateNumber1;
- }
-
- public String getAuthorities2() {
- return authorities2;
- }
-
- public void setAuthorities2(String authorities2) {
- this.authorities2 = authorities2;
- }
-
- public String getCertificateNumber2() {
- return certificateNumber2;
- }
-
- public void setCertificateNumber2(String certificateNumber2) {
- this.certificateNumber2 = certificateNumber2;
- }
-
- public String getAuthorities3() {
- return authorities3;
- }
-
- public void setAuthorities3(String authorities3) {
- this.authorities3 = authorities3;
- }
-
- public String getCertificateNumber3() {
- return certificateNumber3;
- }
-
- public void setCertificateNumber3(String certificateNumber3) {
- this.certificateNumber3 = certificateNumber3;
- }
-
- public String getAuthorities4() {
- return authorities4;
- }
-
- public void setAuthorities4(String authorities4) {
- this.authorities4 = authorities4;
- }
-
- public String getCertificateNumber4() {
- return certificateNumber4;
- }
-
- public void setCertificateNumber4(String certificateNumber4) {
- this.certificateNumber4 = certificateNumber4;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyVo.java
deleted file mode 100644
index e3e81ce..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/CompanyVo.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.Range;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * 浼佷笟绫�
- */
-public class CompanyVo {
-
-
- //@NotBlank(message="鏃堕棿鍙傛暟涓嶈兘涓虹┖")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date addTime;// 娣诲姞鏃堕棿锛堝繀濉級
-
- @NotBlank(message="韬唤璇侀檮浠朵笉鑳戒负绌�")
- private String cardAnnex ; // 韬唤璇侀檮浠讹紙缃戠粶鍥剧墖鍦板潃锛夛紙蹇呭～锛�
-
- @NotBlank(message="闄勪欢鑳岄潰涓嶈兘涓虹┖")
- private String cardBackAnnex ;//闄勪欢鑳岄潰锛堢綉缁滃浘鐗囧湴鍧�锛夛紙蹇呭～锛�
-
- @Range(min =1 , max =1,message="鍩庡競缂栧彿搴旇璁剧疆涓�1")
- private Integer city; // 鍩庡競锛堝寳浜粯璁や负1锛夛紙蹇呭～锛�
- private String code ; // 浼佷笟浠ｇ爜
-
- @NotBlank(message="淇＄敤浠ｇ爜闄勪欢涓嶈兘涓虹┖")
- private String creditAnnex ;// 淇＄敤浠ｇ爜闄勪欢锛堢綉缁滃浘鐗囧湴鍧�锛夛紙蹇呭～锛�
-
-
- @NotBlank(message="淇＄敤浠ｇ爜涓嶈兘涓虹┖")
- private String creditCode;// 淇＄敤浠ｇ爜锛堝繀濉級
-
-
- /**
- * 鍖哄幙锛�1-涓滃煄鍖恒��2-瑗垮煄鍖恒��5-鏈濋槼鍖恒��6-涓板彴鍖恒��7-鐭虫櫙灞�
- * 鍖恒��8-娴锋穩鍖恒��9-闂ㄥご娌熷尯銆�10-鎴垮北鍖恒��11-閫氬窞鍖恒��12-椤轰箟
- * 鍖恒��13-鏄屽钩鍖恒��14-澶у叴鍖恒��15-鎬�鏌斿尯銆�16-骞宠胺鍖恒��17-瀵嗕簯
- * 鍘裤��18-寤跺簡鍘裤��99-澶栧煚锛夛紙蹇呭～锛�
- */
-
- @Range(min =1 , max =99,message="鍦板尯缂栧彿涓嶅悎娉�")
- private Integer district ;
-
- @NotBlank(message="浼佷笟鍚嶇О涓嶈兘涓虹┖")
- private String fullName;// 浼佷笟鍚嶇О锛堝繀濉級
-
- @Size(min=18,max=18,message="韬唤璇佷笉鑳戒负绌�,闀垮害涓�18浣�")
- private String idCard ;// 韬唤璇侊紙蹇呭～锛�
-
- private String ids ;// 涓婚敭锛堟柊寤烘椂涓虹┖锛屾洿鏂版椂蹇呭～锛�
-
- @NotBlank(message="娉曚汉涓嶈兘涓虹┖")
- private String legalPerson ;// 娉曚汉锛堝繀濉級
-
- @NotBlank(message="娉曚汉鐢佃瘽涓嶈兘涓虹┖")
- private String legalPersonPhone ;// 娉曚汉鐢佃瘽锛堝繀濉級
-
-
- @NotBlank(message="濮旀墭涔﹂檮浠朵笉鑳戒负绌�")
- private String powerOfAttorneyAnnex ;// 濮旀墭涔﹂檮浠讹紙缃戠粶鍥剧墖鍦板潃锛夛紙蹇呭～锛�
-
- @Range(min =1 , max =1,message="鐪佷唤缂栫爜璁剧疆涓�1")
- private Integer province ;// 鐪佷唤锛堝寳浜粯璁や负1锛夛紙蹇呭～锛�
-
- private String regAddress ;// 娉ㄥ唽鍦板潃
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey;// 骞冲彴瀵嗛挜锛堝繀濉級
-
- private String nature ;// 浼佷笟鎬ц川
-
- private String position ;// 鑱屽姟
-
- private String certificationsCode ;// 璧勮川璇佷功缂栧彿
-
- private String certificationsAnnex ;// 璧勮川璇佷功闄勪欢锛堢綉缁滃浘鐗囧湴鍧�锛�
-
- private String description ;// 浼佷笟鎻忚堪
-
- private String certificationsCode2 ;// 璧勮川璇佷功缂栧彿2
-
- private String certificationsAnnex2 ;// 璧勮川璇佷功闄勪欢2锛堢綉缁滃浘鐗囧湴鍧�锛�
-
- private String userName ;// 鑱旂郴浜�
-
- private String userPhone ;// 鑱旂郴浜鸿仈绯绘柟寮�
-
- private String category ;// 璧勮川绫诲埆锛�1-涓�绫汇��2-浜岀被锛�
-
- private String datasource;//鏁版嵁鏉ユ簮
-
-
-
-
- public String getDatasource() {
- return datasource;
- }
-
- public void setDatasource(String datasource) {
- this.datasource = datasource;
- }
-
- public Date getAddTime() {
- return addTime;
- }
-
- public void setAddTime(Date addTime) {
- this.addTime = addTime;
- }
-
- public String getCardAnnex() {
- return cardAnnex;
- }
-
- public void setCardAnnex(String cardAnnex) {
- this.cardAnnex = cardAnnex;
- }
-
- public String getCardBackAnnex() {
- return cardBackAnnex;
- }
-
- public void setCardBackAnnex(String cardBackAnnex) {
- this.cardBackAnnex = cardBackAnnex;
- }
-
- public Integer getCity() {
- return city;
- }
-
- public void setCity(Integer city) {
- this.city = city;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getCreditAnnex() {
- return creditAnnex;
- }
-
- public void setCreditAnnex(String creditAnnex) {
- this.creditAnnex = creditAnnex;
- }
-
- public String getCreditCode() {
- return creditCode;
- }
-
- public void setCreditCode(String creditCode) {
- this.creditCode = creditCode;
- }
-
- public Integer getDistrict() {
- return district;
- }
-
- public void setDistrict(Integer district) {
- this.district = district;
- }
-
- public String getFullName() {
- return fullName;
- }
-
- public void setFullName(String fullName) {
- this.fullName = fullName;
- }
-
- public String getIdCard() {
- return idCard;
- }
-
- public void setIdCard(String idCard) {
- this.idCard = idCard;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getLegalPerson() {
- return legalPerson;
- }
-
- public void setLegalPerson(String legalPerson) {
- this.legalPerson = legalPerson;
- }
-
- public String getLegalPersonPhone() {
- return legalPersonPhone;
- }
-
- public void setLegalPersonPhone(String legalPersonPhone) {
- this.legalPersonPhone = legalPersonPhone;
- }
-
- public String getPowerOfAttorneyAnnex() {
- return powerOfAttorneyAnnex;
- }
-
- public void setPowerOfAttorneyAnnex(String powerOfAttorneyAnnex) {
- this.powerOfAttorneyAnnex = powerOfAttorneyAnnex;
- }
-
- public Integer getProvince() {
- return province;
- }
-
- public void setProvince(Integer province) {
- this.province = province;
- }
-
- public String getRegAddress() {
- return regAddress;
- }
-
- public void setRegAddress(String regAddress) {
- this.regAddress = regAddress;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getNature() {
- return nature;
- }
-
- public void setNature(String nature) {
- this.nature = nature;
- }
-
- public String getPosition() {
- return position;
- }
-
- public void setPosition(String position) {
- this.position = position;
- }
-
- public String getCertificationsCode() {
- return certificationsCode;
- }
-
- public void setCertificationsCode(String certificationsCode) {
- this.certificationsCode = certificationsCode;
- }
-
- public String getCertificationsAnnex() {
- return certificationsAnnex;
- }
-
- public void setCertificationsAnnex(String certificationsAnnex) {
- this.certificationsAnnex = certificationsAnnex;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getCertificationsCode2() {
- return certificationsCode2;
- }
-
- public void setCertificationsCode2(String certificationsCode2) {
- this.certificationsCode2 = certificationsCode2;
- }
-
- public String getCertificationsAnnex2() {
- return certificationsAnnex2;
- }
-
- public void setCertificationsAnnex2(String certificationsAnnex2) {
- this.certificationsAnnex2 = certificationsAnnex2;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getUserPhone() {
- return userPhone;
- }
-
- public void setUserPhone(String userPhone) {
- this.userPhone = userPhone;
- }
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/DeletedVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/DeletedVo.java
deleted file mode 100644
index 95d7f05..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/DeletedVo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-/**
- * @author mzy-cxy
- */
-public class DeletedVo extends RecordBaseVo{
-
-
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailRecordVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailRecordVo.java
deleted file mode 100644
index b054a5f..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailRecordVo.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-
-/**
- * @author mzy-cxy
- *
- * 璺濈寮傚父浼氳繑鍥炶鍕樻帰鐐逛笅鎵�鏈夎褰曠殑beginDepth-type锛堥櫎layerType銆乴ayerName锛夊叡9涓瓧娈靛�硷紱
- * 鏃堕棿寮傚父浼氳繑鍥炴墍鏈夊博鍦熺被鍨嬭褰曠殑beginDepth-speed鍏�12涓瓧娈靛�硷紝绗竴鏉″博鍦熻褰曠殑閫熷害涓�0锛屽悗闈㈡瘡涓�鏉¤褰曠殑閫熷害=鍜屼笂涓�鏉¤褰曠殑娣卞害宸�/鏃堕棿宸墍寰楋紱
- * 浜哄憳寮傚父浼氳繑鍥炲綋鍓嶆墍灞為」鐩墠鍚�5灏忔椂锛堣鍒欒瀹氾級褰撳墠鎻忚堪鍛樻墍鍋氬叾浠栭」鐩殑璁板綍锛宐eginDepthprojectName锛堥櫎layerType銆乴ayerName銆乻peed锛夊叡14涓瓧娈靛�笺��
- */
-public class ExceptionDetailRecordVo {
-
- /** 璁板綍璧峰娣卞害 */
- private Double beginDepth;
-
- /** 璁板綍缂栧彿 */
- private String code;
-
- /** 璁板綍涓庡熀鍑嗙偣瀹氫綅鍧愭爣鐨勫亸绉诲�� */
- private Double distance;
-
- /** 璁板綍缁堟娣卞害 */
- private Double endDepth;
-
- /** 璁板綍瀹氫綅鏃堕棿 */
- private Date gpsTime;
-
- /** 璁板綍ids */
- private String ids;
-
- /** 宀╁湡绫诲瀷锛堟椂闂村紓甯告瀛楁鎵嶆湁鍊硷級 */
- private String layerType;
-
- /** 宀╁湡瀹氬悕锛堟椂闂村紓甯告瀛楁鎵嶆湁鍊硷級 */
- private String layerName;
-
- /** 璁板綍绾害鍧愭爣 */
- private Double latitude;
-
- /** 璁板綍缁忓害鍧愭爣 */
- private Double longitude;
-
- /** 璁板綍绫诲瀷 */
- private String type;
-
- /** 閽绘帰閫熷害锛堟椂闂村紓甯告墠浼氭湁姝ゅ瓧娈碉級 */
- private Double speed;
-
- /** 寮傚父浜哄憳id锛堜汉鍛樺紓甯告墠浼氭湁姝ゅ瓧娈碉級 */
- private String userID;
-
- /** 鍕樻帰鐐圭紪鍙凤紙浜哄憳寮傚父鎵嶄細鏈夋瀛楁锛� */
- private String holeCode;
-
- /** 骞冲彴绔嫎鎺㈢偣ids锛堜汉鍛樺紓甯告墠浼氭湁姝ゅ瓧娈碉級 */
- private String holeID;
-
- /** 椤圭洰搴忓垪鍙凤紙浜哄憳寮傚父鎵嶄細鏈夋瀛楁锛� */
- private String projectID;
-
- /** 椤圭洰鍚嶇О锛堜汉鍛樺紓甯告墠浼氭湁姝ゅ瓧娈碉級 */
- private String projectName;
-
-
-
- public Double getBeginDepth() {
- return beginDepth;
- }
-
- public void setBeginDepth(Double beginDepth) {
- this.beginDepth = beginDepth;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public Double getDistance() {
- return distance;
- }
-
- public void setDistance(Double distance) {
- this.distance = distance;
- }
-
- public Double getEndDepth() {
- return endDepth;
- }
-
- public void setEndDepth(Double endDepth) {
- this.endDepth = endDepth;
- }
-
- public Date getGpsTime() {
- return gpsTime;
- }
-
- public void setGpsTime(Date gpsTime) {
- this.gpsTime = gpsTime;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getLayerType() {
- return layerType;
- }
-
- public void setLayerType(String layerType) {
- this.layerType = layerType;
- }
-
- public String getLayerName() {
- return layerName;
- }
-
- public void setLayerName(String layerName) {
- this.layerName = layerName;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Double getSpeed() {
- return speed;
- }
-
- public void setSpeed(Double speed) {
- this.speed = speed;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getHoleCode() {
- return holeCode;
- }
-
- public void setHoleCode(String holeCode) {
- this.holeCode = holeCode;
- }
-
- public String getHoleID() {
- return holeID;
- }
-
- public void setHoleID(String holeID) {
- this.holeID = holeID;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailVo.java
deleted file mode 100644
index 7ebfa38..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionDetailVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import com.javaweb.geo.domain.HandleException;
-import com.javaweb.geo.domain.HandleOpinion;
-
-import java.util.List;
-
-/**
- * @author mzy-cxy
- */
-public class ExceptionDetailVo extends HandleException {
-
- /**
- * 寮傚父澶勭悊鎰忚
- */
- private List<HandleOpinion> handleList;
-
- /**
- * 寮傚父璇︽儏
- */
- private List<ExceptionDetailRecordVo> recordList;
-
-
- public List<HandleOpinion> getHandleList() {
- return handleList;
- }
-
- public void setHandleList(List<HandleOpinion> handleList) {
- this.handleList = handleList;
- }
-
- public List<ExceptionDetailRecordVo> getRecordList() {
- return recordList;
- }
-
- public void setRecordList(List<ExceptionDetailRecordVo> recordList) {
- this.recordList = recordList;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionHandle.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionHandle.java
deleted file mode 100644
index 3ff8038..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionHandle.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-
-/**
- * @author mzy-cxy
- */
-public class ExceptionHandle {
-
- /** 濉啓澶勭悊鎰忚鏃堕棿 */
- private Date createTime;
-
- /** 寮傚父ids */
- private String exceptionID;
-
- /** 椤圭洰搴忓垪鍙� */
- private String projectID;
-
- /** 骞冲彴绔叕鍙竔ds */
- private String companyID;
-
- /** 濉啓鎰忚鐨勪汉鍛樿鑹� */
- private String groupName;
-
- /** 鎰忚ids */
- private String ids;
-
- /** 寮傚父澶勭悊鎰忚 */
- private String opinion;
-
- /** 濉啓鎰忚鐨勪汉鍛樺鍚� */
- private String userName;
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getExceptionID() {
- return exceptionID;
- }
-
- public void setExceptionID(String exceptionID) {
- this.exceptionID = exceptionID;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public String getCompanyID() {
- return companyID;
- }
-
- public void setCompanyID(String companyID) {
- this.companyID = companyID;
- }
-
- public String getGroupName() {
- return groupName;
- }
-
- public void setGroupName(String groupName) {
- this.groupName = groupName;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getOpinion() {
- return opinion;
- }
-
- public void setOpinion(String opinion) {
- this.opinion = opinion;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionResponseVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionResponseVo.java
deleted file mode 100644
index d41b71b..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionResponseVo.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author mzy-cxy
- */
-public class ExceptionResponseVo {
-
- /** 骞冲彴绔叕鍙竔ds */
- private String companyID;
-
- /** 寮傚父鎻忚堪 */
- private String description;
-
- /** 澶勭悊鎰忚鍒楄〃 */
- private List<ExceptionHandle> handleList;
-
- /** 澶勭悊鐘舵�侊紙0-鏈鐞嗭紝1-宸插鐞嗭級 */
- private String handleStatus;
-
- /** 鍕樻帰鐐圭紪鍙� */
- private String holeCode;
-
- /** 骞冲彴绔嫎鎺㈢偣ids */
- private String holeID;
-
- /** 寮傚父ids */
- private String ids;
-
- /** 寮傚父绛夌骇锛�1-杞诲井锛�2-涓�鑸紝3-涓ラ噸锛�9-鏈垎绾э級 */
- private String level;
-
- /** 寮傚父鏃堕棿锛堝嫎鎺㈢偣鍩哄噯瀹氫綅鏃堕棿锛�*/
- private Date mapTime;
-
- /** 椤圭洰搴忓垪鍙� */
- private String projectID;
-
- /** 寮傚父绫诲瀷锛�1-璺濈寮傚父锛�2-鏃堕棿寮傚父锛�3-鏈畾浣嶅紓甯革紝 4-(鏈娇鐢�)锛�5-浜哄憳寮傚父锛�*/
- private String type;
-
- public String getCompanyID() {
- return companyID;
- }
-
- public void setCompanyID(String companyID) {
- this.companyID = companyID;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public List<ExceptionHandle> getHandleList() {
- return handleList;
- }
-
- public void setHandleList(List<ExceptionHandle> handleList) {
- this.handleList = handleList;
- }
-
- public String getHandleStatus() {
- return handleStatus;
- }
-
- public void setHandleStatus(String handleStatus) {
- this.handleStatus = handleStatus;
- }
-
- public String getHoleCode() {
- return holeCode;
- }
-
- public void setHoleCode(String holeCode) {
- this.holeCode = holeCode;
- }
-
- public String getHoleID() {
- return holeID;
- }
-
- public void setHoleID(String holeID) {
- this.holeID = holeID;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getLevel() {
- return level;
- }
-
- public void setLevel(String level) {
- this.level = level;
- }
-
- public Date getMapTime() {
- return mapTime;
- }
-
- public void setMapTime(Date mapTime) {
- this.mapTime = mapTime;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionVo.java
deleted file mode 100644
index fcb6684..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ExceptionVo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author mzy-cxy
- */
-public class ExceptionVo {
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey;
-
- @NotBlank(message="椤圭洰搴忓垪鍙蜂笉鑳戒负绌�")
- private String projectID;
-
- private String handleStatus;
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public String getHandleStatus() {
- return handleStatus;
- }
-
- public void setHandleStatus(String handleStatus) {
- this.handleStatus = handleStatus;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/HoleVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/HoleVo.java
deleted file mode 100644
index 12e8fab..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/HoleVo.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-import java.util.List;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.validator.constraints.Range;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 閽诲瓟
- *
- * @author ZMK
- */
-public class HoleVo {
-
- private String secretKey;
-
- @NotBlank(message = "椤圭洰搴忓垪鍙蜂笉鑳戒负绌�")
- private String projectID; //椤圭洰搴忓垪鍙凤紙蹇呭～锛�
-
- @NotBlank(message = "鍕樻帰鐐圭紪鍙蜂笉鑳戒负绌�")
- private String code; //鍕樻帰鐐圭紪鍙凤紙蹇呭～锛屽尯鍒嗕笉鍚屽嫎鎺㈢偣鐨勫敮涓�鏍囪瘑锛�
-
- @NotNull(message = "娣诲姞鏃堕棿涓嶈兘涓虹┖")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date createTime; // 娣诲姞鏃堕棿锛堝繀濉級
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date updateTime; // 淇敼鏃堕棿
-
-
- private String description;// 鎻忚堪銆佹妧鏈姹�
-
- @NotBlank(message = "鍕樻帰鐐圭紪鍙蜂笉鑳戒负绌�")
- private String type; //鍕樻帰鐐圭被鍨嬶紙1-鎺簳銆�2-閽诲瓟锛夛紙蹇呭～锛�
-
- private String elevation; // 瀛斿彛楂樼▼(鏍囬珮)
-
- @Min(value = 0)
- private Double depth; // 璁捐瀛旀繁锛堝繀濉級
-
-
- private Double longitude; // 鍕樻帰鐐圭粡搴�
- private Double latitude; // 鍕樻帰鐐圭含搴�
- private Double surveyX; // 鐩稿鍧愭爣X
- private Double surveyY; // 鐩稿鍧愭爣Y
- private Double surveyZ; // 鐩稿鍧愭爣Z
-
-
- private Double surveyLatitude; // 娴嬮噺鍧愭爣绾害
- private Double surveyLongitude; // 娴嬮噺鍧愭爣缁忓害
- private Double mapLatitude; // 閽诲瓟瀹氫綅绾害锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
- private Double mapLongitude; // 閽诲瓟瀹氫綅缁忓害锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
-
- private String mapTime; // 閽诲瓟瀹氫綅鏃堕棿锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
- private String position; // 鏃犳硶瀹氫綅鐨勫湴鐐癸紙浠ヤ笅6椤瑰彧鏈夊湪鏃犳硶瀹氫綅鏃舵墠闇�瑕佸～鍐欙級
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date locateTime; // 鏃犳硶瀹氫綅鐨勬椂闂�
- private String reason; // 鏃犳硶瀹氫綅鐨勫師鍥�
- private String pic1; // 鐜板満鎷嶇収1
- private String pic2; // 鐜板満鎷嶇収2
- private String pic3; //鐜板満鎷嶇収3
-
- private String status; //閽诲瓟鐘舵�侊紙1-楠屾敹閫氳繃锛�2-楠屾敹涓嶉�氳繃锛�3-搴熷瓟锛�
- private String checkStatus; //閽诲瓟鐘舵�侊紙1-楠屾敹閫氳繃锛�2-楠屾敹涓嶉�氳繃锛�3-搴熷瓟锛�
-
- private List<Object> recordListStr;//濉啓鐨勮褰曪紝闇�瑕佸垎绫诲瀷鍒ゆ柇
-
-
- private List<RecordHCVo> recordHCVos;//鍥炴
-
-
- private List<RecordQTVo> recordQTVos;//鍙栧湡
-
- private List<RecordSWVo> recordSWVos;//姘翠綅
-
-
- private List<RecordYTVo> recordYTVos;//宀╁湡
-
-
- private List<RecordPersonVo> personVos;//鍙搁捇鍛� 鎻忚堪鍛� 鏈洪暱 閽绘満
-
-
- private List<RecordYWVo> recordYWVos;//鍘熶綅娴嬭瘯 璁板綍-鏍囪疮 璁板綍-鍔ㄦ帰
-
- private List<DeletedVo> deletedVos; // 鍘嗗彶鏁版嵁鏄惁鍒犻櫎
-
- public List<RecordHCVo> getRecordHCVos() {
- return recordHCVos;
- }
-
- public List<RecordQTVo> getRecordQTVos() {
- return recordQTVos;
- }
-
- public List<RecordSWVo> getRecordSWVos() {
- return recordSWVos;
- }
-
- public List<RecordYTVo> getRecordYTVos() {
- return recordYTVos;
- }
-
- public List<RecordPersonVo> getPersonVos() {
- return personVos;
- }
-
- public List<RecordYWVo> getRecordYWVos() {
- return recordYWVos;
- }
-
- public void setRecordHCVos(List<RecordHCVo> recordHCVos) {
- this.recordHCVos = recordHCVos;
- }
-
- public void setRecordQTVos(List<RecordQTVo> recordQTVos) {
- this.recordQTVos = recordQTVos;
- }
-
- public void setRecordSWVos(List<RecordSWVo> recordSWVos) {
- this.recordSWVos = recordSWVos;
- }
-
- public void setRecordYTVos(List<RecordYTVo> recordYTVos) {
- this.recordYTVos = recordYTVos;
- }
-
- public void setPersonVos(List<RecordPersonVo> personVos) {
- this.personVos = personVos;
- }
-
- public void setRecordYWVos(List<RecordYWVo> recordYWVos) {
- this.recordYWVos = recordYWVos;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public String getCode() {
- return code;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getType() {
- return type;
- }
-
- public String getElevation() {
- return elevation;
- }
-
- public Double getDepth() {
- return depth;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public Double getSurveyX() {
- return surveyX;
- }
-
- public Double getSurveyY() {
- return surveyY;
- }
-
- public Double getSurveyZ() {
- return surveyZ;
- }
-
- public Double getSurveyLatitude() {
- return surveyLatitude;
- }
-
- public Double getSurveyLongitude() {
- return surveyLongitude;
- }
-
- public Double getMapLatitude() {
- return mapLatitude;
- }
-
- public Double getMapLongitude() {
- return mapLongitude;
- }
-
- public String getMapTime() {
- return mapTime;
- }
-
- public String getPosition() {
- return position;
- }
-
- public Date getLocateTime() {
- return locateTime;
- }
-
- public String getReason() {
- return reason;
- }
-
- public String getPic1() {
- return pic1;
- }
-
- public String getPic2() {
- return pic2;
- }
-
- public String getPic3() {
- return pic3;
- }
-
- public List<Object> getRecordListStr() {
- return recordListStr;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public void setElevation(String elevation) {
- this.elevation = elevation;
- }
-
- public void setDepth(Double depth) {
- this.depth = depth;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public void setSurveyX(Double surveyX) {
- this.surveyX = surveyX;
- }
-
- public void setSurveyY(Double surveyY) {
- this.surveyY = surveyY;
- }
-
- public void setSurveyZ(Double surveyZ) {
- this.surveyZ = surveyZ;
- }
-
- public void setSurveyLatitude(Double surveyLatitude) {
- this.surveyLatitude = surveyLatitude;
- }
-
- public void setSurveyLongitude(Double surveyLongitude) {
- this.surveyLongitude = surveyLongitude;
- }
-
- public void setMapLatitude(Double mapLatitude) {
- this.mapLatitude = mapLatitude;
- }
-
- public void setMapLongitude(Double mapLongitude) {
- this.mapLongitude = mapLongitude;
- }
-
- public void setMapTime(String mapTime) {
- this.mapTime = mapTime;
- }
-
- public void setPosition(String position) {
- this.position = position;
- }
-
- public void setLocateTime(Date locateTime) {
- this.locateTime = locateTime;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public void setPic1(String pic1) {
- this.pic1 = pic1;
- }
-
- public void setPic2(String pic2) {
- this.pic2 = pic2;
- }
-
- public void setPic3(String pic3) {
- this.pic3 = pic3;
- }
-
- public void setRecordListStr(List<Object> recordListStr) {
- this.recordListStr = recordListStr;
- }
-
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getCheckStatus() {
- return checkStatus;
- }
-
- public void setCheckStatus(String checkStatus) {
- this.checkStatus = checkStatus;
- }
-
- public List<DeletedVo> getDeletedVos() {
- return deletedVos;
- }
-
- public void setDeletedVos(List<DeletedVo> deletedVos) {
- this.deletedVos = deletedVos;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/IndexCollectVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/IndexCollectVo.java
deleted file mode 100644
index 3a6f97e..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/IndexCollectVo.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import com.javaweb.geo.domain.Company;
-
-import java.util.List;
-
-/**
- * @author mzy-cxy
- */
-public class IndexCollectVo {
-
- /**椤圭洰鏁伴噺*/
- private Long allProjectNum;
-
- /***/
- private Long projectNum;
-
- /**浼佷笟鏁伴噺*/
- private Long allCompanyNum;
-
- /***/
- private Long companyNum;
-
- /**鍕樻祴鐐规暟閲�*/
- private Long allHoleNum;
-
- /***/
- private Long holeNum;
-
- /**杩涘昂鏁伴噺*/
- private String allJinChiNum;
-
- /***/
- private String jinChiNum;
-
- /**寮傚父鏁伴噺*/
- private Long allExceptionNum;
-
- /**/
- private Long exceptionNum;
-
- public Long getAllProjectNum() {
- return allProjectNum;
- }
-
- public void setAllProjectNum(Long allProjectNum) {
- this.allProjectNum = allProjectNum;
- }
-
- public Long getProjectNum() {
- return projectNum;
- }
-
- public void setProjectNum(Long projectNum) {
- this.projectNum = projectNum;
- }
-
- public Long getAllCompanyNum() {
- return allCompanyNum;
- }
-
- public void setAllCompanyNum(Long allCompanyNum) {
- this.allCompanyNum = allCompanyNum;
- }
-
- public Long getCompanyNum() {
- return companyNum;
- }
-
- public void setCompanyNum(Long companyNum) {
- this.companyNum = companyNum;
- }
-
- public Long getAllHoleNum() {
- return allHoleNum;
- }
-
- public void setAllHoleNum(Long allHoleNum) {
- this.allHoleNum = allHoleNum;
- }
-
- public Long getHoleNum() {
- return holeNum;
- }
-
- public void setHoleNum(Long holeNum) {
- this.holeNum = holeNum;
- }
-
- public String getAllJinChiNum() {
- return allJinChiNum;
- }
-
- public void setAllJinChiNum(String allJinChiNum) {
- this.allJinChiNum = allJinChiNum;
- }
-
- public String getJinChiNum() {
- return jinChiNum;
- }
-
- public void setJinChiNum(String jinChiNum) {
- this.jinChiNum = jinChiNum;
- }
-
- public Long getAllExceptionNum() {
- return allExceptionNum;
- }
-
- public void setAllExceptionNum(Long allExceptionNum) {
- this.allExceptionNum = allExceptionNum;
- }
-
- public Long getExceptionNum() {
- return exceptionNum;
- }
-
- public void setExceptionNum(Long exceptionNum) {
- this.exceptionNum = exceptionNum;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/LaborUnitVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/LaborUnitVo.java
deleted file mode 100644
index 384bc44..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/LaborUnitVo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author mzy-cxy
- */
-public class LaborUnitVo {
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey;
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/MediaVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/MediaVo.java
deleted file mode 100644
index 9dd1a7d..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/MediaVo.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-/**
- * 璁板綍淇℃伅-闄勫姞鐨勫獟浣撴暟鎹� 濯掍綋鐩稿叧瀛楁
- */
-public class MediaVo {
-
- private String name;// varchar(50) 濯掍綋鍚嶇О
-
- @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
- private Date createTime;// datetime 鍒涘缓鏃堕棿锛堝繀濉級
-
- private String createUser;// varchar(50) 鍒涘缓浜�
-
- private String uploadUser ;//varchar(50) 涓婁紶浜�
-
- private Integer type;// int(1) 濯掍綋绫诲瀷锛�0-鍥剧墖銆�1-瑙嗛锛夛紙蹇呭～锛�
-
- private String internetPath ;//varchar(100) 濯掍綋鏂囦欢缃戠粶璺緞锛堝繀濉級
-
- private String remark;// varchar(200) 澶囨敞
-
- private Double longitude ;//double 瀹氫綅缁忓害
-
- private Double latitude ;//double 瀹氫綅绾害
-
- @JsonFormat(pattern = "yyyy-MM-dd HH-mm-ss",timezone = "GMT+8")
- private Date gpsTime;// datetime 瀹氫綅鏃堕棿
-
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getCreateUser() {
- return createUser;
- }
-
- public void setCreateUser(String createUser) {
- this.createUser = createUser;
- }
-
- public String getUploadUser() {
- return uploadUser;
- }
-
- public void setUploadUser(String uploadUser) {
- this.uploadUser = uploadUser;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public String getInternetPath() {
- return internetPath;
- }
-
- public void setInternetPath(String internetPath) {
- this.internetPath = internetPath;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public Date getGpsTime() {
- return gpsTime;
- }
-
- public void setGpsTime(Date gpsTime) {
- this.gpsTime = gpsTime;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetail.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetail.java
deleted file mode 100644
index fb62c77..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetail.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import java.util.Date;
-
-/**
- * @author mzy-cxy
- */
-public class PeopleDetail {
-
- //韬唤璇佸彿
- private String cardID;
-
- //鎵�灞炲崟浣�
- private String company;
-
- //涓婚敭
- private String ids;
-
- //濮撳悕
- private String name;
-
- //鍔冲姟鍗曚綅鐨勮涓氳寖鍥�
- private String paper;
-
- //澶囨敞
- private String remark;
-
- //鍔冲姟鍗曚綅璇佷功鍒嗙被
- private Integer state;
-
- //韬唤绫诲瀷锛�1-鎻忚堪鍛橈紱2-鍙搁捇鍛橈紱3-瀹為獙鍛橈級
- private Integer type;
-
- //鏇存柊鏃堕棿
- private Date updateTime;
-
-
- public String getCardID() {
- return cardID;
- }
-
- public void setCardID(String cardID) {
- this.cardID = cardID;
- }
-
- public String getCompany() {
- return company;
- }
-
- public void setCompany(String company) {
- this.company = company;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPaper() {
- return paper;
- }
-
- public void setPaper(String paper) {
- this.paper = paper;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetailVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetailVo.java
deleted file mode 100644
index 118b8dd..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/PeopleDetailVo.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * @author mzy-cxy
- */
-public class PeopleDetailVo {
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey;
-
- @NotBlank(message="璇佷功缂栧彿涓嶈兘涓虹┖")
- private String paper;
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getPaper() {
- return paper;
- }
-
- public void setPaper(String paper) {
- this.paper = paper;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectCheckVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectCheckVo.java
deleted file mode 100644
index 977a582..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectCheckVo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 椤圭洰楠屾敹
- * @author mzy-cxy
- */
-public class ProjectCheckVo {
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey ;// 骞冲彴瀵嗛挜锛堝繀濉級
-
- @NotBlank(message="椤圭洰搴忓垪鍙蜂笉鑳戒负绌�")
- private String projectID ;
-
- private String serialNumber; //椤圭洰搴忓垪鍙凤紙淇濆瓨鏃堕�夊～锛堝鏋滄彁渚涘垯蹇呴』淇濊瘉鍞竴锛� 涓嶅～鍒欑敱鏈嶅姟绔敓鎴愶級锛屾洿鏂版椂蹇呭～锛�
-
- private String userID; //涓婁紶浜哄憳杩斿洖鐨勫钩鍙扮浜哄憳ids锛堝彲涓虹┖锛岃嫢濉紝闇�鍜寀serName瀵瑰簲鐨刬ds淇濇寔涓�鑷达級
-
- private String userName; // 鎻愪氦楠屾敹鐘舵�佸彉鏇磋姹傜殑浜哄憳濮撳悕
-
- private String reason; // 鍙樻洿鐘舵�佺殑鐞嗙敱
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getProjectID() {
- return projectID;
- }
-
- public void setProjectID(String projectID) {
- this.projectID = projectID;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
-
- public String getSerialNumber() {
- return serialNumber;
- }
-
- public void setSerialNumber(String serialNumber) {
- this.serialNumber = serialNumber;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectVo.java
deleted file mode 100644
index a75e8ea..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/ProjectVo.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import javax.validation.constraints.NotBlank;
-
-import org.hibernate.validator.constraints.Range;
-
-/**
- * 椤圭洰绫�
- */
-public class ProjectVo {
-
- private String ids;
-
-
- private String address ;// 璇︾粏鍦板潃
-
- @Range(min =1 , max =1)
- private Integer city ;// 鍩庡競锛堝繀濉級鍚屼笂
-
- private String code ;// 椤圭洰缂栧彿
-
- @NotBlank(message="浼佷笟ID涓嶈兘涓虹┖")
- private String companyID ;// 浼佷笟ID锛堝繀濉級
-
- private String createTime ;//datetime 鍒涘缓鏃堕棿
-
-
- @Range(min =1 , max =99)
- private Integer district ;// 鍖哄幙锛堝繀濉級鍚屼笂
-
-
- @NotBlank(message="椤圭洰鍚嶇О涓嶈兘涓虹┖")
- private String fullName ;// 椤圭洰鍚嶇О锛堝繀濉級
-
- @NotBlank(message=" 鍔冲姟鍗曚綅鍚嶇О涓嶈兘涓虹┖")
- private String laborUnit ;// 鍔冲姟鍗曚綅鍚嶇О锛堝繀濉級
-
-
- @NotBlank(message="椤圭洰璐熻矗浜篒D涓嶈兘涓虹┖")
- private String leader ;// 椤圭洰璐熻矗浜篒D锛堝繀濉級
-
-
- @NotBlank(message="涓氫富涓嶈兘涓虹┖")
- private String owner ;// 涓氫富锛堝繀濉級
-
-
- @Range(min =1 , max =1)
- private Integer province ;// 鐪佷唤锛堝繀濉級鍚屼笂
-
- @NotBlank(message="骞冲彴瀵嗛挜涓嶈兘涓虹┖")
- private String secretKey ;// 骞冲彴瀵嗛挜锛堝繀濉級
-
- private String serialNumber ;// 椤圭洰搴忓垪鍙凤紙淇濆瓨鏃堕�夊～锛堝鏋滄彁渚涘垯蹇呴』淇濊瘉鍞竴锛� 涓嶅～鍒欑敱鏈嶅姟绔敓鎴愶級锛屾洿鏂版椂蹇呭～锛�
-
- private String describe ;//mediumtext 鍕樺療澶х翰锛堜笉纭畾鏄惁蹇呭～锛屽緟纭畾锛屽敖閲忓～鍐欙級
-
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public Integer getCity() {
- return city;
- }
-
- public void setCity(Integer city) {
- this.city = city;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getCompanyID() {
- return companyID;
- }
-
- public void setCompanyID(String companyID) {
- this.companyID = companyID;
- }
-
- public String getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
-
- public Integer getDistrict() {
- return district;
- }
-
- public void setDistrict(Integer district) {
- this.district = district;
- }
-
- public String getFullName() {
- return fullName;
- }
-
- public void setFullName(String fullName) {
- this.fullName = fullName;
- }
-
- public String getLaborUnit() {
- return laborUnit;
- }
-
- public void setLaborUnit(String laborUnit) {
- this.laborUnit = laborUnit;
- }
-
- public String getLeader() {
- return leader;
- }
-
- public void setLeader(String leader) {
- this.leader = leader;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- public Integer getProvince() {
- return province;
- }
-
- public void setProvince(Integer province) {
- this.province = province;
- }
-
- public String getSecretKey() {
- return secretKey;
- }
-
- public void setSecretKey(String secretKey) {
- this.secretKey = secretKey;
- }
-
- public String getSerialNumber() {
- return serialNumber;
- }
-
- public void setSerialNumber(String serialNumber) {
- this.serialNumber = serialNumber;
- }
-
- public String getDescribe() {
- return describe;
- }
-
- public void setDescribe(String describe) {
- this.describe = describe;
- }
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordBaseVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordBaseVo.java
deleted file mode 100644
index 5e993ae..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordBaseVo.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 涓婁紶璁板綍鐨勯�氱敤瀛楁
- */
-public class RecordBaseVo {
-
-
- private List<MediaVo> mediaListStr; //濯掍綋鐩稿叧瀛楁
-
- private String ids;// char(32) UUID锛堝繀濉級
- private String code;// char(32) 璁板綍缂栧彿锛堝繀濉級
-
- /**
- * 璁板綍鍒嗙被锛堝繀濉紝鐩存帴濉啓姹夊瓧锛屽洜鑰冭檻鍘嗗彶鏁版嵁鍘熷洜锛屸�滄満闀库�濊〃绀哄徃閽诲憳锛�
- * 鍥炴銆佸博鍦熴�佸彇鍦熴�佹爣璐�佸姩鎺€�佹按浣嶃�佸彇姘淬�佸娉ㄣ��
- * 鎻忚堪鍛樸�佽礋璐ｄ汉銆佸伐绋嬪笀銆佸満鏅�佹満闀裤�侀捇鏈恒�佹彁閽诲綍鍍�
- */
- private String type;// 璁板綍鍒嗙被
-
- private String title;// 鏍囬
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date createTime;// 璁板綍淇濆瓨鏃堕棿锛堝繀濉級
-
- private String recordPerson;// 鎻忚堪鍛橈紙蹇呭～浜哄憳id锛�
-
- private String description;// 鎻忚堪澶囨敞
-
- private Double longitude;// double 瀹氫綅缁忓害锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
-
- private Double latitude;//double 瀹氫綅绾害锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date gpsTime;//datetime 瀹氫綅鏃堕棿锛堝鏋滆兘瀹氫綅鍒欏繀濉紝鐢ㄤ簬璁＄畻鍜屽睍绀猴級
-
- private Boolean isDelete;//boolean 鏄惁鏄巻鍙茶褰�
-
- private String position;//varchar(200) 鏃犳硶瀹氫綅鐨勫湴鐐癸紙浠ヤ笅6椤瑰彧鏈夊湪鏃犳硶瀹氫綅鏃舵墠闇�瑕佸～鍐欙級
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH-mm-ss")
- private Date locateTime;//datetime 鏃犳硶瀹氫綅鐨勬椂闂�
-
- private String reason;//varchar(500) 鏃犳硶瀹氫綅鐨勫師鍥�
-
- private String pic1;//varchar(300) 鐜板満鎷嶇収1
-
- private String pic2;//varchar(300) 鐜板満鎷嶇収2
-
- private String pic3;//varchar(300) 鐜板満鎷嶇収3
-
- public List<MediaVo> getMediaListStr() {
- return mediaListStr;
- } //濯掍綋鏁版嵁
-
-
- public void setMediaListStr(List<MediaVo> mediaListStr) {
- this.mediaListStr = mediaListStr;
- }
-
-
- public String getIds() {
- return ids;
- }
-
- public void setIds(String ids) {
- this.ids = ids;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getRecordPerson() {
- return recordPerson;
- }
-
- public void setRecordPerson(String recordPerson) {
- this.recordPerson = recordPerson;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Double getLongitude() {
- return longitude;
- }
-
- public void setLongitude(Double longitude) {
- this.longitude = longitude;
- }
-
- public Double getLatitude() {
- return latitude;
- }
-
- public void setLatitude(Double latitude) {
- this.latitude = latitude;
- }
-
- public Date getGpsTime() {
- return gpsTime;
- }
-
- public void setGpsTime(Date gpsTime) {
- this.gpsTime = gpsTime;
- }
-
- public Boolean getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Boolean delete) {
- isDelete = delete;
- }
-
- public String getPosition() {
- return position;
- }
-
- public void setPosition(String position) {
- this.position = position;
- }
-
- public Date getLocateTime() {
- return locateTime;
- }
-
- public void setLocateTime(Date locateTime) {
- this.locateTime = locateTime;
- }
-
- public String getReason() {
- return reason;
- }
-
- public void setReason(String reason) {
- this.reason = reason;
- }
-
- public String getPic1() {
- return pic1;
- }
-
- public void setPic1(String pic1) {
- this.pic1 = pic1;
- }
-
- public String getPic2() {
- return pic2;
- }
-
- public void setPic2(String pic2) {
- this.pic2 = pic2;
- }
-
- public String getPic3() {
- return pic3;
- }
-
- public void setPic3(String pic3) {
- this.pic3 = pic3;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordHCVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordHCVo.java
deleted file mode 100644
index 33c6889..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordHCVo.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-
-import java.util.List;
-
-/**
- * 涓婁紶 鍥炴 璁板綍
- */
-public class RecordHCVo extends RecordBaseVo{
-
-
- private String frequencyType ;// 閽昏繘鏂规硶锛堝洖杞捇杩涖�佸啿鍑婚捇杩涖�侀渿鍔ㄩ捇杩涖�佸啿娲楅捇杩涖�佹礇闃抽摬銆佸嫼鍨嬮摬锛�
-
- private String frequencyMode ;// varchar(50) 鎶ゅ鏂规硶锛堝绠°�佹偿娴嗭級
-
- private Double aperture ;// double 閽诲瓟瀛斿緞(mm)
-
- private Double beginDepth ;// double 璧峰娣卞害锛堢敤浜庡睍绀猴級
-
- private Double endDepth ;// double 缁堟娣卞害锛堢敤浜庡睍绀猴級
-
-
- public String getFrequencyType() {
- return frequencyType;
- }
-
- public void setFrequencyType(String frequencyType) {
- this.frequencyType = frequencyType;
- }
-
- public String getFrequencyMode() {
- return frequencyMode;
- }
-
- public void setFrequencyMode(String frequencyMode) {
- this.frequencyMode = frequencyMode;
- }
-
- public Double getAperture() {
- return aperture;
- }
-
- public void setAperture(Double aperture) {
- this.aperture = aperture;
- }
-
- public Double getBeginDepth() {
- return beginDepth;
- }
-
- public void setBeginDepth(Double beginDepth) {
- this.beginDepth = beginDepth;
- }
-
- public Double getEndDepth() {
- return endDepth;
- }
-
- public void setEndDepth(Double endDepth) {
- this.endDepth = endDepth;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordPersonVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordPersonVo.java
deleted file mode 100644
index 4f55707..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordPersonVo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-/**
- * 璁板綍-璐熻矗浜� 璁板綍-宸ョ▼甯� 璁板綍-鏈洪暱 璁板綍-閽绘満
- */
-public class RecordPersonVo extends RecordBaseVo {
-
- //=========璁板綍-璐熻矗浜�
- private String operatePerson;// 璐熻矗浜篒D
-
- //=======璁板綍-宸ョ▼甯�
- //private String operatePerson ;// 宸ョ▼甯圛D
-
-
- //=======璁板綍-鏈洪暱
- //private String operatePerson ;// 鍙搁捇鍛業D锛堣姝ｇ‘鏄剧ず锛屽垯蹇呭～锛�
-
-
- private String testType;// 鍙搁捇鍛樿瘉涔︾紪鍙凤紙蹇呭～锛�
-
- private String type;
-
- //=======璁板綍-閽绘満
- //private String testType ;// 閽绘満缂栧彿
-
-
- @Override
- public String getType() {
- return type;
- }
-
- @Override
- public void setType(String type) {
- this.type = type;
- }
-
- public String getOperatePerson() {
- return operatePerson;
- }
-
- public void setOperatePerson(String operatePerson) {
- this.operatePerson = operatePerson;
- }
-
- public String getTestType() {
- return testType;
- }
-
- public void setTestType(String testType) {
- this.testType = testType;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordQTVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordQTVo.java
deleted file mode 100644
index 12b7f8a..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordQTVo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-
-/**
- * 涓婁紶 鍙栧湡 璁板綍
- */
-public class RecordQTVo extends RecordBaseVo{
-
-
- private Double beginDepth ;// 璧峰娣卞害锛堢敤浜庡睍绀猴級
- private Double endDepth ;// 缁堟娣卞害锛堢敤浜庡睍绀猴級
- private String earthType ;// 鍦熸牱璐ㄩ噺绛夌骇锛堚厾绾ф牱銆佲叀绾ф牱銆佲參绾ф牱銆佲叄绾ф牱锛�
-
- /**
- * 鍙栨牱宸ュ叿鍜屾柟娉�
- * 锛堣杽澹佸彇鍦熷櫒銆佸洖杞彇鍦熷櫒銆佸帤澹佸彇鍦熷櫒銆佹爣鍑嗚疮鍏ュ櫒銆佽灪绾归捇澶淬�佸博蹇冮捇澶淬�佹帰浜曪紙妲斤級涓彲鍙栧湡鏍凤級
- */
- private String getMode ;
-
- /**
- * 瀹為獙绫诲瀷
- * 锛堝博鐭宠瘯楠屻�佸湡鐨勭墿鐞嗘�ц川璇曢獙 銆佸湡鐨勫帇缂╁浐缁撹瘯楠� 銆佸湡鐨勬姉鍓己搴﹁瘯楠屻�佸湡鐨勫姩鍔涙�ц川璇曢獙锛�
- */
- private String testType ;
-
- public Double getBeginDepth() {
- return beginDepth;
- }
-
- public void setBeginDepth(Double beginDepth) {
- this.beginDepth = beginDepth;
- }
-
- public Double getEndDepth() {
- return endDepth;
- }
-
- public void setEndDepth(Double endDepth) {
- this.endDepth = endDepth;
- }
-
- public String getEarthType() {
- return earthType;
- }
-
- public void setEarthType(String earthType) {
- this.earthType = earthType;
- }
-
- public String getGetMode() {
- return getMode;
- }
-
- public void setGetMode(String getMode) {
- this.getMode = getMode;
- }
-
- public String getTestType() {
- return testType;
- }
-
- public void setTestType(String testType) {
- this.testType = testType;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordSWVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordSWVo.java
deleted file mode 100644
index e83b642..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordSWVo.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-/**
- * 姘翠綅璁板綍
- */
-public class RecordSWVo extends RecordBaseVo{
-
-
- //==璁板綍-姘翠綅
- private String waterType ;// 鍦颁笅姘寸被鍨嬶紙婊炴按銆佹綔姘淬�佹壙鍘嬫按锛�
- private Double shownWaterLevel ;// 鍒濊姘翠綅锛堢敤浜庡睍绀猴級
- private Double stillWaterLevel ;// 绋冲畾姘翠綅锛堢敤浜庡睍绀猴級
-
- private String shownTime ;// 鍒濊鏃堕棿
- private String stillTime ;// 绋冲畾鏃堕棿
-
- //璁板綍-鍙栨按
- private Double waterDepth ;// 鍙栨按娣卞害锛堢敤浜庡睍绀猴級
- private String getMode ;// 鍙栨按鏂规硶
-
-
- private String type ;
-
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getWaterType() {
- return waterType;
- }
-
- public void setWaterType(String waterType) {
- this.waterType = waterType;
- }
-
- public Double getShownWaterLevel() {
- return shownWaterLevel;
- }
-
- public void setShownWaterLevel(Double shownWaterLevel) {
- this.shownWaterLevel = shownWaterLevel;
- }
-
- public Double getStillWaterLevel() {
- return stillWaterLevel;
- }
-
- public void setStillWaterLevel(Double stillWaterLevel) {
- this.stillWaterLevel = stillWaterLevel;
- }
-
- public String getShownTime() {
- return shownTime;
- }
-
- public void setShownTime(String shownTime) {
- this.shownTime = shownTime;
- }
-
- public String getStillTime() {
- return stillTime;
- }
-
- public void setStillTime(String stillTime) {
- this.stillTime = stillTime;
- }
-
- public Double getWaterDepth() {
- return waterDepth;
- }
-
- public void setWaterDepth(Double waterDepth) {
- this.waterDepth = waterDepth;
- }
-
- public String getGetMode() {
- return getMode;
- }
-
- public void setGetMode(String getMode) {
- this.getMode = getMode;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYTVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYTVo.java
deleted file mode 100644
index 84e29df..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYTVo.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-
-
-
-/**
- * 涓婁紶 宀╁湡 璁板綍
- */
-public class RecordYTVo extends RecordBaseVo{
-
-
- private String layerType;// 宀╁湡绫诲瀷锛堣宀╁湡瀛愬垎绫伙級锛堝繀濉級
-
- private String layerName ;// 宀╁湡瀹氬悕锛堝繀濉級
-
- private String causes ;// ) 鍦板眰鎴愬洜
-
- private String era ;// 鍦板眰骞翠唬
-
- private Double beginDepth ;// 璧峰娣卞害锛堢敤浜庡睍绀猴級
-
- private Double endDepth ;// 缁堟娣卞害锛堢敤浜庡睍绀猴級
-
-
- //============ 璁板綍-宀╁湡-濉湡
-
- private String zycf ;// 涓昏鎴愬垎
-
- private String cycf ;// 娆¤鎴愪唤
-
- private String djnd ;// 鍫嗙Н骞翠唬
-
- private String msd ;// 瀵嗗疄搴�
-
- private String jyx ;// 鍧囧寑鎬�
-
-
- //============ 璁板綍-宀╁湡-鍐插～鍦�
- private String wzcf ;// 鐗╄川鎴愪唤
-
- // private String djnd ;// 鍫嗙Н骞翠唬
- // private String msd ;// 瀵嗗疄搴�
- // private String jyx ;// 鍧囧寑鎬�
-
-
- //============ 璁板綍-宀╁湡-榛忔�у湡
-
- private String ys ;// 棰滆壊
-
- private String zt ;// 鐘舵��
-
- private String bhw ;// 鍖呭惈鐗�
-
- private String jc ;// 澶瑰眰
-
-
- //============ 璁板綍-宀╁湡-绮夊湡
-
- // private String ys ;// 棰滆壊
- private String sd ;// 婀垮害
- // private String bhw ;// 鍖呭惈鐗�
- // private String msd ;// 瀵嗗疄
- // private String jc ;// 澶瑰眰
-
-
- //============ 璁板綍-宀╁湡-绮夐粡浜掑眰
- // private String ys ;// 棰滆壊
- // private String zt ;// 鐘舵��
- // private String bhw ;// 鍖呭惈鐗�
- private String ftfchd ;// 绮夊湡鍒嗗眰鍘氬害
- private String fzntfchd ;// 绮夎川榛忓湡鍒嗗眰鍘氬害
-
-
-
- //============ 璁板綍-宀╁湡-榛勫湡鐘堕粡鎬у湡
- // private String ys ;// 棰滆壊
- // private String zt ;// 鐘舵��
- private String kx ;// 瀛旈殭
- private String czjl ;// 鍨傜洿鑺傜悊
- // private String bhw ;// 鍖呭惈鐗�
-
-
- //============ 璁板綍-宀╁湡-榛勫湡鐘剁矇鍦�
- // private String ys ;// 棰滆壊
- // private String msd ;// 瀵嗗疄搴�
- // private String bhw ;// 鍖呭惈鐗�
- // private String kx ;// 瀛旈殭
- // private String czjl ;// 鍨傜洿鑺傜悊
- private String klzc ;// 棰楃矑缁勬垚
-
-
- //============璁板綍-宀╁湡-娣ゆ偿
- //private String ys ;// 棰滆壊
- // private String bhw ;// 鍖呭惈鐗�
- // private String zt ;// 鐘舵��
- private String hsl ;// 鍚按閲�
-
-
-
- //============ 璁板綍-宀╁湡-纰庣煶鍦�
- //private String ys ;// 棰滆壊
- // private String msd ;// 瀵嗗疄搴�
- private String tcw ;// 鍏呭～鐗�
- private String klxz ;// 棰楃矑褰㈢姸
- private String klpl ;// 棰楃矑鎺掑垪
- private String kljp ;// 棰楃矑绾ч厤
- private String ybljx ;// 涓�鑸矑寰勫皬
- private String ybljd ;// 涓�鑸矑寰勫ぇ
- private String jdljx ;// 杈冨ぇ绮掑緞灏�
- private String jdljd ;// 杈冨ぇ绮掑緞澶�
- private String zdlj ;// 鏈�澶х矑寰�
- private String mycf ;// 姣嶅博鎴愪唤
- private String fhcd ;// 椋庡寲绋嬪害
- //private String sd ;// 婀垮害
- //private String jc ;// 澶瑰眰
-
- //============璁板綍-宀╁湡-鐮傚湡
- private String kwzc ;// 鐭跨墿缁勬垚
- // private String kljp ;// 棰楃矑绾ч厤
- // private String klxz ;// 棰楃矑褰㈢姸
- // private String sd ;// 婀垮害
- // private String ys ;// 棰滆壊
- // private String msd ;// 瀵嗗疄搴�
-
-
- //============璁板綍-宀╁湡-宀╃煶
- // private String ys ;// 棰滆壊
- private String jycd ;// 鍧氱‖绋嬪害
- private String wzcd ;// 瀹屾暣绋嬪害
- private String jbzldj ;// 鍩烘湰璐ㄩ噺绛夌骇
- private String kwx ;// 鍙寲鎬�
- // private String fhcd ;// 椋庡寲绋嬪害
- private String jglx ;// 缁撴瀯绫诲瀷
-
-
- public String getLayerType() {
- return layerType;
- }
-
- public void setLayerType(String layerType) {
- this.layerType = layerType;
- }
-
- public String getLayerName() {
- return layerName;
- }
-
- public void setLayerName(String layerName) {
- this.layerName = layerName;
- }
-
- public String getCauses() {
- return causes;
- }
-
- public void setCauses(String causes) {
- this.causes = causes;
- }
-
- public String getEra() {
- return era;
- }
-
- public void setEra(String era) {
- this.era = era;
- }
-
- public Double getBeginDepth() {
- return beginDepth;
- }
-
- public void setBeginDepth(Double beginDepth) {
- this.beginDepth = beginDepth;
- }
-
- public Double getEndDepth() {
- return endDepth;
- }
-
- public void setEndDepth(Double endDepth) {
- this.endDepth = endDepth;
- }
-
- public String getZycf() {
- return zycf;
- }
-
- public void setZycf(String zycf) {
- this.zycf = zycf;
- }
-
- public String getCycf() {
- return cycf;
- }
-
- public void setCycf(String cycf) {
- this.cycf = cycf;
- }
-
- public String getDjnd() {
- return djnd;
- }
-
- public void setDjnd(String djnd) {
- this.djnd = djnd;
- }
-
- public String getMsd() {
- return msd;
- }
-
- public void setMsd(String msd) {
- this.msd = msd;
- }
-
- public String getJyx() {
- return jyx;
- }
-
- public void setJyx(String jyx) {
- this.jyx = jyx;
- }
-
- public String getWzcf() {
- return wzcf;
- }
-
- public void setWzcf(String wzcf) {
- this.wzcf = wzcf;
- }
-
- public String getYs() {
- return ys;
- }
-
- public void setYs(String ys) {
- this.ys = ys;
- }
-
- public String getZt() {
- return zt;
- }
-
- public void setZt(String zt) {
- this.zt = zt;
- }
-
- public String getBhw() {
- return bhw;
- }
-
- public void setBhw(String bhw) {
- this.bhw = bhw;
- }
-
- public String getJc() {
- return jc;
- }
-
- public void setJc(String jc) {
- this.jc = jc;
- }
-
- public String getSd() {
- return sd;
- }
-
- public void setSd(String sd) {
- this.sd = sd;
- }
-
- public String getFtfchd() {
- return ftfchd;
- }
-
- public void setFtfchd(String ftfchd) {
- this.ftfchd = ftfchd;
- }
-
- public String getFzntfchd() {
- return fzntfchd;
- }
-
- public void setFzntfchd(String fzntfchd) {
- this.fzntfchd = fzntfchd;
- }
-
- public String getKx() {
- return kx;
- }
-
- public void setKx(String kx) {
- this.kx = kx;
- }
-
- public String getCzjl() {
- return czjl;
- }
-
- public void setCzjl(String czjl) {
- this.czjl = czjl;
- }
-
- public String getKlzc() {
- return klzc;
- }
-
- public void setKlzc(String klzc) {
- this.klzc = klzc;
- }
-
- public String getHsl() {
- return hsl;
- }
-
- public void setHsl(String hsl) {
- this.hsl = hsl;
- }
-
- public String getTcw() {
- return tcw;
- }
-
- public void setTcw(String tcw) {
- this.tcw = tcw;
- }
-
- public String getKlxz() {
- return klxz;
- }
-
- public void setKlxz(String klxz) {
- this.klxz = klxz;
- }
-
- public String getKlpl() {
- return klpl;
- }
-
- public void setKlpl(String klpl) {
- this.klpl = klpl;
- }
-
- public String getKljp() {
- return kljp;
- }
-
- public void setKljp(String kljp) {
- this.kljp = kljp;
- }
-
- public String getYbljx() {
- return ybljx;
- }
-
- public void setYbljx(String ybljx) {
- this.ybljx = ybljx;
- }
-
- public String getYbljd() {
- return ybljd;
- }
-
- public void setYbljd(String ybljd) {
- this.ybljd = ybljd;
- }
-
- public String getJdljx() {
- return jdljx;
- }
-
- public void setJdljx(String jdljx) {
- this.jdljx = jdljx;
- }
-
- public String getJdljd() {
- return jdljd;
- }
-
- public void setJdljd(String jdljd) {
- this.jdljd = jdljd;
- }
-
- public String getZdlj() {
- return zdlj;
- }
-
- public void setZdlj(String zdlj) {
- this.zdlj = zdlj;
- }
-
- public String getMycf() {
- return mycf;
- }
-
- public void setMycf(String mycf) {
- this.mycf = mycf;
- }
-
- public String getFhcd() {
- return fhcd;
- }
-
- public void setFhcd(String fhcd) {
- this.fhcd = fhcd;
- }
-
- public String getKwzc() {
- return kwzc;
- }
-
- public void setKwzc(String kwzc) {
- this.kwzc = kwzc;
- }
-
- public String getJycd() {
- return jycd;
- }
-
- public void setJycd(String jycd) {
- this.jycd = jycd;
- }
-
- public String getWzcd() {
- return wzcd;
- }
-
- public void setWzcd(String wzcd) {
- this.wzcd = wzcd;
- }
-
- public String getJbzldj() {
- return jbzldj;
- }
-
- public void setJbzldj(String jbzldj) {
- this.jbzldj = jbzldj;
- }
-
- public String getKwx() {
- return kwx;
- }
-
- public void setKwx(String kwx) {
- this.kwx = kwx;
- }
-
- public String getJglx() {
- return jglx;
- }
-
- public void setJglx(String jglx) {
- this.jglx = jglx;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYWVo.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYWVo.java
deleted file mode 100644
index b03a14c..0000000
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geotdp/vo/RecordYWVo.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.javaweb.geotdp.vo;
-
-/**
- * 鍘熶綅娴嬭瘯 鍖呭惈 璁板綍-鏍囪疮 璁板綍-鍔ㄦ帰
- */
-public class RecordYWVo extends RecordBaseVo{
-
- private Double drillLength ;// 閽绘潌闀垮害锛堝繀濉級
- private Double begin1 ;// 璧峰娣卞害锛堝繀濉級
- private Double end1 ;// 缁堟娣卞害锛堝繀濉級
- private Double blow1 ;// 鍑绘暟锛堝繀濉級
- private Double begin2 ;//
- private Double end2 ;//
- private Double blow2 ;//
- private Double begin3 ;//
- private Double end3 ;//
- private Double blow3 ;//
- private Double begin4 ;//
- private Double end4 ;//
- private Double blow4 ;//
-
- private String powerType;// 鍔ㄦ帰绫诲瀷锛堣交鍨嬨�侀噸鍨嬨�佽秴閲嶅瀷锛�
- // private Double drillLength ;// 閽绘潌闀垮害
- // private Double begin1 ;// 璧峰娣卞害锛堢敤浜庡睍绀猴級
- // private Double end1 ;// 缁堟娣卞害锛堢敤浜庡睍绀猴級
- // private Double blow1 ;// 鍑绘暟
-
- private String type ;
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Double getDrillLength() {
- return drillLength;
- }
-
- public void setDrillLength(Double drillLength) {
- this.drillLength = drillLength;
- }
-
- public Double getBegin1() {
- return begin1;
- }
-
- public void setBegin1(Double begin1) {
- this.begin1 = begin1;
- }
-
- public Double getEnd1() {
- return end1;
- }
-
- public void setEnd1(Double end1) {
- this.end1 = end1;
- }
-
- public Double getBlow1() {
- return blow1;
- }
-
- public void setBlow1(Double blow1) {
- this.blow1 = blow1;
- }
-
- public Double getBegin2() {
- return begin2;
- }
-
- public void setBegin2(Double begin2) {
- this.begin2 = begin2;
- }
-
- public Double getEnd2() {
- return end2;
- }
-
- public void setEnd2(Double end2) {
- this.end2 = end2;
- }
-
- public Double getBlow2() {
- return blow2;
- }
-
- public void setBlow2(Double blow2) {
- this.blow2 = blow2;
- }
-
- public Double getBegin3() {
- return begin3;
- }
-
- public void setBegin3(Double begin3) {
- this.begin3 = begin3;
- }
-
- public Double getEnd3() {
- return end3;
- }
-
- public void setEnd3(Double end3) {
- this.end3 = end3;
- }
-
- public Double getBlow3() {
- return blow3;
- }
-
- public void setBlow3(Double blow3) {
- this.blow3 = blow3;
- }
-
- public Double getBegin4() {
- return begin4;
- }
-
- public void setBegin4(Double begin4) {
- this.begin4 = begin4;
- }
-
- public Double getEnd4() {
- return end4;
- }
-
- public void setEnd4(Double end4) {
- this.end4 = end4;
- }
-
- public Double getBlow4() {
- return blow4;
- }
-
- public void setBlow4(Double blow4) {
- this.blow4 = blow4;
- }
-
- public String getPowerType() {
- return powerType;
- }
-
- public void setPowerType(String powerType) {
- this.powerType = powerType;
- }
-}
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CollectStatisticsMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CollectStatisticsMapper.xml
deleted file mode 100644
index 67bcfaf..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CollectStatisticsMapper.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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.javaweb.geo.mapper.CollectStatisticsMapper">
-
- <resultMap type="CollectStatistics" id="CollectStatisticsResult">
- <result property="ids" column="ids" />
- <result property="companyId" column="company_id" />
- <result property="companyName" column="company_name" />
- <result property="projectId" column="project_id" />
- <result property="projectNum" column="project_num" />
- <result property="holeNum" column="hole_num" />
- <result property="exceptionProject" column="exception_project" />
- <result property="exceptionNum" column="exception_num" />
- <result property="jinchiNum" column="jinchi_num" />
- <result property="province" column="province" />
- <result property="district" column="district" />
- <result property="createTime" column="create_time" />
- <result property="endTime" column="end_time" />
- <result property="dataResouce" column="data_resouce" />
- <result property="isDeleted" column="is_deleted" />
- </resultMap>
-
- <sql id="selectCollectStatisticsVo">
- select ids, company_id, company_name, project_num, hole_num, exception_project, exception_num, jinchi_num, province, district, create_time, end_time, data_resouce, is_deleted from js_collect_statistics
- </sql>
-
- <select id="selectCollectStatisticsList" parameterType="CollectStatistics" resultMap="CollectStatisticsResult">
- <include refid="selectCollectStatisticsVo"/>
- <where>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
- <if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
- <if test="projectNum != null "> and project_num = #{projectNum}</if>
- <if test="holeNum != null "> and hole_num = #{holeNum}</if>
- <if test="exceptionProject != null "> and exception_project = #{exceptionProject}</if>
- <if test="exceptionNum != null "> and exception_num = #{exceptionNum}</if>
- <if test="jinchiNum != null "> and jinchi_num = #{jinchiNum}</if>
- <if test="province != null and province != ''"> and province = #{province}</if>
- <if test="district != null and district != ''"> and district = #{district}</if>
- <if test="endTime != null "> and end_time = #{endTime}</if>
- <if test="dataResouce != null and dataResouce != ''"> and data_resouce = #{dataResouce}</if>
- <if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
-
- <if test="params.beginEndTime != null and params.beginEndTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(create_time,'%y%m%d') >= date_format(#{params.beginEndTime},'%y%m%d')
- </if>
- <if test="params.endEndTime != null and params.endEndTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(create_time,'%y%m%d') <= date_format(#{params.endEndTime},'%y%m%d')
- </if>
-
- </where>
- </select>
-
- <select id="selectCollectStatisticsById" parameterType="String" resultMap="CollectStatisticsResult">
- <include refid="selectCollectStatisticsVo"/>
- where ids = #{ids}
- </select>
-
- <!-- 鍚屾缁熻姹囨�绘暟鎹� -->
- <select id="selectCollectStatistic" resultMap="CollectStatisticsResult">
- SELECT
- a.company_id,
- b.full_name as 'company_name',
- a.ids as 'project_id',
- COUNT(company_id) as 'project_num',
- a.province,
- a.district,
- a.create_time,
- a.end_time
- FROM
- js_project a,
- js_company b
- WHERE
- a.company_id = b.ids and a.create_time <= NOW() and a.create_time >= (SELECT DATE_SUB(CURDATE(),INTERVAL dayofyear(now())-1 DAY))
- GROUP BY
- a.company_id
- </select>
-
- <insert id="insertCollectStatistics" parameterType="CollectStatistics">
- insert into js_collect_statistics
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="companyId != null and companyId != ''">company_id,</if>
- <if test="companyName != null and companyName != ''">company_name,</if>
- <if test="projectNum != null ">project_num,</if>
- <if test="holeNum != null ">hole_num,</if>
- <if test="exceptionProject != null ">exception_project,</if>
- <if test="exceptionNum != null ">exception_num,</if>
- <if test="jinchiNum != null ">jinchi_num,</if>
- <if test="province != null and province != ''">province,</if>
- <if test="district != null and district != ''">district,</if>
- <if test="createTime != null ">create_time,</if>
- <if test="endTime != null ">end_time,</if>
- <if test="dataResouce != null and dataResouce != ''">data_resouce,</if>
- <if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="companyId != null and companyId != ''">#{companyId},</if>
- <if test="companyName != null and companyName != ''">#{companyName},</if>
- <if test="projectNum != null ">#{projectNum},</if>
- <if test="holeNum != null ">#{holeNum},</if>
- <if test="exceptionProject != null ">#{exceptionProject},</if>
- <if test="exceptionNum != null ">#{exceptionNum},</if>
- <if test="jinchiNum != null ">#{jinchiNum},</if>
- <if test="province != null and province != ''">#{province},</if>
- <if test="district != null and district != ''">#{district},</if>
- <if test="createTime != null ">#{createTime},</if>
- <if test="endTime != null ">#{endTime},</if>
- <if test="dataResouce != null and dataResouce != ''">#{dataResouce},</if>
- <if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
- </trim>
- </insert>
-
- <update id="updateCollectStatistics" parameterType="CollectStatistics">
- update js_collect_statistics
- <trim prefix="SET" suffixOverrides=",">
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- <if test="companyName != null and companyName != ''">company_name = #{companyName},</if>
- <if test="projectNum != null ">project_num = #{projectNum},</if>
- <if test="holeNum != null ">hole_num = #{holeNum},</if>
- <if test="exceptionProject != null ">exception_project = #{exceptionProject},</if>
- <if test="exceptionNum != null ">exception_num = #{exceptionNum},</if>
- <if test="jinchiNum != null ">jinchi_num = #{jinchiNum},</if>
- <if test="province != null and province != ''">province = #{province},</if>
- <if test="district != null and district != ''">district = #{district},</if>
- <if test="createTime != null ">create_time = #{createTime},</if>
- <if test="endTime != null ">end_time = #{endTime},</if>
- <if test="dataResouce != null and dataResouce != ''">data_resouce = #{dataResouce},</if>
- <if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteCollectStatisticsById" parameterType="String">
- delete from js_collect_statistics where ids = #{ids}
- </delete>
-
- <delete id="deleteCollectStatisticsByIds" parameterType="String">
- delete from js_collect_statistics where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
- <delete id="emptyTable">
- delete from js_collect_statistics
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyMapper.xml
deleted file mode 100644
index ba82e59..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyMapper.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?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.javaweb.geo.mapper.CompanyMapper">
-
- <resultMap type="Company" id="CompanyResult">
- <result property="ids" column="ids" />
- <result property="addTime" column="add_time" />
- <result property="cardAnnex" column="card_annex" />
- <result property="cardBackAnnex" column="card_back_annex" />
- <result property="city" column="city" />
- <result property="code" column="code" />
- <result property="creditAnnex" column="credit_annex" />
- <result property="creditCode" column="credit_code" />
- <result property="district" column="district" />
- <result property="fullName" column="full_name" />
- <result property="idCard" column="id_card" />
- <result property="legalPerson" column="legal_person" />
- <result property="legalPersonPhone" column="legal_person_phone" />
- <result property="powerOfAttorneyAnnex" column="power_of_attorney_annex" />
- <result property="province" column="province" />
- <result property="regAddress" column="reg_address" />
- <result property="secretKey" column="secret_key" />
- <result property="nature" column="nature" />
- <result property="position" column="position" />
- <result property="certificationsCode" column="certifications_code" />
- <result property="certificationsAnnex" column="certifications_annex" />
- <result property="description" column="description" />
- <result property="certificationsCode2" column="certifications_code2" />
- <result property="certificationsAnnex2" column="certifications_annex2" />
- <result property="userName" column="user_name" />
- <result property="userPhone" column="user_phone" />
- <result property="category" column="category" />
- <result property="status" column="status" />
- <result property="projectNums" column="project_nums" />
- </resultMap>
-
- <sql id="selectCompanyVo">
- select ids, add_time, card_annex, card_back_annex, city, code, credit_annex, credit_code, district, full_name, id_card, legal_person, legal_person_phone, power_of_attorney_annex, province, reg_address, secret_key, nature, position, certifications_code, certifications_annex, description, certifications_code2, certifications_annex2, user_name, user_phone, category, status from js_company
- </sql>
-
- <select id="selectCompanyList" parameterType="Company" resultMap="CompanyResult">
- <include refid="selectCompanyVo"/>
- <where>
- <if test="ids != null and ids != ''"> and ids = #{ids}</if>
- <if test="addTime != null "> and add_time = #{addTime}</if>
- <if test="cardAnnex != null and cardAnnex != ''"> and card_annex = #{cardAnnex}</if>
- <if test="cardBackAnnex != null and cardBackAnnex != ''"> and card_back_annex = #{cardBackAnnex}</if>
- <if test="city != null and city != ''"> and city = #{city}</if>
- <if test="code != null and code != ''"> and code = #{code}</if>
- <if test="creditAnnex != null and creditAnnex != ''"> and credit_annex = #{creditAnnex}</if>
- <if test="creditCode != null and creditCode != ''"> and credit_code = #{creditCode}</if>
- <if test="district != null and district != ''"> and district = #{district}</if>
- <if test="fullName != null and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if>
- <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
- <if test="legalPerson != null and legalPerson != ''"> and legal_person = #{legalPerson}</if>
- <if test="legalPersonPhone != null and legalPersonPhone != ''"> and legal_person_phone = #{legalPersonPhone}</if>
- <if test="powerOfAttorneyAnnex != null and powerOfAttorneyAnnex != ''"> and power_of_attorney_annex = #{powerOfAttorneyAnnex}</if>
- <if test="province != null and province != ''"> and province = #{province}</if>
- <if test="regAddress != null and regAddress != ''"> and reg_address = #{regAddress}</if>
- <if test="secretKey != null and secretKey != ''"> and secret_key = #{secretKey}</if>
- <if test="nature != null and nature != ''"> and nature = #{nature}</if>
- <if test="position != null and position != ''"> and position = #{position}</if>
- <if test="certificationsCode != null and certificationsCode != ''"> and certifications_code = #{certificationsCode}</if>
- <if test="certificationsAnnex != null and certificationsAnnex != ''"> and certifications_annex = #{certificationsAnnex}</if>
- <if test="description != null and description != ''"> and description = #{description}</if>
- <if test="certificationsCode2 != null and certificationsCode2 != ''"> and certifications_code2 = #{certificationsCode2}</if>
- <if test="certificationsAnnex2 != null and certificationsAnnex2 != ''"> and certifications_annex2 = #{certificationsAnnex2}</if>
- <if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
- <if test="userPhone != null and userPhone != ''"> and user_phone = #{userPhone}</if>
- <if test="category != null and category != ''"> and category = #{category}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- </where>
- </select>
-
- <select id="selectCompanyById" parameterType="String" resultMap="CompanyResult">
- <include refid="selectCompanyVo"/>
- where ids = #{ids}
- </select>
-
- <select id="selectAllCompanyNum" resultType="java.lang.Long">
- SELECT count(ids) FROM js_company
- </select>
-
- <select id="selectCompanyNum" resultType="java.lang.Long">
- select count(a.ids) from (SELECT * FROM js_project WHERE `status` = '0' AND is_deleted = '0' GROUP BY company_id) a
- </select>
-
- <select id="selectCompanProjectNums" resultMap="CompanyResult">
- SELECT
- a.full_name,
- count(b.full_name) AS project_nums
- FROM
- js_company a
- LEFT JOIN js_project b ON a.ids = b.company_id
- <where>
- <if test="startTime != null and startTime != ''">
- and b.create_time >= #{startTime,jdbcType=TIMESTAMP}
- </if>
- <if test="endTime != null and endTime != ''">
- and b.create_time <= #{endTime,jdbcType=TIMESTAMP}
- </if>
- </where>
- GROUP BY
- a.full_name
- ORDER BY project_nums DESC
- LIMIT 0,10
- </select>
-
- <insert id="insertCompany" parameterType="Company">
- insert into js_company
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="addTime != null ">add_time,</if>
- <if test="cardAnnex != null and cardAnnex != ''">card_annex,</if>
- <if test="cardBackAnnex != null and cardBackAnnex != ''">card_back_annex,</if>
- <if test="city != null and city != ''">city,</if>
- <if test="code != null and code != ''">code,</if>
- <if test="creditAnnex != null and creditAnnex != ''">credit_annex,</if>
- <if test="creditCode != null and creditCode != ''">credit_code,</if>
- <if test="district != null and district != ''">district,</if>
- <if test="fullName != null and fullName != ''">full_name,</if>
- <if test="idCard != null and idCard != ''">id_card,</if>
- <if test="legalPerson != null and legalPerson != ''">legal_person,</if>
- <if test="legalPersonPhone != null and legalPersonPhone != ''">legal_person_phone,</if>
- <if test="powerOfAttorneyAnnex != null and powerOfAttorneyAnnex != ''">power_of_attorney_annex,</if>
- <if test="province != null and province != ''">province,</if>
- <if test="regAddress != null and regAddress != ''">reg_address,</if>
- <if test="secretKey != null and secretKey != ''">secret_key,</if>
- <if test="nature != null and nature != ''">nature,</if>
- <if test="position != null and position != ''">position,</if>
- <if test="certificationsCode != null and certificationsCode != ''">certifications_code,</if>
- <if test="certificationsAnnex != null and certificationsAnnex != ''">certifications_annex,</if>
- <if test="description != null and description != ''">description,</if>
- <if test="certificationsCode2 != null and certificationsCode2 != ''">certifications_code2,</if>
- <if test="certificationsAnnex2 != null and certificationsAnnex2 != ''">certifications_annex2,</if>
- <if test="userName != null and userName != ''">user_name,</if>
- <if test="userPhone != null and userPhone != ''">user_phone,</if>
- <if test="category != null and category != ''">category,</if>
- <if test="status != null and status != ''">status,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="addTime != null ">#{addTime},</if>
- <if test="cardAnnex != null and cardAnnex != ''">#{cardAnnex},</if>
- <if test="cardBackAnnex != null and cardBackAnnex != ''">#{cardBackAnnex},</if>
- <if test="city != null and city != ''">#{city},</if>
- <if test="code != null and code != ''">#{code},</if>
- <if test="creditAnnex != null and creditAnnex != ''">#{creditAnnex},</if>
- <if test="creditCode != null and creditCode != ''">#{creditCode},</if>
- <if test="district != null and district != ''">#{district},</if>
- <if test="fullName != null and fullName != ''">#{fullName},</if>
- <if test="idCard != null and idCard != ''">#{idCard},</if>
- <if test="legalPerson != null and legalPerson != ''">#{legalPerson},</if>
- <if test="legalPersonPhone != null and legalPersonPhone != ''">#{legalPersonPhone},</if>
- <if test="powerOfAttorneyAnnex != null and powerOfAttorneyAnnex != ''">#{powerOfAttorneyAnnex},</if>
- <if test="province != null and province != ''">#{province},</if>
- <if test="regAddress != null and regAddress != ''">#{regAddress},</if>
- <if test="secretKey != null and secretKey != ''">#{secretKey},</if>
- <if test="nature != null and nature != ''">#{nature},</if>
- <if test="position != null and position != ''">#{position},</if>
- <if test="certificationsCode != null and certificationsCode != ''">#{certificationsCode},</if>
- <if test="certificationsAnnex != null and certificationsAnnex != ''">#{certificationsAnnex},</if>
- <if test="description != null and description != ''">#{description},</if>
- <if test="certificationsCode2 != null and certificationsCode2 != ''">#{certificationsCode2},</if>
- <if test="certificationsAnnex2 != null and certificationsAnnex2 != ''">#{certificationsAnnex2},</if>
- <if test="userName != null and userName != ''">#{userName},</if>
- <if test="userPhone != null and userPhone != ''">#{userPhone},</if>
- <if test="category != null and category != ''">#{category},</if>
- <if test="status != null and status != ''">#{status},</if>
- </trim>
- </insert>
-
- <update id="updateCompany" parameterType="Company">
- update js_company
- <trim prefix="SET" suffixOverrides=",">
- <if test="addTime != null ">add_time = #{addTime},</if>
- <if test="cardAnnex != null and cardAnnex != ''">card_annex = #{cardAnnex},</if>
- <if test="cardBackAnnex != null and cardBackAnnex != ''">card_back_annex = #{cardBackAnnex},</if>
- <if test="city != null and city != ''">city = #{city},</if>
- <if test="code != null and code != ''">code = #{code},</if>
- <if test="creditAnnex != null and creditAnnex != ''">credit_annex = #{creditAnnex},</if>
- <if test="creditCode != null and creditCode != ''">credit_code = #{creditCode},</if>
- <if test="district != null and district != ''">district = #{district},</if>
- <if test="fullName != null and fullName != ''">full_name = #{fullName},</if>
- <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
- <if test="legalPerson != null and legalPerson != ''">legal_person = #{legalPerson},</if>
- <if test="legalPersonPhone != null and legalPersonPhone != ''">legal_person_phone = #{legalPersonPhone},</if>
- <if test="powerOfAttorneyAnnex != null and powerOfAttorneyAnnex != ''">power_of_attorney_annex = #{powerOfAttorneyAnnex},</if>
- <if test="province != null and province != ''">province = #{province},</if>
- <if test="regAddress != null and regAddress != ''">reg_address = #{regAddress},</if>
- <if test="secretKey != null and secretKey != ''">secret_key = #{secretKey},</if>
- <if test="nature != null and nature != ''">nature = #{nature},</if>
- <if test="position != null and position != ''">position = #{position},</if>
- <if test="certificationsCode != null and certificationsCode != ''">certifications_code = #{certificationsCode},</if>
- <if test="certificationsAnnex != null and certificationsAnnex != ''">certifications_annex = #{certificationsAnnex},</if>
- <if test="description != null and description != ''">description = #{description},</if>
- <if test="certificationsCode2 != null and certificationsCode2 != ''">certifications_code2 = #{certificationsCode2},</if>
- <if test="certificationsAnnex2 != null and certificationsAnnex2 != ''">certifications_annex2 = #{certificationsAnnex2},</if>
- <if test="userName != null and userName != ''">user_name = #{userName},</if>
- <if test="userPhone != null and userPhone != ''">user_phone = #{userPhone},</if>
- <if test="category != null and category != ''">category = #{category},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteCompanyById" parameterType="String">
- delete from js_company where ids = #{ids}
- </delete>
-
- <delete id="deleteCompanyByIds" parameterType="String">
- delete from js_company where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyUserMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyUserMapper.xml
deleted file mode 100644
index 106dac8..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/CompanyUserMapper.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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.javaweb.geo.mapper.CompanyUserMapper">
-
- <resultMap type="CompanyUser" id="CompanyUserResult">
- <result property="ids" column="ids" />
- <result property="code" column="code" />
- <result property="realName" column="real_name" />
- <result property="companyId" column="company_id" />
- <result property="roleId" column="role_id" />
- <result property="mobilePhone" column="mobile_phone" />
- <result property="email" column="email" />
- <result property="idCard" column="id_card" />
- <result property="officePhone" column="office_phone" />
- <result property="authorities1" column="authorities1" />
- <result property="certificateNumber1" column="certificate_number1" />
- <result property="authorities2" column="authorities2" />
- <result property="certificateNumber2" column="certificate_number2" />
- <result property="authorities3" column="authorities3" />
- <result property="certificateNumber3" column="certificate_number3" />
- <result property="authorities4" column="authorities4" />
- <result property="certificateNumber4" column="certificate_number4" />
- <result property="status" column="status" />
- </resultMap>
-
- <sql id="selectCompanyUserVo">
- select ids, code, real_name, company_id, role_id, mobile_phone, email, id_card, office_phone, authorities1, certificate_number1, authorities2, certificate_number2, authorities3, certificate_number3, authorities4, certificate_number4, status from js_company_user
- </sql>
-
- <select id="selectCompanyUserList" parameterType="CompanyUser" resultMap="CompanyUserResult">
- <include refid="selectCompanyUserVo"/>
- <where>
- <if test="code != null and code != ''"> and code = #{code}</if>
- <if test="realName != null and realName != ''"> and real_name like concat('%', #{realName}, '%')</if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
- <if test="roleId != null and roleId != ''"> and role_id = #{roleId}</if>
- <if test="mobilePhone != null and mobilePhone != ''"> and mobile_phone = #{mobilePhone}</if>
- <if test="email != null and email != ''"> and email = #{email}</if>
- <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
- <if test="officePhone != null and officePhone != ''"> and office_phone = #{officePhone}</if>
- <if test="authorities1 != null and authorities1 != ''"> and authorities1 = #{authorities1}</if>
- <if test="certificateNumber1 != null and certificateNumber1 != ''"> and certificate_number1 = #{certificateNumber1}</if>
- <if test="authorities2 != null and authorities2 != ''"> and authorities2 = #{authorities2}</if>
- <if test="certificateNumber2 != null and certificateNumber2 != ''"> and certificate_number2 = #{certificateNumber2}</if>
- <if test="authorities3 != null and authorities3 != ''"> and authorities3 = #{authorities3}</if>
- <if test="certificateNumber3 != null and certificateNumber3 != ''"> and certificate_number3 = #{certificateNumber3}</if>
- <if test="authorities4 != null and authorities4 != ''"> and authorities4 = #{authorities4}</if>
- <if test="certificateNumber4 != null and certificateNumber4 != ''"> and certificate_number4 = #{certificateNumber4}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- </where>
- </select>
-
- <select id="selectCompanyUserById" parameterType="String" resultMap="CompanyUserResult">
- <include refid="selectCompanyUserVo"/>
- where ids = #{ids}
- </select>
-
- <select id="selectCompanyUserBypaper3" resultMap="CompanyUserResult">
- <include refid="selectCompanyUserVo"/> where certificate_number3 = #{paper} and company_id = #{companyId}
- </select>
-
- <select id="selectCompanyUserBypaper4" resultMap="CompanyUserResult">
- <include refid="selectCompanyUserVo"/> where certificate_number4 = #{paper} and company_id = #{companyId}
- </select>
-
- <insert id="insertCompanyUser" parameterType="CompanyUser">
- insert into js_company_user
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="code != null and code != ''">code,</if>
- <if test="realName != null and realName != ''">real_name,</if>
- <if test="companyId != null and companyId != ''">company_id,</if>
- <if test="roleId != null and roleId != ''">role_id,</if>
- <if test="mobilePhone != null and mobilePhone != ''">mobile_phone,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="idCard != null and idCard != ''">id_card,</if>
- <if test="officePhone != null and officePhone != ''">office_phone,</if>
- <if test="authorities1 != null and authorities1 != ''">authorities1,</if>
- <if test="certificateNumber1 != null and certificateNumber1 != ''">certificate_number1,</if>
- <if test="authorities2 != null and authorities2 != ''">authorities2,</if>
- <if test="certificateNumber2 != null and certificateNumber2 != ''">certificate_number2,</if>
- <if test="authorities3 != null and authorities3 != ''">authorities3,</if>
- <if test="certificateNumber3 != null and certificateNumber3 != ''">certificate_number3,</if>
- <if test="authorities4 != null and authorities4 != ''">authorities4,</if>
- <if test="certificateNumber4 != null and certificateNumber4 != ''">certificate_number4,</if>
- <if test="status != null and status != ''">status,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="code != null and code != ''">#{code},</if>
- <if test="realName != null and realName != ''">#{realName},</if>
- <if test="companyId != null and companyId != ''">#{companyId},</if>
- <if test="roleId != null and roleId != ''">#{roleId},</if>
- <if test="mobilePhone != null and mobilePhone != ''">#{mobilePhone},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="idCard != null and idCard != ''">#{idCard},</if>
- <if test="officePhone != null and officePhone != ''">#{officePhone},</if>
- <if test="authorities1 != null and authorities1 != ''">#{authorities1},</if>
- <if test="certificateNumber1 != null and certificateNumber1 != ''">#{certificateNumber1},</if>
- <if test="authorities2 != null and authorities2 != ''">#{authorities2},</if>
- <if test="certificateNumber2 != null and certificateNumber2 != ''">#{certificateNumber2},</if>
- <if test="authorities3 != null and authorities3 != ''">#{authorities3},</if>
- <if test="certificateNumber3 != null and certificateNumber3 != ''">#{certificateNumber3},</if>
- <if test="authorities4 != null and authorities4 != ''">#{authorities4},</if>
- <if test="certificateNumber4 != null and certificateNumber4 != ''">#{certificateNumber4},</if>
- <if test="status != null and status != ''">#{status},</if>
- </trim>
- </insert>
-
- <update id="updateCompanyUser" parameterType="CompanyUser">
- update js_company_user
- <trim prefix="SET" suffixOverrides=",">
- <if test="code != null and code != ''">code = #{code},</if>
- <if test="realName != null and realName != ''">real_name = #{realName},</if>
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- <if test="roleId != null and roleId != ''">role_id = #{roleId},</if>
- <if test="mobilePhone != null and mobilePhone != ''">mobile_phone = #{mobilePhone},</if>
- <if test="email != null and email != ''">email = #{email},</if>
- <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
- <if test="officePhone != null and officePhone != ''">office_phone = #{officePhone},</if>
- <if test="authorities1 != null and authorities1 != ''">authorities1 = #{authorities1},</if>
- <if test="certificateNumber1 != null and certificateNumber1 != ''">certificate_number1 = #{certificateNumber1},</if>
- <if test="authorities2 != null and authorities2 != ''">authorities2 = #{authorities2},</if>
- <if test="certificateNumber2 != null and certificateNumber2 != ''">certificate_number2 = #{certificateNumber2},</if>
- <if test="authorities3 != null and authorities3 != ''">authorities3 = #{authorities3},</if>
- <if test="certificateNumber3 != null and certificateNumber3 != ''">certificate_number3 = #{certificateNumber3},</if>
- <if test="authorities4 != null and authorities4 != ''">authorities4 = #{authorities4},</if>
- <if test="certificateNumber4 != null and certificateNumber4 != ''">certificate_number4 = #{certificateNumber4},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <update id ="changeStatus" parameterType="CompanyUser">
- update js_company_user set status = #{status} where ids = #{ids}
- </update>
-
- <delete id="deleteCompanyUserById" parameterType="String">
- delete from js_company_user where ids = #{ids}
- </delete>
-
- <delete id="deleteCompanyUserByIds" parameterType="String">
- delete from js_company_user where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DataSourceMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DataSourceMapper.xml
deleted file mode 100644
index 128020e..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DataSourceMapper.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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.javaweb.geo.mapper.DataSourceMapper">
-
- <resultMap type="DataSource" id="DataSourceResult">
- <result property="ids" column="ids" />
- <result property="dataSource" column="data_source" />
- <result property="secretKey" column="secret_key" />
- <result property="companyId" column="company_id" />
- </resultMap>
-
- <sql id="selectDataSourceVo">
- select ids, data_source, secret_key , company_id from js_data_source
- </sql>
-
- <select id="selectDataSourceList" parameterType="DataSource" resultMap="DataSourceResult">
- <include refid="selectDataSourceVo"/>
- <where>
- <if test="dataSource != null and dataSource != ''"> and data_source = #{dataSource}</if>
- <if test="secretKey != null and secretKey != ''"> and secret_key = #{secretKey}</if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
- </where>
- </select>
-
- <select id="selectDataSourceById" parameterType="String" resultMap="DataSourceResult">
- <include refid="selectDataSourceVo"/>
- where ids = #{ids}
- </select>
-
- <select id="selectDataSourceBySecretKey" resultType="java.lang.String" parameterType="String">
- select data_source from js_data_source where secret_key = #{secretKey}
- </select>
-
- <select id="selectCompanyIdBySecretKey" resultType="java.lang.String" parameterType="String">
- select company_id from js_data_source where secret_key = #{secretKey}
- </select>
-
- <insert id="insertDataSource" parameterType="DataSource">
- insert into js_data_source
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="dataSource != null and dataSource != ''">data_source,</if>
- <if test="secretKey != null and secretKey != ''">secret_key,</if>
- <if test="companyId != null and companyId != ''">company_id,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="dataSource != null and dataSource != ''">#{dataSource},</if>
- <if test="secretKey != null and secretKey != ''">#{secretKey},</if>
- <if test="companyId != null and companyId != ''">#{companyId},</if>
- </trim>
- </insert>
-
- <update id="updateDataSource" parameterType="DataSource">
- update js_data_source
- <trim prefix="SET" suffixOverrides=",">
- <if test="dataSource != null and dataSource != ''">data_source = #{dataSource},</if>
- <if test="secretKey != null and secretKey != ''">secret_key = #{secretKey},</if>
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <update id="updateDataSourceBySecretKey">
- update js_data_source
- <trim prefix="SET" suffixOverrides=",">
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- </trim>
- where secret_key = #{secretKey}
- </update>
-
- <delete id="deleteDataSourceById" parameterType="String">
- delete from js_data_source where ids = #{ids}
- </delete>
-
- <delete id="deleteDataSourceByIds" parameterType="String">
- delete from js_data_source where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ExceptionConfigMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ExceptionConfigMapper.xml
deleted file mode 100644
index 9d97e74..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ExceptionConfigMapper.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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.javaweb.geo.mapper.ExceptionConfigMapper">
-
- <resultMap type="ExceptionConfig" id="ExceptionConfigResult">
- <result property="ids" column="ids" />
- <result property="addrDistance" column="addr_distance" />
- <result property="addrNum1" column="addr_num1" />
- <result property="addrNum2" column="addr_num2" />
- <result property="addrMaxDistance" column="addr_max_distance" />
- <result property="timeSpead" column="time_spead" />
- <result property="timeNum1" column="time_num1" />
- <result property="timeNum2" column="time_num2" />
- <result property="timeMaxSpead" column="time_max_spead" />
- <result property="userCertifacate" column="user_certifacate" />
- <result property="userHours" column="user_hours" />
- </resultMap>
-
- <sql id="selectExceptionConfigVo">
- select ids, addr_distance, addr_num1, addr_num2, addr_max_distance, time_spead, time_num1, time_num2, time_max_spead, user_certifacate, user_hours from js_exception_config
- </sql>
-
- <select id="selectExceptionConfigList" parameterType="ExceptionConfig" resultMap="ExceptionConfigResult">
- <include refid="selectExceptionConfigVo"/>
- <where>
- <if test="addrDistance != null and addrDistance != ''"> and addr_distance = #{addrDistance}</if>
- <if test="addrNum1 != null and addrNum1 != ''"> and addr_num1 = #{addrNum1}</if>
- <if test="addrNum2 != null and addrNum2 != ''"> and addr_num2 = #{addrNum2}</if>
- <if test="addrMaxDistance != null and addrMaxDistance != ''"> and addr_max_distance = #{addrMaxDistance}</if>
- <if test="timeSpead != null and timeSpead != ''"> and time_spead = #{timeSpead}</if>
- <if test="timeNum1 != null and timeNum1 != ''"> and time_num1 = #{timeNum1}</if>
- <if test="timeNum2 != null and timeNum2 != ''"> and time_num2 = #{timeNum2}</if>
- <if test="timeMaxSpead != null and timeMaxSpead != ''"> and time_max_spead = #{timeMaxSpead}</if>
- <if test="userCertifacate != null and userCertifacate != ''"> and user_certifacate = #{userCertifacate}</if>
- <if test="userHours != null and userHours != ''"> and user_hours = #{userHours}</if>
- </where>
- </select>
-
- <select id="selectExceptionConfigById" parameterType="Long" resultMap="ExceptionConfigResult">
- <include refid="selectExceptionConfigVo"/>
- where ids = #{ids}
- </select>
-
- <insert id="insertExceptionConfig" parameterType="ExceptionConfig">
- insert into js_exception_config
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null ">ids,</if>
- <if test="addrDistance != null and addrDistance != ''">addr_distance,</if>
- <if test="addrNum1 != null and addrNum1 != ''">addr_num1,</if>
- <if test="addrNum2 != null and addrNum2 != ''">addr_num2,</if>
- <if test="addrMaxDistance != null and addrMaxDistance != ''">addr_max_distance,</if>
- <if test="timeSpead != null and timeSpead != ''">time_spead,</if>
- <if test="timeNum1 != null and timeNum1 != ''">time_num1,</if>
- <if test="timeNum2 != null and timeNum2 != ''">time_num2,</if>
- <if test="timeMaxSpead != null and timeMaxSpead != ''">time_max_spead,</if>
- <if test="userCertifacate != null and userCertifacate != ''">user_certifacate,</if>
- <if test="userHours != null and userHours != ''">user_hours,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null ">#{ids},</if>
- <if test="addrDistance != null and addrDistance != ''">#{addrDistance},</if>
- <if test="addrNum1 != null and addrNum1 != ''">#{addrNum1},</if>
- <if test="addrNum2 != null and addrNum2 != ''">#{addrNum2},</if>
- <if test="addrMaxDistance != null and addrMaxDistance != ''">#{addrMaxDistance},</if>
- <if test="timeSpead != null and timeSpead != ''">#{timeSpead},</if>
- <if test="timeNum1 != null and timeNum1 != ''">#{timeNum1},</if>
- <if test="timeNum2 != null and timeNum2 != ''">#{timeNum2},</if>
- <if test="timeMaxSpead != null and timeMaxSpead != ''">#{timeMaxSpead},</if>
- <if test="userCertifacate != null and userCertifacate != ''">#{userCertifacate},</if>
- <if test="userHours != null and userHours != ''">#{userHours},</if>
- </trim>
- </insert>
-
- <update id="updateExceptionConfig" parameterType="ExceptionConfig">
- update js_exception_config
- <trim prefix="SET" suffixOverrides=",">
- <if test="addrDistance != null and addrDistance != ''">addr_distance = #{addrDistance},</if>
- <if test="addrNum1 != null and addrNum1 != ''">addr_num1 = #{addrNum1},</if>
- <if test="addrNum2 != null and addrNum2 != ''">addr_num2 = #{addrNum2},</if>
- <if test="addrMaxDistance != null and addrMaxDistance != ''">addr_max_distance = #{addrMaxDistance},</if>
- <if test="timeSpead != null and timeSpead != ''">time_spead = #{timeSpead},</if>
- <if test="timeNum1 != null and timeNum1 != ''">time_num1 = #{timeNum1},</if>
- <if test="timeNum2 != null and timeNum2 != ''">time_num2 = #{timeNum2},</if>
- <if test="timeMaxSpead != null and timeMaxSpead != ''">time_max_spead = #{timeMaxSpead},</if>
- <if test="userCertifacate != null and userCertifacate != ''">user_certifacate = #{userCertifacate},</if>
- <if test="userHours != null and userHours != ''">user_hours = #{userHours},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteExceptionConfigById" parameterType="Long">
- delete from js_exception_config where ids = #{ids}
- </delete>
-
- <delete id="deleteExceptionConfigByIds" parameterType="String">
- delete from js_exception_config where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleExceptionMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleExceptionMapper.xml
deleted file mode 100644
index 33496b1..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleExceptionMapper.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?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.javaweb.geo.mapper.HandleExceptionMapper">
-
- <resultMap type="HandleException" id="HandleExceptionResult">
- <result property="ids" column="ids" />
- <result property="companyId" column="company_id" />
- <result property="description" column="description" />
- <result property="handleStatus" column="handle_status" />
- <result property="holeCode" column="hole_code" />
- <result property="holeId" column="hole_id" />
- <result property="level" column="level" />
- <result property="mapTime" column="map_time" />
- <result property="projectId" column="project_id" />
- <result property="projectName" column="project_name" />
- <result property="type" column="type" />
- <result property="isDelete" column="is_delete" />
- </resultMap>
-
- <sql id="selectHandleExceptionVo">
- select ids, company_id, description, handle_status, hole_code, hole_id, level, map_time, project_id, type, is_delete from js_handle_exception
- </sql>
-
- <select id="selectHandleExceptionList" parameterType="HandleException" resultMap="HandleExceptionResult">
- select
- e.ids,
- e.company_id,
- e.description,
- e.handle_status,
- e.hole_code,
- e.hole_id,
- e.`level`,
- e.map_time,
- e.project_id,
- p.full_name as project_name,
- e.type,
- e.is_delete
- FROM
- js_handle_exception e
- LEFT JOIN js_project p ON e.project_id = p.ids
- <where>
- e.is_delete='0'
- <if test="companyId != null and companyId != ''"> and e.company_id = #{companyId}</if>
- <if test="description != null and description != ''"> and e.description = #{description}</if>
- <if test="handleStatus != null and handleStatus != ''"> and e.handle_status = #{handleStatus}</if>
- <if test="holeCode != null and holeCode != ''"> and e.hole_code = #{holeCode}</if>
- <if test="holeId != null and holeId != ''"> and e.hole_id = #{holeId}</if>
- <if test="level != null and level != ''"> and e.level = #{level}</if>
- <if test="mapTime != null "> and e.map_time = #{mapTime}</if>
- <if test="projectId != null and projectId != ''"> and e.project_id = #{projectId}</if>
- <if test="projectName != null and projectName != ''"> and p.full_name like concat('%', #{projectName}, '%')</if>
- <if test="type != null and type != ''"> and e.type = #{type}</if>
- <if test="isDelete != null and isDelete != ''"> and e.is_delete = #{isDelete}</if>
- </where>
- </select>
-
- <select id="selectHandleExceptionById" parameterType="String" resultMap="HandleExceptionResult">
- <include refid="selectHandleExceptionVo"/>
- where ids = #{ids}
- </select>
-
- <select id="selectAllExceptionNum" resultType="java.lang.Long">
- SELECT count(ids) FROM js_handle_exception WHERE is_delete = '0'
- </select>
-
- <select id="selectExceptionNum" resultType="java.lang.Long">
- SELECT count(ids) FROM js_handle_exception WHERE is_delete = '0' AND project_id = any(SELECT ids FROM js_project WHERE `status` = '0' AND is_deleted = '0')
- </select>
-
- <select id="selectListByProjectId" parameterType="String" resultMap="HandleExceptionResult">
- <include refid="selectHandleExceptionVo"/> WHERE is_delete = '0' AND project_id = #{projectId} ORDER BY map_time ASC
- </select>
- <select id="selectListByHoleId" parameterType="String" resultMap="HandleExceptionResult">
- <include refid="selectHandleExceptionVo"/> WHERE is_delete = '0' AND hole_id = #{holeId} ORDER BY map_time ASC
- </select>
-
- <select id="selectExceptionNumByCompanyId" resultType="java.lang.Integer">
- select count(ids) from js_handle_exception where company_id = #{companyId}
- </select>
-
- <select id="selectExceptionNumByProjectId" resultType="java.lang.Integer">
- select count(ids) from js_handle_exception where project_id = #{projectId}
- </select>
-
- <insert id="insertHandleException" parameterType="HandleException">
- insert into js_handle_exception
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="companyId != null and companyId != ''">company_id,</if>
- <if test="description != null and description != ''">description,</if>
- <if test="handleStatus != null and handleStatus != ''">handle_status,</if>
- <if test="holeCode != null and holeCode != ''">hole_code,</if>
- <if test="holeId != null and holeId != ''">hole_id,</if>
- <if test="level != null and level != ''">level,</if>
- <if test="mapTime != null ">map_time,</if>
- <if test="projectId != null and projectId != ''">project_id,</if>
- <if test="type != null and type != ''">type,</if>
- <if test="isDelete != null and isDelete != ''">is_delete,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="companyId != null and companyId != ''">#{companyId},</if>
- <if test="description != null and description != ''">#{description},</if>
- <if test="handleStatus != null and handleStatus != ''">#{handleStatus},</if>
- <if test="holeCode != null and holeCode != ''">#{holeCode},</if>
- <if test="holeId != null and holeId != ''">#{holeId},</if>
- <if test="level != null and level != ''">#{level},</if>
- <if test="mapTime != null ">#{mapTime},</if>
- <if test="projectId != null and projectId != ''">#{projectId},</if>
- <if test="type != null and type != ''">#{type},</if>
- <if test="isDelete != null and isDelete != ''">#{isDelete},</if>
- </trim>
- </insert>
-
- <update id="updateHandleException" parameterType="HandleException">
- update js_handle_exception
- <trim prefix="SET" suffixOverrides=",">
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- <if test="description != null and description != ''">description = #{description},</if>
- <if test="handleStatus != null and handleStatus != ''">handle_status = #{handleStatus},</if>
- <if test="holeCode != null and holeCode != ''">hole_code = #{holeCode},</if>
- <if test="holeId != null and holeId != ''">hole_id = #{holeId},</if>
- <if test="level != null and level != ''">level = #{level},</if>
- <if test="mapTime != null ">map_time = #{mapTime},</if>
- <if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
- <if test="type != null and type != ''">type = #{type},</if>
- <if test="isDelete != null and isDelete != ''">is_delete = #{isDelete},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteHandleExceptionById" parameterType="String">
- delete from js_handle_exception where ids = #{ids}
- </delete>
-
- <delete id="deleteHandleExceptionByIds" parameterType="String">
- delete from js_handle_exception where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleOpinionMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleOpinionMapper.xml
deleted file mode 100644
index 27b4acf..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/HandleOpinionMapper.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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.javaweb.geo.mapper.HandleOpinionMapper">
-
- <resultMap type="HandleOpinion" id="HandleOpinionResult">
- <result property="ids" column="ids" />
- <result property="exceptionId" column="exception_id" />
- <result property="projectId" column="project_id" />
- <result property="companyId" column="company_id" />
- <result property="groupname" column="groupName" />
- <result property="opinion" column="opinion" />
- <result property="username" column="userName" />
- <result property="isDelete" column="is_delete" />
- </resultMap>
-
- <sql id="selectHandleOpinionVo">
- select ids, exception_id, project_id, company_id, groupName, opinion, userName, is_delete from js_handle_opinion
- </sql>
-
- <select id="selectHandleOpinionList" parameterType="HandleOpinion" resultMap="HandleOpinionResult">
- <include refid="selectHandleOpinionVo"/>
- <where>
- <if test="exceptionId != null and exceptionId != ''"> and exception_id = #{exceptionId}</if>
- <if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
- <if test="groupname != null and groupname != ''"> and groupName like concat('%', #{groupname}, '%')</if>
- <if test="opinion != null and opinion != ''"> and opinion = #{opinion}</if>
- <if test="username != null and username != ''"> and userName like concat('%', #{username}, '%')</if>
- <if test="isDelete != null and isDelete != ''"> and is_delete = #{isDelete}</if>
- </where>
- </select>
-
- <select id="selectHandleOpinionById" parameterType="String" resultMap="HandleOpinionResult">
- <include refid="selectHandleOpinionVo"/>
- where ids = #{ids}
- </select>
-
- <insert id="insertHandleOpinion" parameterType="HandleOpinion">
- insert into js_handle_opinion
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="exceptionId != null and exceptionId != ''">exception_id,</if>
- <if test="projectId != null and projectId != ''">project_id,</if>
- <if test="companyId != null and companyId != ''">company_id,</if>
- <if test="groupname != null and groupname != ''">groupName,</if>
- <if test="opinion != null and opinion != ''">opinion,</if>
- <if test="username != null and username != ''">userName,</if>
- <if test="isDelete != null and isDelete != ''">is_delete,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="exceptionId != null and exceptionId != ''">#{exceptionId},</if>
- <if test="projectId != null and projectId != ''">#{projectId},</if>
- <if test="companyId != null and companyId != ''">#{companyId},</if>
- <if test="groupname != null and groupname != ''">#{groupname},</if>
- <if test="opinion != null and opinion != ''">#{opinion},</if>
- <if test="username != null and username != ''">#{username},</if>
- <if test="isDelete != null and isDelete != ''">#{isDelete},</if>
- </trim>
- </insert>
-
- <update id="updateHandleOpinion" parameterType="HandleOpinion">
- update js_handle_opinion
- <trim prefix="SET" suffixOverrides=",">
- <if test="exceptionId != null and exceptionId != ''">exception_id = #{exceptionId},</if>
- <if test="projectId != null and projectId != ''">project_id = #{projectId},</if>
- <if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
- <if test="groupname != null and groupname != ''">groupName = #{groupname},</if>
- <if test="opinion != null and opinion != ''">opinion = #{opinion},</if>
- <if test="username != null and username != ''">userName = #{username},</if>
- <if test="isDelete != null and isDelete != ''">is_delete = #{isDelete},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteHandleOpinionById" parameterType="String">
- delete from js_handle_opinion where ids = #{ids}
- </delete>
-
- <delete id="deleteHandleOpinionByIds" parameterType="String">
- delete from js_handle_opinion where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/LaborUnitMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/LaborUnitMapper.xml
deleted file mode 100644
index 1da989e..0000000
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/LaborUnitMapper.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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.javaweb.geo.mapper.LaborUnitMapper">
-
- <resultMap type="LaborUnit" id="LaborUnitResult">
- <result property="ids" column="ids" />
- <result property="fullName" column="full_name" />
- <result property="laborCode" column="labor_code" />
- <result property="laborRange" column="labor_range" />
- <result property="laborStatus" column="labor_status" />
- <result property="laborType" column="labor_type" />
- <result property="datasource" column="datasource" />
- </resultMap>
-
- <sql id="selectLaborUnitVo">
- select ids, full_name, labor_code, labor_range, labor_status, labor_type, datasource from js_labor_unit
- </sql>
-
- <select id="selectLaborUnitList" parameterType="LaborUnit" resultMap="LaborUnitResult">
- <include refid="selectLaborUnitVo"/>
- <where>
- <if test="ids != null and ids != ''"> and ids = #{ids}</if>
- <if test="fullName != null and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if>
- <if test="laborCode != null and laborCode != ''"> and labor_code = #{laborCode}</if>
- <if test="laborRange != null and laborRange != ''"> and labor_range = #{laborRange}</if>
- <if test="laborStatus != null and laborStatus != ''"> and labor_status = #{laborStatus}</if>
- <if test="laborType != null and laborType != ''"> and labor_type = #{laborType}</if>
- <if test="datasource != null and datasource != ''"> and datasource = #{datasource}</if>
- </where>
- </select>
-
- <select id="selectLaborUnitById" parameterType="String" resultMap="LaborUnitResult">
- <include refid="selectLaborUnitVo"/>
- where ids = #{ids}
- </select>
-
- <insert id="insertLaborUnit" parameterType="LaborUnit">
- insert into js_labor_unit
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">ids,</if>
- <if test="fullName != null and fullName != ''">full_name,</if>
- <if test="laborCode != null and laborCode != ''">labor_code,</if>
- <if test="laborRange != null and laborRange != ''">labor_range,</if>
- <if test="laborStatus != null and laborStatus != ''">labor_status,</if>
- <if test="laborType != null and laborType != ''">labor_type,</if>
- <if test="datasource != null and datasource != ''">datasource,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="ids != null and ids != ''">#{ids},</if>
- <if test="fullName != null and fullName != ''">#{fullName},</if>
- <if test="laborCode != null and laborCode != ''">#{laborCode},</if>
- <if test="laborRange != null and laborRange != ''">#{laborRange},</if>
- <if test="laborStatus != null and laborStatus != ''">#{laborStatus},</if>
- <if test="laborType != null and laborType != ''">#{laborType},</if>
- <if test="datasource != null and datasource != ''">#{datasource},</if>
- </trim>
- </insert>
-
- <update id="updateLaborUnit" parameterType="LaborUnit">
- update js_labor_unit
- <trim prefix="SET" suffixOverrides=",">
- <if test="fullName != null and fullName != ''">full_name = #{fullName},</if>
- <if test="laborCode != null and laborCode != ''">labor_code = #{laborCode},</if>
- <if test="laborRange != null and laborRange != ''">labor_range = #{laborRange},</if>
- <if test="laborStatus != null and laborStatus != ''">labor_status = #{laborStatus},</if>
- <if test="laborType != null and laborType != ''">labor_type = #{laborType},</if>
- <if test="datasource != null and datasource != ''">datasource = #{datasource},</if>
- </trim>
- where ids = #{ids}
- </update>
-
- <delete id="deleteLaborUnitById" parameterType="String">
- delete from js_labor_unit where ids = #{ids}
- </delete>
-
- <delete id="deleteLaborUnitByIds" parameterType="String">
- delete from js_labor_unit where ids in
- <foreach item="ids" collection="array" open="(" separator="," close=")">
- #{ids}
- </foreach>
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
index 5e74707..0c001e6 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectMapper.xml
@@ -11,8 +11,8 @@
<result property="code" column="code" />
<result property="companyId" column="company_id" />
<result property="companyName" column="company_name" />
- <result property="createTime" column="create_time" />
- <result property="endTime" column="end_time" />
+ <result property="startTime" column="start_time" />
+ <result property="endTime" column="end_time" />
<result property="district" column="district" />
<result property="fullName" column="full_name" />
<result property="laborUnit" column="labor_unit" />
@@ -27,121 +27,37 @@
<result property="statusChangeUser" column="status_change_user" />
<result property="statusChangeReason" column="status_change_reason" />
<result property="dataSource" column="data_source" />
+ <result property="lng" column="lng" />
+ <result property="lat" column="lat" />
+ <result property="rate" column="rate" />
+ <result property="createTime" column="create_time" />
</resultMap>
<sql id="selectProjectVo">
- select ids, address, city, code, company_id, create_time,end_time, district, full_name, labor_unit, leader, owner, province, serial_number, 'describe', status, is_deleted, status_change_user, status_change_reason, data_source from js_project
-
+ select ids, address, city, code, company_id,start_time,end_time, district, full_name, labor_unit, leader, owner, province, serial_number, 'describe', status, is_deleted, status_change_user, status_change_reason, data_source,lng,lat,rate,create_time from js_project
</sql>
<select id="selectProjectList" parameterType="Project" resultMap="ProjectResult">
- <!-- <include refid="selectProjectVo"/>-->
- select
- p.ids,
- p.address,
- p.city,
- p.code,
- p.company_id,
- c.full_name AS company_name,
- p.create_time,
- p.end_time,
- p.district,
- p.full_name,
- p.labor_unit,
- p.leader,
- u.real_name AS leader_name,
- p.owner,
- p.province,
- p.serial_number,
- 'p.describe',
- p.status,
- p.is_deleted,
- p.status_change_user,
- p.status_change_reason,
- p.data_source
- FROM
- js_project p
- LEFT JOIN js_company_user u ON p.leader = u.ids
- LEFT JOIN js_company c ON p.company_id = c.ids
+ <include refid="selectProjectVo"/>
<where>
- p.is_deleted='0'
- <if test="address != null and address != ''"> and p.address = #{address}</if>
- <if test="city != null "> and p.city = #{city}</if>
- <if test="code != null and code != ''"> and p.code = #{code}</if>
- <if test="companyId != null "> and p.company_id = #{companyId}</if>
- <if test="district != null and district != ''"> and p.district = #{district}</if>
- <if test="fullName != null and fullName != ''"> and p.full_name like concat('%', #{fullName}, '%')</if>
- <if test="laborUnit != null and laborUnit != ''"> and p.labor_unit = #{laborUnit}</if>
- <if test="leader != null and leader != ''"> and p.leader = #{leader}</if>
- <if test="owner != null and owner != ''"> and p.owner = #{owner}</if>
- <if test="province != null and province != ''"> and p.province = #{province}</if>
- <if test="serialNumber != null and serialNumber != ''"> and p.serial_number = #{serialNumber}</if>
- <if test="describe != null and describe != ''"> and p.describe = #{describe}</if>
- <if test="status != null and status != ''"> and p.status = #{status}</if>
- <if test="isDeleted != null and isDeleted != ''"> and p.is_deleted = #{isDeleted}</if>
- ORDER BY p.create_time DESC
+ <if test="address != null and address != ''"> and address = #{address}</if>
+ <if test="city != null "> and city = #{city}</if>
+ <if test="code != null and code != ''"> and code = #{code}</if>
+ <if test="district != null and district != ''"> and district = #{district}</if>
+ <if test="fullName != null and fullName != ''"> and full_name like concat('%', #{fullName}, '%')</if>
+ <if test="laborUnit != null and laborUnit != ''"> and labor_unit = #{laborUnit}</if>
+ <if test="leader != null and leader != ''"> and leader = #{leader}</if>
+ <if test="owner != null and owner != ''"> and owner = #{owner}</if>
+ <if test="province != null and province != ''"> and province = #{province}</if>
+ <if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="isDeleted != null and isDeleted != ''"> and is_deleted = #{isDeleted}</if>
</where>
</select>
<select id="selectProjectById" parameterType="String" resultMap="ProjectResult">
- select
- p.ids,
- p.address,
- p.city,
- p.code,
- p.company_id,
- c.full_name AS company_name,
- p.create_time,
- p.end_time,
- p.district,
- p.full_name,
- p.labor_unit,
- p.leader,
- u.real_name AS leader_name,
- p.owner,
- p.province,
- p.serial_number,
- 'p.describe',
- p.status,
- p.is_deleted,
- p.status_change_user,
- p.status_change_reason,
- p.data_source
- FROM
- js_project p
- LEFT JOIN js_company_user u ON p.leader = u.ids
- LEFT JOIN js_company c ON p.company_id = c.ids
- WHERE p.is_deleted='0' and p.ids = #{ids}
- </select>
-
- <select id="selectProjectBySerialNumber" resultMap="ProjectResult">
- <include refid="selectProjectVo"/>
- where serial_number = #{serialNumber} and is_deleted='0'
- </select>
-
- <select id="selectAllProjectNum" resultType="java.lang.Long">
- SELECT count(ids) FROM js_project WHERE is_deleted = '0'
- </select>
-
- <select id="selectProjectNum" resultType="java.lang.Long">
- SELECT count(ids) FROM js_project WHERE `status` = '0' AND is_deleted = '0'
- </select>
-
- <select id="proExceptionList" resultMap="ProjectResult">
- SELECT
- p.ids,
- p.full_name,
- c.full_name as company_name,
- u.real_name as leader_name
- FROM
- js_project p,
- js_company_user u,
- js_company c
- WHERE
- p.leader = u.ids
- AND p.company_id = c.ids
- AND p.is_deleted = '0'
- AND p.ids = ANY ( SELECT project_id FROM js_handle_exception WHERE is_delete = '0' GROUP BY project_id )
+ <include refid="selectProjectVo"/>
+ WHERE ids = #{ids}
</select>
<insert id="insertProject" parameterType="Project">
@@ -152,7 +68,8 @@
<if test="city != null ">city,</if>
<if test="code != null and code != ''">code,</if>
<if test="companyId != null ">company_id,</if>
- <if test="createTime != null ">create_time,</if>
+ <if test="startTime != null ">start_time,</if>
+ <if test="endTime != null ">end_time,</if>
<if test="district != null and district != ''">district,</if>
<if test="fullName != null and fullName != ''">full_name,</if>
<if test="laborUnit != null and laborUnit != ''">labor_unit,</if>
@@ -166,6 +83,10 @@
<if test="statusChangeUser != null and statusChangeUser != ''">status_change_user,</if>
<if test="statusChangeReason != null and statusChangeReason != ''">status_change_reason,</if>
<if test="dataSource != null and dataSource != ''">data_source,</if>
+ <if test="lng != null">lng,</if>
+ <if test="lat != null">lat,</if>
+ <if test="rate != null and rate != ''">rate,</if>
+ <if test="createTime != null ">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ids != null and ids != ''">#{ids},</if>
@@ -173,7 +94,9 @@
<if test="city != null ">#{city},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="companyId != null ">#{companyId},</if>
- <if test="createTime != null ">#{createTime},</if>
+ <if test="startTime != null ">#{startTime},</if>
+ <if test="endTime != null ">#{endTime},</if>
+
<if test="district != null and district != ''">#{district},</if>
<if test="fullName != null and fullName != ''">#{fullName},</if>
<if test="laborUnit != null and laborUnit != ''">#{laborUnit},</if>
@@ -187,6 +110,10 @@
<if test="statusChangeUser != null and statusChangeUser != ''">#{statusChangeUser},</if>
<if test="statusChangeReason != null and isDeleted != ''">#{statusChangeReason},</if>
<if test="dataSource != null and dataSource != ''">#{dataSource},</if>
+ <if test="lng != null">#{lng},</if>
+ <if test="lat != null">#{lat},</if>
+ <if test="rate != null and rate != ''">#{rate},</if>
+ <if test="createTime != null ">#{createTime},</if>
</trim>
</insert>
@@ -197,7 +124,8 @@
<if test="city != null ">city = #{city},</if>
<if test="code != null and code != ''">code = #{code},</if>
<if test="companyId != null ">company_id = #{companyId},</if>
- <if test="createTime != null ">create_time = #{createTime},</if>
+ <if test="startTime != null ">start_time = #{startTime},</if>
+ <if test="endTime != null ">end_time = #{endTime},</if>
<if test="district != null and district != ''">district = #{district},</if>
<if test="fullName != null and fullName != ''">full_name = #{fullName},</if>
<if test="laborUnit != null and laborUnit != ''">labor_unit = #{laborUnit},</if>
@@ -211,6 +139,10 @@
<if test="statusChangeUser != null and statusChangeUser != ''">status_change_user = #{statusChangeUser},</if>
<if test="statusChangeReason != null and statusChangeReason != ''">status_change_reason = #{statusChangeReason},</if>
<if test="dataSource != null and dataSource != ''">data_source = #{dataSource},</if>
+ <if test="lng != null">lng = #{lng},</if>
+ <if test="lat != null">lat = #{lat},</if>
+ <if test="rate != null and rate != ''">rate = #{rate},</if>
+ <if test="createTime != null ">create_time = #{createTime},</if>
</trim>
where ids = #{ids}
</update>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
index 7f0ccb7..bffd524 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/add.html
@@ -2,46 +2,43 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('鏂板椤圭洰')" />
+ <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-project-add">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">椤圭洰缂栧彿锛�</label>
+ <div class="col-sm-8">
+ <input name="code" class="form-control" required type="text">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
+ <div class="col-sm-8">
+ <input name="fullName" class="form-control" required type="text">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍖哄幙锛�</label>
+ <div class="col-sm-8">
+ <select name="district" class="form-control m-b" th:with="type=${@dict.getType('sys_district')}">
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </div>
+ </div>
+
<div class="form-group">
- <label class="col-sm-3 control-label">鍦板潃锛�</label>
+ <label class="col-sm-3 control-label">璇︾粏鍦板潃锛�</label>
<div class="col-sm-8">
<input name="address" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍩庡競锛�</label>
- <div class="col-sm-8">
- <input name="city" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰缂栧彿锛�</label>
- <div class="col-sm-8">
- <input name="code" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">浼佷笟ID锛�</label>
- <div class="col-sm-8">
- <input name="companyId" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍖哄幙锛�</label>
- <div class="col-sm-8">
- <input name="district" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="fullName" class="form-control" type="text">
- </div>
- </div>
+
+
<div class="form-group">
<label class="col-sm-3 control-label">鍔冲姟鍗曚綅鍚嶇О锛�</label>
<div class="col-sm-8">
@@ -49,59 +46,59 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰璐熻矗浜篒D锛�</label>
+ <label class="col-sm-3 control-label">椤圭洰璐熻矗浜猴細</label>
<div class="col-sm-8">
<input name="leader" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">涓氫富锛�</label>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">缁忓害锛�</label>
<div class="col-sm-8">
- <input name="owner" class="form-control" type="text">
+ <input name="lng" class="form-control" required type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鐪佷唤锛�</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">绾害锛�</label>
<div class="col-sm-8">
- <input name="province" class="form-control" type="text">
+ <input name="lat" class="form-control" required type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰搴忓垪鍙凤細</label>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">寮�濮嬫椂闂达細</label>
<div class="col-sm-8">
- <input name="serialNumber" class="form-control" type="text">
+ <input name="startTime" type="text" class="form-control" id="start-time" placeholder="閫夋嫨椤圭洰璧峰鏃堕棿">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鍕樺療澶х翰锛�</label>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">缁撴潫鏃堕棿锛�</label>
<div class="col-sm-8">
- <input name="describe" class="form-control" type="text">
+ <input name="endTime" type="text" class="form-control" id="end-time" placeholder="閫夋嫨椤圭洰缁撴潫鏃堕棿">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鐘舵�侊細</label>
- <div class="col-sm-8">
- <div class="radio-box">
- <input type="radio" name="status" value="">
- <label th:for="status" th:text="鏈煡"></label>
- </div>
- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 浠ｇ爜鐢熸垚璇烽�夋嫨瀛楀吀灞炴��</span>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">鏄惁鍒犻櫎锛�</label>
- <div class="col-sm-8">
- <input name="isDeleted" class="form-control" type="text">
- </div>
- </div>
+
</form>
</div>
<th:block th:include="include :: footer" />
+ <th:block th:include="include :: select2-js" />
+ <th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "geo/project"
$("#form-project-add").validate({
focusCleanup: true
});
+ $("#start-time").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+ $("#end-time").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
function submitHandler() {
if ($.validate.form()) {
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
index cf22b31..ba3a6f5 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/edit.html
@@ -2,88 +2,114 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('淇敼椤圭洰')" />
+ <th:block th:include="include :: select2-css" />
+ <th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-project-edit" th:object="${project}">
<input name="ids" th:field="*{ids}" type="hidden">
- <div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
- <div class="col-sm-8">
- <input name="fullName" th:field="*{fullName}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
+ <div class="form-group">
<label class="col-sm-3 control-label">椤圭洰缂栧彿锛�</label>
<div class="col-sm-8">
<input name="code" th:field="*{code}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍦板潃锛�</label>
+ <label class="col-sm-3 control-label">椤圭洰鍚嶇О锛�</label>
+ <div class="col-sm-8">
+ <input name="fullName" th:field="*{fullName}" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">鍖哄幙锛�</label>
+ <div class="col-sm-8">
+ <select name="district" class="form-control m-b" th:with="type=${@dict.getType('sys_district')}">
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{district}"></option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">璇︾粏鍦板潃锛�</label>
<div class="col-sm-8">
<input name="address" th:field="*{address}" class="form-control" type="text">
</div>
</div>
-
-<!-- <div class="form-group"> -->
-<!-- <label class="col-sm-3 control-label">鍖哄幙锛�</label>-->
-<!-- <div class="col-sm-8">-->
-<!-- <input name="district" th:field="*{district}" class="form-control" type="text">-->
-<!-- </div>-->
-<!-- </div>-->
-
<div class="form-group">
<label class="col-sm-3 control-label">鍔冲姟鍗曚綅鍚嶇О锛�</label>
<div class="col-sm-8">
<input name="laborUnit" th:field="*{laborUnit}" class="form-control" type="text">
</div>
</div>
-<!-- <div class="form-group"> -->
-<!-- <label class="col-sm-3 control-label">椤圭洰璐熻矗浜猴細</label>-->
-<!-- <div class="col-sm-8">-->
-<!-- <input name="leader" th:field="*{leader}" class="form-control" type="text">-->
-<!-- </div>-->
-<!-- </div>-->
<div class="form-group">
- <label class="col-sm-3 control-label">涓氫富锛�</label>
+ <label class="col-sm-3 control-label">椤圭洰璐熻矗浜猴細</label>
<div class="col-sm-8">
- <input name="owner" th:field="*{owner}" class="form-control" type="text">
+ <input name="leader" th:field="*{leader}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">椤圭洰搴忓垪鍙凤細</label>
+ <label class="col-sm-3 control-label">缁忓害锛�</label>
<div class="col-sm-8">
- <input name="serialNumber" th:field="*{serialNumber}" class="form-control" type="text">
+ <input name="lng" th:field="*{lng}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">鍕樺療澶х翰锛�</label>
+ <label class="col-sm-3 control-label">绾害锛�</label>
<div class="col-sm-8">
- <input name="describe" th:field="*{describe}" class="form-control" type="text">
+ <input name="lat" th:field="*{lat}" class="form-control" type="text">
</div>
</div>
+
<div class="form-group">
- <label class="col-sm-3 control-label">鏁版嵁鏉ユ簮锛�</label>
+ <label class="col-sm-3 control-label">寮�濮嬫椂闂达細</label>
<div class="col-sm-8">
- <input name="dataSource" th:field="*{dataSource}" class="form-control" type="text">
+ <input name="startTime" th:field="*{startTime}" type="text" class="form-control" id="start-time" placeholder="閫夋嫨椤圭洰璧峰鏃堕棿">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">缁撴潫鏃堕棿锛�</label>
+ <div class="col-sm-8">
+ <input name="endTime" th:field="*{endTime}" type="text" class="form-control" id="end-time" placeholder="閫夋嫨椤圭洰缁撴潫鏃堕棿">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
+ <th:block th:include="include :: select2-js" />
+ <th:block th:include="include :: datetimepicker-js" />
<script type="text/javascript">
var prefix = ctx + "geo/project";
$("#form-project-edit").validate({
focusCleanup: true
});
+ $("#start-time").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+ $("#end-time").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-project-edit').serialize());
}
+
+ // var data = $("#form-user-edit").serializeArray();
+ // var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
+ // var roleIds = $.form.selectCheckeds("role");
+ // var postIds = $.form.selectSelects("post");
+ // data.push({"name": "status", "value": status});
+ // data.push({"name": "roleIds", "value": roleIds});
+ // data.push({"name": "postIds", "value": postIds});
+ // $.operate.saveTab(prefix + "/edit", data);
}
</script>
</body>
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index b9be8f5..27e3e93 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
@@ -16,6 +16,10 @@
<input type="text" name="fullName"/>
</li>
<li>
+ <p>椤圭洰缂栧彿锛�</p>
+ <input type="text" name="code"/>
+ </li>
+ <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 鎼滅储</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 閲嶇疆</a>
</li>
@@ -25,9 +29,9 @@
</div>
<div class="btn-group-sm" id="toolbar" role="group">
-<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add">-->
-<!-- <i class="fa fa-plus"></i> 娣诲姞-->
-<!-- </a>-->
+ <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="geo:project:add">
+ <i class="fa fa-plus"></i> 娣诲姞
+ </a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="geo:project:edit">
<i class="fa fa-edit"></i> 淇敼
</a>
@@ -58,6 +62,11 @@
checkbox: true
},
{
+ field : 'code',
+ title : '椤圭洰缂栧彿',
+ sortable:true
+ },
+ {
field : 'fullName',
title : '椤圭洰鍚嶇О',
formatter: function(value, row, index) {
@@ -66,65 +75,13 @@
sortable:true
},
{
- field : 'companyName',
- title : '鍕樺療鍗曚綅'
- },
- {
field : 'laborUnit',
title : '鍔冲姟鍗曚綅'
},
{
field : 'district',
title : '鍖哄幙',
- formatter: function(value, row, index) {
- if(row.district === 1){
- return "涓滃煄鍖�";
- }else if(row.district === 17){
- return "瀵嗕簯鍘�";
- }else if(row.district === 16){
- return "骞宠胺鍖�";
- }else if(row.district === 15){
- return "鎬�鏌斿尯";
- }else if(row.district === 14){
- return "澶у叴鍖�";
- }else if(row.district === 13){
- return "鏄屽钩鍖�";
- }else if(row.district === 12){
- return "椤轰箟鍖�";
- }else if(row.district === 11){
- return "閫氬窞鍖�";
- }else if(row.district === 10){
- return "鎴垮北鍖�";
- }else if(row.district === 9){
- return "闂ㄥご娌熷尯";
- }else if(row.district === 8){
- return "娴锋穩鍖�";
- }else if(row.district === 7){
- return "鐭虫櫙灞卞尯";
- }else if(row.district === 6){
- return "涓板彴鍖�";
- }else if(row.district === 5){
- return "鏈濋槼鍖�";
- }else if(row.district === 4){
- return "瀹ｆ鍖�";
- }else if(row.district === 3){
- return "宕囨枃鍖�";
- }else if(row.district === 2){
- return "瑗垮煄鍖�";
- }else if(row.district === 18){
- return "寤跺簡鍘�";
- }else if(row.district === 99){
- return "澶栧煚";
- }else {
- return "";
- }
- }
},
- {
- field : 'owner',
- title : '涓氫富鍚嶇О'
- },
-
{
field : 'leaderName',
title : '椤圭洰璐熻矗浜�'
@@ -143,10 +100,6 @@
return "楠屾敹";
}
}
- },
- {
- field : 'dataSource',
- title : '鏁版嵁鏉ユ簮'
},
{
title: '鎿嶄綔',
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
index 21b4842..26c600b 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
+++ b/javaweb-plus/javaweb-cms/src/main/resources/templates/loginPage/process/login.html
@@ -4,8 +4,8 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
- <title>鍕樺療淇℃伅鍖栨湇鍔″钩鍙�</title>
- <meta name="description" content="澶ф暟鎹钩鍙�">
+ <title>閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</title>
+ <meta name="description" content="閽绘帰宸ョ▼淇℃伅鍖栫郴缁�">
<!--[if lt IE 9]>
<meta http-equiv="refresh" content="0;ie.html" />
<![endif]-->
@@ -89,7 +89,7 @@
<span class="bar-line"></span>
<form name="loginform" id="loginform">
<input type="hidden" id="redirectUrl" name="redirectUrl" value="${redirectUrl}" >
- <div><span id="logo-text">鐩戠骞冲彴鐧诲綍</span></div>
+ <div><span id="logo-text">閽绘帰宸ョ▼淇℃伅鍖栫郴缁�</span></div>
<div class="input-container" style="margin-top:25px;position:relative;">
<img src="images/loginPage/user.png" />
diff --git a/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/CollectStatisticsTask.java b/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/CollectStatisticsTask.java
deleted file mode 100644
index 49d67d0..0000000
--- a/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/CollectStatisticsTask.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.javaweb.quartz.task;
-
-import com.javaweb.geotdp.service.impl.GeoDataServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @author mzy-cxy
- */
-@Component("collectStatisticsTask")
-public class CollectStatisticsTask {
-
-
- @Autowired
- private GeoDataServiceImpl geoDataService;
-
-
- /**
- * 鎵弿寮傚父
- */
- public void scanCollectStatistics(){
- System.out.println("缁熻姹囨�讳换鍔″紑濮嬫墽琛�=============缁熻姹囨�讳换鍔″紑濮嬫墽琛�!=========================");
- try {
- geoDataService.scanCollectStatistics();
- } catch (Exception e) {
- System.out.println("缁熻姹囨�讳换鍔″紑濮嬫墽琛�=============缁熻姹囨�讳换鍔℃墽琛屽け璐ワ紒=========================");
- e.printStackTrace();
- }
- System.out.println("缁熻姹囨�讳换鍔″紑濮嬫墽琛�=============缁熻姹囨�绘墽琛岀粨鏉燂紒=========================");
- }
-
-}
diff --git a/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/HandleExceptionTask.java b/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/HandleExceptionTask.java
deleted file mode 100644
index 4eb2358..0000000
--- a/javaweb-plus/javaweb-quartz/src/main/java/com/javaweb/quartz/task/HandleExceptionTask.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.javaweb.quartz.task;
-
-
-import com.javaweb.geotdp.service.impl.GeoDataServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @author mzy-cxy
- */
-@Component("handleExceptionTask")
-public class HandleExceptionTask {
-
- @Autowired
- private GeoDataServiceImpl geoDataService;
-
-
- /**
- * 鎵弿寮傚父
- */
- public void scanException(){
- System.out.println("鎵弿寮傚父浠诲姟寮�濮嬫墽琛�=============鎵弿寮傚父浠诲姟寮�濮嬫墽琛�!=========================");
- try {
- geoDataService.scanHandleException();
- } catch (Exception e) {
- System.out.println("鎵弿寮傚父浠诲姟寮�濮嬫墽琛�=============鎵弿寮傚父浠诲姟鎵ц澶辫触锛�=========================");
- e.printStackTrace();
- }
- System.out.println("鎵弿寮傚父浠诲姟寮�濮嬫墽琛�=============鎵弿寮傚父浠诲姟鎵ц缁撴潫锛�=========================");
- }
-
-
-}
--
Gitblit v1.9.1