From d428df51fc064479f2e56d55fa7a074e918a4924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 27 Aug 2023 13:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../framework/config/SecurityConfig.java | 2 +-
ruoyi-wechat/pom.xml | 17 +-
.../ProjectCheckingController.java | 3 +-
.../project/controller/ProjectController.java | 81 ++
.../ProjectProblemmodifyController.java | 4 +-
.../ProjectUserinfoController.java | 2 +-
.../domain/WxProjectInfo.java | 2 +-
.../project/mapper/WxProjectInfoMapper.java | 57 +
.../service/WxIProjectInfoService.java | 43 +
.../impl/WxProjectInfoServiceImpl.java | 118 ++
.../controller/WxProjectInfoController.java | 164 ---
.../mapper/WxProjectInfoMapper.java | 181 ---
.../service/WxIProjectInfoService.java | 120 --
.../service/WxProjectInfoServiceImpl.java | 339 ------
.../pshManage/controller/PshController.java | 582 ----------
.../ruoyi/web/pshManage/mapper/PshMapper.java | 370 ------
.../web/pshManage/service/IPshService.java | 148 ---
.../web/pshManage/service/PshServiceImpl.java | 565 ---------
.../web/pshMarks/mapper/PshMarksMapper.java | 153 ---
.../pshMarks/service/IPshMarksService.java | 109 --
.../pshMarks/service/PshMarksServiceImpl.java | 403 -------
.../sspManage/controller/SspController.java | 582 ----------
.../ruoyi/web/sspManage/mapper/SspMapper.java | 396 -------
.../web/sspManage/service/ISspService.java | 148 ---
.../web/sspManage/service/SspServiceImpl.java | 610 ----------
.../web/sspMarks/domain/ProcessName.java | 138 ---
.../web/sspMarks/domain/SspMarkfileinfo.java | 125 --
.../ruoyi/web/sspMarks/domain/SspMarks.java | 536 ---------
.../web/sspMarks/domain/SspMarksDto.java | 303 -----
.../web/sspMarks/domain/SspMarksflow.java | 97 --
.../web/sspMarks/mapper/SspMarksMapper.java | 153 ---
.../sspMarks/service/ISspMarksService.java | 109 --
.../sspMarks/service/SspMarksServiceImpl.java | 403 -------
.../controller/WechatUserLoginController.java | 51 +-
.../controller/WxUserLoginController.java | 104 --
.../mapper/WechatUserLoginMapper.java | 9 +-
.../userLogin/mapper/WxUserLoginMapper.java | 69 --
.../service/IWechatUserLoginService.java | 20 +-
.../userLogin/service/WxUserLoginService.java | 57 -
.../service/WxUserLoginServiceImpl.java | 303 -----
.../impl/WechatUserLoginServiceImpl.java | 120 +-
.../ruoyi/web/utils/MultipartFileUtils.java | 21 -
.../resources/mapper/ProjectInfoMapper.xml | 396 +------
.../src/main/resources/mapper/PshMapper.xml | 637 -----------
.../main/resources/mapper/PshMarksMapper.xml | 419 -------
.../src/main/resources/mapper/SspMapper.xml | 692 -----------
.../main/resources/mapper/SspMarksMapper.xml | 419 -------
.../main/resources/mapper/UserLoginMapper.xml | 113 --
.../mapper/WechatUserLoginMapper.xml | 7 +-
.../static/css/ssp/bootstrap.min.css | 6 -
.../main/resources/static/css/ssp/commes.css | 31 -
.../main/resources/static/css/ssp/date.css | 129 ---
.../css/ssp/default-skin/default-skin.css | 483 --------
.../css/ssp/default-skin/default-skin.png | Bin 547 -> 0 bytes
.../css/ssp/default-skin/default-skin.svg | 1 -
.../static/css/ssp/default-skin/preloader.gif | Bin 866 -> 0 bytes
.../main/resources/static/css/ssp/newTips.css | 88 --
.../resources/static/css/ssp/photoswipe.css | 178 ---
.../resources/static/css/ssp/takePicture.css | 782 -------------
.../src/main/resources/static/img/left.png | Bin 1857 -> 0 bytes
.../src/main/resources/static/img/ssp/1.jpg | Bin 26088 -> 0 bytes
.../src/main/resources/static/img/ssp/2.jpg | Bin 14069 -> 0 bytes
.../src/main/resources/static/img/ssp/3.jpg | Bin 97788 -> 0 bytes
.../src/main/resources/static/img/ssp/4.jpg | Bin 35952 -> 0 bytes
.../src/main/resources/static/img/ssp/5.jpg | Bin 45627 -> 0 bytes
.../ssp/866000e905ae45a8b79d80de52bb4e9a.gif | Bin 17255 -> 0 bytes
.../static/img/ssp/border_bottom.png | Bin 945 -> 0 bytes
.../resources/static/img/ssp/checkbox.png | Bin 1120 -> 0 bytes
.../resources/static/img/ssp/checkbox_i.png | Bin 1289 -> 0 bytes
.../main/resources/static/img/ssp/h_lift.png | Bin 1141 -> 0 bytes
.../main/resources/static/img/ssp/left.png | Bin 1857 -> 0 bytes
.../resources/static/img/ssp/photograph.png | Bin 5390 -> 0 bytes
.../resources/static/img/ssp/position.png | Bin 1570 -> 0 bytes
.../resources/static/img/ssp/put_away.png | Bin 2643 -> 0 bytes
.../main/resources/static/img/ssp/radio.png | Bin 1618 -> 0 bytes
.../main/resources/static/img/ssp/radio_i.png | Bin 1786 -> 0 bytes
.../main/resources/static/img/ssp/right.png | Bin 1840 -> 0 bytes
.../main/resources/static/img/ssp/screen.png | Bin 1545 -> 0 bytes
.../main/resources/static/img/ssp/search.png | Bin 1352 -> 0 bytes
.../resources/static/img/ssp/upload_img.png | Bin 4688 -> 0 bytes
.../resources/static/img/ssp/upload_video.png | Bin 3412 -> 0 bytes
.../src/main/resources/static/img/video.png | Bin 4214 -> 0 bytes
.../resources/static/img/video_border.png | Bin 3197 -> 0 bytes
.../resources/static/js/jquery-3.0.0.min.js | 4 -
.../main/resources/static/js/jquery.form.js | 1009 -----------------
.../resources/static/js/ssp/bootstrap.min.js | 7 -
.../resources/static/js/ssp/initialization.js | 214 ----
.../static/js/ssp/jquery-3.0.0.min.js | 4 -
.../resources/static/js/ssp/jquery.date.js | 482 --------
.../resources/static/js/ssp/jquery.form.js | 1009 -----------------
.../resources/static/js/ssp/jquery.min.js | 4 -
.../main/resources/static/js/ssp/newTips.js | 22 -
.../js/ssp/photoswipe-ui-default.min.js | 4 -
.../resources/static/js/ssp/photoswipe.min.js | 4 -
.../static/js/ssp/qiniu-3.1.2.min.js | 2 -
.../main/resources/static/js/ssp/upload.js | 184 ---
.../main/resources/static/js/ssp/upload2.js | 168 ---
.../main/resources/static/js/ssp/vue.min.js | 8 -
.../main/resources/static/js/ssp/window.js | 454 --------
.../src/main/resources/static/js/tree.js | 43 -
.../resources/static/js/vue-resource-1.3.4.js | 7 -
.../src/main/resources/static/js/vue.min.js | 8 -
.../templates/pshManage/myChanges.html | 311 -----
.../templates/pshManage/reportWithmarks.html | 803 -------------
.../templates/pshManage/reportWithmarks2.html | 840 --------------
.../templates/pshManage/sspChange.html | 798 -------------
.../templates/pshManage/sspListPage.html | 553 ---------
.../templates/pshManage/sspListPage2.html | 301 -----
.../templates/pshManage/sspListPageMy.html | 577 ----------
.../templates/pshManage/sspListPageMy2.html | 319 ------
.../templates/pshManage/sspMarkView.html | 187 ---
.../pshManage/sspQualityMarkDetail.html | 285 -----
.../templates/pshManage/sspStayCheck.html | 308 -----
.../templates/sspManage/myChanges.html | 311 -----
.../templates/sspManage/reportWithmarks.html | 803 -------------
.../templates/sspManage/reportWithmarks2.html | 840 --------------
.../templates/sspManage/sspChange.html | 796 -------------
.../templates/sspManage/sspListPage.html | 552 ---------
.../templates/sspManage/sspListPage2.html | 301 -----
.../templates/sspManage/sspListPageMy.html | 577 ----------
.../templates/sspManage/sspListPageMy2.html | 319 ------
.../templates/sspManage/sspMarkView.html | 187 ---
.../sspManage/sspQualityMarkDetail.html | 285 -----
.../templates/sspManage/sspStayCheck.html | 306 -----
.../web/controller/VideoController.java | 9 +-
.../SurProjectVideoConfigController.java | 4 +-
.../ISurProjectVideoConfigService.java | 8 +
.../SurProjectVideoConfigServiceImpl.java | 16 +-
128 files changed, 519 insertions(+), 25912 deletions(-)
rename ruoyi-wechat/src/main/java/com/ruoyi/web/project/{ => controller}/ProjectCheckingController.java (97%)
create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
rename ruoyi-wechat/src/main/java/com/ruoyi/web/project/{ => controller}/ProjectProblemmodifyController.java (99%)
rename ruoyi-wechat/src/main/java/com/ruoyi/web/project/{ => controller}/ProjectUserinfoController.java (97%)
rename ruoyi-wechat/src/main/java/com/ruoyi/web/{projectInfo => project}/domain/WxProjectInfo.java (99%)
create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java
create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java
create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/PshServiceImpl.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/mapper/PshMarksMapper.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/IPshMarksService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/pshMarks/service/PshMarksServiceImpl.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/controller/SspController.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/mapper/SspMapper.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/ISspService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/ProcessName.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarkfileinfo.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarks.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksDto.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/domain/SspMarksflow.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/mapper/SspMarksMapper.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/ISspMarksService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/sspMarks/service/SspMarksServiceImpl.java
rename ruoyi-wechat/src/main/java/com/ruoyi/web/{system => userLogin}/controller/WechatUserLoginController.java (61%)
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/controller/WxUserLoginController.java
rename ruoyi-wechat/src/main/java/com/ruoyi/web/{system => userLogin}/mapper/WechatUserLoginMapper.java (90%)
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/mapper/WxUserLoginMapper.java
rename ruoyi-wechat/src/main/java/com/ruoyi/web/{system => userLogin}/service/IWechatUserLoginService.java (67%)
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginService.java
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/WxUserLoginServiceImpl.java
rename ruoyi-wechat/src/main/java/com/ruoyi/web/{system => userLogin}/service/impl/WechatUserLoginServiceImpl.java (54%)
delete mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/utils/MultipartFileUtils.java
delete mode 100644 ruoyi-wechat/src/main/resources/mapper/PshMapper.xml
delete mode 100644 ruoyi-wechat/src/main/resources/mapper/PshMarksMapper.xml
delete mode 100644 ruoyi-wechat/src/main/resources/mapper/SspMapper.xml
delete mode 100644 ruoyi-wechat/src/main/resources/mapper/SspMarksMapper.xml
delete mode 100644 ruoyi-wechat/src/main/resources/mapper/UserLoginMapper.xml
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/bootstrap.min.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/commes.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/date.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/default-skin.svg
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/default-skin/preloader.gif
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/newTips.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/photoswipe.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/css/ssp/takePicture.css
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/left.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/1.jpg
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/2.jpg
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/3.jpg
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/4.jpg
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/5.jpg
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/866000e905ae45a8b79d80de52bb4e9a.gif
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/border_bottom.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/checkbox.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/checkbox_i.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/h_lift.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/left.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/photograph.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/position.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/put_away.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/radio.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/radio_i.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/right.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/screen.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/search.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/upload_img.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/ssp/upload_video.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/video.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/img/video_border.png
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/jquery-3.0.0.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/jquery.form.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/bootstrap.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/initialization.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/jquery-3.0.0.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/jquery.date.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/jquery.form.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/jquery.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/newTips.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/photoswipe-ui-default.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/photoswipe.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/qiniu-3.1.2.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/upload.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/upload2.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/vue.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/ssp/window.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/tree.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/vue-resource-1.3.4.js
delete mode 100644 ruoyi-wechat/src/main/resources/static/js/vue.min.js
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/reportWithmarks.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/reportWithmarks2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspChange.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspListPage2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspListPageMy2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspMarkView.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspQualityMarkDetail.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/pshManage/sspStayCheck.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/reportWithmarks2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspChange.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspListPage2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspListPageMy2.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspMarkView.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspQualityMarkDetail.html
delete mode 100644 ruoyi-wechat/src/main/resources/templates/sspManage/sspStayCheck.html
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index fd87ae15..ae19dfea 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// 过滤请求
.authorizeRequests()
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
- .antMatchers("/login","/wechat/**", "/common/**", "/register", "/captchaImage", "/weixin/**","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll()
+ .antMatchers("/login","/wechat/**", "/common/**", "/register", "/captchaImage","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll()
// 静态资源，可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/**/img/**", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/ruoyi-wechat/pom.xml b/ruoyi-wechat/pom.xml
index 3ea9e806..22557c42 100644
--- a/ruoyi-wechat/pom.xml
+++ b/ruoyi-wechat/pom.xml
@@ -18,10 +18,10 @@
-
+
- org.springframework.boot
- spring-boot-starter-thymeleaf
+ com.ruoyi
+ ruoyi-framework
@@ -30,12 +30,6 @@
mysql-connector-java
-
-
- com.ruoyi
- ruoyi-framework
-
-
com.yanzhu.jh
yanzhu-jh
@@ -43,11 +37,6 @@
compile
-
- org.springframework
- spring-test
-
-
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java
similarity index 97%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java
index eddd067f..8dfc3b83 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectCheckingController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.project;
+package com.ruoyi.web.project.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -63,4 +63,5 @@ public class ProjectCheckingController extends BaseController {
{
return toAjax(surProjectCheckingService.deleteSurProjectCheckingById(id));
}
+
}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
new file mode 100644
index 00000000..b29a62ba
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
@@ -0,0 +1,81 @@
+package com.ruoyi.web.project.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.project.service.WxIProjectInfoService;
+import com.yanzhu.jh.project.service.ISurProjectUserinfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @version : V1.0
+ * @ClassName: ProjectProblemmodifyController
+ * @Description: 项目问题修改
+ * @Auther: JiangYuQi
+ * @Date: 2020/7/7 18:03
+ */
+@RestController
+@RequestMapping("/wechat/project")
+public class ProjectController extends BaseController {
+
+ @Autowired
+ WxIProjectInfoService IProjectInfoService;
+
+ /**
+ * Methods
+ * @describe 描述：查询项目的基本信息
+ * @author 作者：Makalu
+ * @date 时间：2020/7/8 9:16
+ * @version 版本： V1.0
+ * @param id：String
+ * @return 返回值：
+ * @throws Exception 异常：
+ */
+ @RequestMapping("/getProjectFoundation")
+ public Map getProjectFoundation(@RequestParam String id) {
+ return IProjectInfoService.getProjectBasicInfo(id);
+ }
+
+ /***
+ * 查询下一级组织架构信息
+ * @param param
+ * @return
+ */
+ @RequestMapping("/selectDeptSubordinate")
+ public Object selectDeptSubordinate(@RequestParam Map param){
+ return IProjectInfoService.selectDeptSubordinate(param);
+ }
+
+ /**
+ * @describe 根据公司获取项目的列表
+ */
+ @RequestMapping("/selectProjectByCompanyId")
+ public Object selectProjectByCompanyId(@RequestParam Map map) {
+ return IProjectInfoService.getProjectByDeptIdAndCompanyId(map);
+ }
+
+ /**
+ * 获取建设单位
+ * @param projectId
+ * @return
+ */
+ @RequestMapping("/getProjectUnitList")
+ public Object getProjectUnitList(String projectId){
+ return IProjectInfoService.getProjectUnitList(projectId);
+ }
+
+ /***
+ * 模糊查询出项目信息
+ * @param map
+ * @return
+ */
+ @RequestMapping("selectProjectInfoByName")
+ public AjaxResult selectProjectInfoByName(@RequestParam Map map){
+ return success(IProjectInfoService.getProjectByDeptIdAndCompanyId(map));
+ }
+}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
similarity index 99%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
index 404a28e6..7230492a 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.project;
+package com.ruoyi.web.project.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@@ -24,8 +24,6 @@ import org.springframework.web.bind.annotation.*;
*/
@RestController
@RequestMapping("/wechat/projectProblemmodify")
-
-
public class ProjectProblemmodifyController extends BaseController {
@Autowired
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
similarity index 97%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
index c917d883..01e1a625 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.project;
+package com.ruoyi.web.project.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java
similarity index 99%
rename from ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java
rename to ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java
index e19809d3..3c2b5cdb 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/domain/WxProjectInfo.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/domain/WxProjectInfo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.projectInfo.domain;
+package com.ruoyi.web.project.domain;
import com.ruoyi.common.core.domain.BaseEntity;
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java
new file mode 100644
index 00000000..84989715
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/mapper/WxProjectInfoMapper.java
@@ -0,0 +1,57 @@
+package com.ruoyi.web.project.mapper;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface WxProjectInfoMapper {
+
+ //查询组织架构下一层级
+ List> getDeptSubordinate(Map map);
+ //查询区级层级
+ List> getQUDeptSubordinate(Map map);
+ //根据所选层级或者公司查询登录用户的项目
+ List> getProjectByDeptIdAndCompanyId(Map map);
+ /**
+ * Methods
+ * @describe 描述：查询项目的概况信息
+ * @author 作者：Makalu
+ * @date 时间：2020/7/7 16:21
+ * @version 版本： V1.0
+ * @param id：String
+ * @return 返回值：map
+ * @throws Exception 异常：none
+ */
+ public Map selectProjectOverview(String id);
+
+ /**
+ * 获取建设单位
+ * @param projectId
+ * @return
+ */
+ List> getProjectUnitList(String projectId);
+
+ /**
+ * 查询子公司信息
+ * @param map
+ * @return
+ */
+ List> getZGSDeptInfoByMap(Map map);
+
+ /**
+ * 根据项目查询单位信息
+ * @param projectId
+ * @return
+ */
+ Map selectDeptByProjectId(Long projectId);
+
+ /**
+ * 根据登录用户查询单位信息
+ * @param userName
+ * @return
+ */
+ Map selectDeptByUserName(String userName);
+
+}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java
new file mode 100644
index 00000000..2beaa3b4
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/WxIProjectInfoService.java
@@ -0,0 +1,43 @@
+package com.ruoyi.web.project.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface WxIProjectInfoService {
+
+
+ /**
+ * 查询组织下一层级
+ * @param map
+ * @return
+ */
+ Map selectDeptSubordinate(Map map);
+
+ /**
+ * 根据所选层级查询登录用户的项目
+ * @param map
+ * @return
+ */
+ List> getProjectByDeptIdAndCompanyId(Map map);
+
+ /**
+ * Methods
+ * @describe 描述：获取项目的基本信息
+ * @author 作者：Makalu
+ * @date 时间：2020/7/7 17:59
+ * @version 版本： V1.0
+ * @param id：String
+ * @return 返回值：map
+ * @throws Exception 异常：none
+ */
+ public Map getProjectBasicInfo(String id);
+
+ /**
+ * 获取建设单位
+ * @param projectId
+ * @return
+ */
+ List> getProjectUnitList(String projectId);
+
+
+}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java
new file mode 100644
index 00000000..d798ce35
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/service/impl/WxProjectInfoServiceImpl.java
@@ -0,0 +1,118 @@
+package com.ruoyi.web.project.service.impl;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DeptTypeEnum;
+import com.ruoyi.common.enums.SysRoleEnum;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.web.project.mapper.WxProjectInfoMapper;
+import com.ruoyi.web.project.service.WxIProjectInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wxw
+ * @version : V1.0
+ * @ClassName: ProjectInfoServiceImpl
+ * @Description: TODO
+ * @Auther: Makalu
+ * @Date: 2020/7/7 16:45
+ */
+@Service
+public class WxProjectInfoServiceImpl implements WxIProjectInfoService {
+
+ @Autowired
+ private WxProjectInfoMapper ProjectInfoMapper;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
+
+ @Override
+ public Map selectDeptSubordinate(Map param) {
+ List> deptList = ProjectInfoMapper.getDeptSubordinate(param);
+ Map dataMap = new HashMap<>(16);
+ for(Map map:deptList){
+ map.put("userId",param.get("userId"));
+ dataMap.put(map.get("text").toString(),ProjectInfoMapper.getQUDeptSubordinate(map));
+ }
+ return dataMap;
+ }
+
+ @Override
+ public List> getProjectByDeptIdAndCompanyId(Map map) {
+ List> list = new ArrayList<>();
+ String nowRole = null;
+ if(map.get("minRoleId")!=null && !"undefined".equals(map.get("minRoleId"))){
+ nowRole = map.get("minRoleId").toString();
+ }else{
+ nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId"))));
+ }
+ if(SysRoleEnum.ZGS.getCode().equals(nowRole)){
+ Long deptId = this.getZgsDept(Convert.toLong(map.get("deptId"))).getDeptId();
+ map.put("nowDeptId",Convert.toStr(deptId));
+ }else{
+ map.put("nowDeptId",Convert.toStr(map.get("deptId")));
+ }
+ //当前角色时管理员时，修改角色为集团公司
+ if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){
+ nowRole = SysRoleEnum.JTGS.getCode();
+ }
+ map.put("nowRole",nowRole);
+ List> getProjec = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(map);
+ for(int i=0;i getProjectBasicInfo(String id) {
+ //根据项目的id查基本信息
+ return ProjectInfoMapper.selectProjectOverview(id);
+ }
+
+ @Override
+ public List> getProjectUnitList(String projectId) {
+ return ProjectInfoMapper.getProjectUnitList(projectId);
+ }
+
+ /**
+ * 查询子公司部门ID
+ *
+ * @param deptId 部门ID
+ * @return 结果
+ */
+ private SysDept getZgsDept(Long deptId){
+ SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
+ if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
+ //comFlag标识为1是子公司
+ if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){
+ return sysDept;
+ }else{
+ return getZgsDept(sysDept.getParentId());
+ }
+ }else{
+ return sysDept;
+ }
+ }
+}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java
deleted file mode 100644
index c9ad6609..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/controller/WxProjectInfoController.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.ruoyi.web.projectInfo.controller;
-
-import com.ruoyi.web.projectInfo.service.WxIProjectInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @version : V1.0
- * @ClassName: ProjectInfoController
- * @Description: TODO
- * @Auther: Makalu
- * @Date: 2020/7/7 18:03
- */
-@Controller
-@RequestMapping("/weixin/projectInfo")
-public class WxProjectInfoController {
-
- @Autowired
- private WxIProjectInfoService IProjectInfoService;
-
- /**
- * 查询登录用户的组织架构
- * @param map
- * @return
- */
- @RequestMapping("/selectDeptAll")
- @ResponseBody
- public Object selectDeptAll(@RequestParam Map map){
- return IProjectInfoService.getDeptAll(map);
- }
-
- /***
- * 查询下一级组织架构信息
- * @param param
- * @return
- */
- @RequestMapping("/selectDeptSubordinate")
- @ResponseBody
- public Object selectDeptSubordinate(@RequestParam Map param){
- return IProjectInfoService.selectDeptSubordinate(param);
- }
-
- /**
- * @describe 根据层级获取项目的列表
- */
- @ResponseBody
- @RequestMapping("/getCompanyInfo")
- public Object getCompanyInfo(@RequestParam Map map) {
- return IProjectInfoService.getProjectByDeptIdAndCompanyId(map);
- }
-
- /**
- * @describe 根据公司获取项目的列表
- */
- @ResponseBody
- @RequestMapping("/selectProjectByCompanyId")
- public Object selectProjectByCompanyId(@RequestParam Map map) {
- return IProjectInfoService.getProjectByDeptIdAndCompanyId(map);
- }
-
- /**
- * 根据组织架构查询出公司列表
- * @param map
- * @return
- */
- @ResponseBody
- @RequestMapping("/selectCompanyJG")
- public Object selectCompanyJG(@RequestParam Map map) {
- return IProjectInfoService.getDeptIdNext(map);
- }
-
- /**
- * Methods
- * @describe 描述：查询项目的经纬度
- * @author 作者：Makalu
- * @date 时间：2020/7/7 20:07
- * @version 版本： V1.0
- * @param map：map
- * @return 返回值：
- * @throws Exception 异常：
- */
- @ResponseBody
- @RequestMapping("/getProjectPoint")
- public Map getProjectPoint(@RequestParam Map map) {
- return IProjectInfoService.getProjectPointCount(map);
- }
-
- /**
- * Methods
- * @describe 描述：查询项目的列表信息
- * @author 作者：Makalu
- * @date 时间：2020/7/8 9:25
- * @version 版本： V1.0
- * @param map：map
- * @return 返回值：
- * @throws Exception 异常：
- */
- @ResponseBody
- @RequestMapping("/getProjectList")
- public List> getProjectList(@RequestParam Map map) {
- return IProjectInfoService.getProjectList(map);
- }
-
- /**
- * Methods
- * @describe 描述：查询项目的基本信息
- * @author 作者：Makalu
- * @date 时间：2020/7/8 9:16
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：
- * @throws Exception 异常：
- */
- @ResponseBody
- @RequestMapping("/getProjectFoundation")
- public Map getProjectFoundation(@RequestParam String id) {
- return IProjectInfoService.getProjectBasicInfo(id);
- }
-
- /**
- * Methods
- * @describe 描述：查询项目的管理公司信息
- * @author 作者：Makalu
- * @date 时间：2020/7/8 9:19
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：
- * @throws Exception 异常：
- */
- @ResponseBody
- @RequestMapping("/getProjectManage")
- public Map getProjectManage(@RequestParam String id) {
- return IProjectInfoService.getProjectManageInfo(id);
- }
-
- /***
- * 模糊查询出项目信息
- * @param map
- * @return
- */
- @RequestMapping("selectProjectInfoByName")
- @ResponseBody
- public Object selectProjectInfoByName(@RequestParam Map map){
- return IProjectInfoService.getProjectInfoByName(map);
- }
-
- /**
- * 获取建设单位
- * @param projectId
- * @return
- */
- @RequestMapping("/getProjectUnitList")
- @ResponseBody
- public Object getProjectUnitList(String projectId){
- return IProjectInfoService.getProjectUnitList(projectId);
- }
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java
deleted file mode 100644
index ea485e1b..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/mapper/WxProjectInfoMapper.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.ruoyi.web.projectInfo.mapper;
-
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-@Repository
-public interface WxProjectInfoMapper {
-
- //查询出人员类型信息
- List getPostIdByUserId(String userId);
- //查询组织架构下一层级
- List> getDeptSubordinate(Map map);
- //查询区级层级
- List> getQUDeptSubordinate(Map map);
- ///根据组织架构id查询数据
- Map getDeptData(String deptId);
- //查询出项目用户公司项目信息
- Map getCompanyAndProjectByUserId(String userId);
- //查询所有省级
- List> getShengList(Map map);
- //根据所选层级或者公司查询登录用户的项目
- List> getProjectByDeptIdAndCompanyId(Map map);
- //根据登录账号查询出企业信息
- Map getCompanyByUserId(Map map);
- //企业人员根据组织架构查询出公司列表
- List> getCompanyQY(Map map);
- //根据公司id查询出公司名称
- Map getCompanyInfo(String superiorCompany);
- //监管人员根据组织架构查询出公司列表
- List> getCompanyJG(Map map);
- //根据总公司层级查询出集团公司列表
- List> getCompanySonData(Map map);
- //查询上一级公司
- Map getNextLevelCompany(Map map);
-
-
- /**
- * Methods
- * @describe 描述：查询项目的经度纬度列表
- * @author 作者：Makalu
- * @date 时间：2020/7/7 15:48
- * @version 版本： V1.0
- * @param deptId：String
- * @return 返回值：list
- * @throws Exception 异常：none
- */
- public List> selectProjectPoint(String deptId);
-
- /**
- * Methods
- * @describe 描述：查询建设单位下的项目个数
- * @author 作者：Makalu
- * @date 时间：2020/7/7 15:44
- * @version 版本： V1.0
- * @param deptId：map
- * @return 返回值：int
- * @throws Exception 异常：none
- */
- public int selectProjectSize(String deptId);
-
- /**
- * Methods
- * @describe 描述：查询项目的基本信息
- * @author 作者：Makalu
- * @date 时间：2020/7/7 10:57
- * @version 版本： V1.0
- * @param map：map
- * @return 返回值：list
- * @throws Exception 异常：none
- */
- public List> selectProjectInfo(Map map);
-
- /**
- * Methods
- * @describe 描述：查询项目的概况信息
- * @author 作者：Makalu
- * @date 时间：2020/7/7 16:21
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：map
- * @throws Exception 异常：none
- */
- public Map selectProjectOverview(String id);
-
- /**
- * Methods
- * @describe 描述：查询项目的管理概况
- * @author 作者：Makalu
- * @date 时间：2020/7/7 16:37
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：map
- * @throws Exception 异常：none
- */
- public Map selectProjectManage(String id);
-
- /**
- * 模糊查询项目信息
- * @param map
- * @return
- */
- List> getProjectInfoByName(Map map);
-
- /**
- * 模糊查询出预警项目
- * @param map
- * @return
- */
- List> getProjectInfoEnviron(Map map);
-
- List> getChinaProvince();
-
- int addChinaCity(List> list);
-
- /*********************************小程序首页新逻辑**************************************/
-
- /**
- * 查询项目相关信息
- * @param projectId
- * @return
- */
- Map getProjectAndChinaData(String projectId);
-
- /**
- * 查询公司信息
- * @return
- */
- Map getDeptInfo();
-
- /**
- * 查询公司信息
- * @param map
- * @return
- */
- Map getDeptInfoByMap(Map map);
-
- /**
- * 查询出省份信息
- * @param deptId
- * @return
- */
- List> getChinaProvinceList(Map deptId);
-
- /**
- * 获取公司下一层级
- * @param map
- * @return
- */
- List> getDeptIdNext(Map map);
-
- /**
- * 获取建设单位
- * @param projectId
- * @return
- */
- List> getProjectUnitList(String projectId);
-
- /**
- * 查询子公司信息
- * @param map
- * @return
- */
- List> getZGSDeptInfoByMap(Map map);
-
- /**
- * 获取建设单位
- * @param projectId
- * @return
- */
- Map selectDeptByProjectId(Long projectId);
-
- /**
- * 获取建设单位
- * @param userName
- * @return
- */
- Map selectDeptByUserName(String userName);
-
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java
deleted file mode 100644
index 2c7c33da..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxIProjectInfoService.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.ruoyi.web.projectInfo.service;
-
-import java.util.List;
-import java.util.Map;
-
-public interface WxIProjectInfoService {
-
- /**
- * 查询用户的组织架构
- * @param map
- * @return
- */
- Map getDeptAll(Map map);
-
- /**
- * 查询组织下一层级
- * @param map
- * @return
- */
- Map selectDeptSubordinate(Map map);
-
- /**
- * 根据所选层级查询登录用户的项目
- * @param map
- * @return
- */
- List> getProjectByDeptIdAndCompanyId(Map map);
-
- /**
- * 企业人员根据组织架构查询出公司列表
- * @param map
- * @return
- */
- Object getDeptIdNext(Map map);
-
- /**
- * 监管人员根据组织架构查询公司信息
- * @param map
- * @return
- */
- Object getCompanyJG(Map map);
-
- /**
- * 查询出工程列表数据
- * @param map
- * @return
- */
- List> getYCData(Map map);
-
-
-
-
- /**
- * Methods
- * @describe 描述：获取项目的经纬度
- * @author 作者：Makalu
- * @date 时间：2020/7/7 17:04
- * @version 版本： V1.0
- * @param map：map
- * @return 返回值：
- * @throws Exception 异常：
- */
- public Map getProjectPointCount(Map map);
-
- /**
- * Methods
- * @describe 描述：获取公司下的所有项目列表
- * @author 作者：Makalu
- * @date 时间：2020/7/7 17:49
- * @version 版本： V1.0
- * @param map：map
- * @return 返回值：list
- * @throws Exception 异常：none
- */
- public List> getProjectList(Map map);
-
- /**
- * Methods
- * @describe 描述：获取项目的基本信息
- * @author 作者：Makalu
- * @date 时间：2020/7/7 17:59
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：map
- * @throws Exception 异常：none
- */
- public Map getProjectBasicInfo(String id);
-
- /**
- * Methods
- * @describe 描述：获取项目的管理单位信息
- * @author 作者：Makalu
- * @date 时间：2020/7/7 18:00
- * @version 版本： V1.0
- * @param id：String
- * @return 返回值：map
- * @throws Exception 异常：none
- */
- public Map getProjectManageInfo(String id);
-
- /**
- * 模糊查询项目信息
- * @param map
- * @return
- */
- List> getProjectInfoByName(Map map);
-
-
- void add();
-
-
- /**
- * 获取建设单位
- * @param projectId
- * @return
- */
- List> getProjectUnitList(String projectId);
-
-
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java
deleted file mode 100644
index 7e08c856..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/projectInfo/service/WxProjectInfoServiceImpl.java
+++ /dev/null
@@ -1,339 +0,0 @@
-package com.ruoyi.web.projectInfo.service;
-
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.enums.DeptTypeEnum;
-import com.ruoyi.common.enums.SysRoleEnum;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.mapper.SysDeptMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.web.projectInfo.mapper.WxProjectInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author wxw
- * @version : V1.0
- * @ClassName: ProjectInfoServiceImpl
- * @Description: TODO
- * @Auther: Makalu
- * @Date: 2020/7/7 16:45
- */
-@Service
-public class WxProjectInfoServiceImpl implements WxIProjectInfoService {
-
- @Autowired
- private WxProjectInfoMapper ProjectInfoMapper;
-
- @Autowired
- private SysDeptMapper sysDeptMapper;
-
- @Autowired
- private SysRoleMapper sysRoleMapper;
-
- @Override
- public Map getDeptAll(Map map) {
- //当前登录账号角色信息
- String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId"))));
- Map dataMap = new HashMap<>(16);
- //组装数据
- dataMap.put("shengName","西安市");
- dataMap.put("shiName","西咸新区");
- dataMap.put("quName","泾河新城");
- //公司信息
- List> list = new ArrayList<>();
- Map totalMap = new HashMap<>(16);
- //查询出公司信息
- if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) ){
- List> companyList = ProjectInfoMapper.getZGSDeptInfoByMap(map);
- totalMap.put("id","0");
- totalMap.put("text","泾河产业发展集团");
- list.add(totalMap);
- for(Map companyMap:companyList){
- totalMap = new HashMap<>(16);
- totalMap.put("id",companyMap.get("dept_id"));
- totalMap.put("text",companyMap.get("dept_name"));
- list.add(totalMap);
- }
- }else if(SysRoleEnum.ZGS.getCode().equals(nowRole)){
- SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId")));
- totalMap.put("id",sysDept.getDeptId());
- totalMap.put("text",sysDept.getDeptName());
- list.add(totalMap);
- }else if(SysRoleEnum.COMMON.getCode().equals(nowRole)){
- //普通角色，获取真实部门
- SysDept sysDept = this.getZgsDept(Convert.toLong(map.get("deptId")));
- //判断当前部门是否是产业发展集团
- if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag()) || DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
- sysDept = this.getZgsDept(Convert.toLong(sysDept.getDeptId()));
- totalMap.put("id",sysDept.getDeptId());
- totalMap.put("text",sysDept.getDeptName());
- list.add(totalMap);
- }else{
- //普通角色
- totalMap.put("id",sysDept.getDeptId());
- totalMap.put("text",sysDept.getDeptName());
- list.add(totalMap);
- }
- }else{
- //监理单位/总包单位/分包单位
- SysDept sysDept = sysDeptMapper.selectDeptById(Convert.toLong(map.get("deptId")));
- totalMap.put("id",sysDept.getDeptId());
- totalMap.put("text",sysDept.getDeptName());
- list.add(totalMap);
- }
- dataMap.put("province_list",list);
- dataMap.put("deptId",map.get("deptId"));
- dataMap.put("logCompanyName",list.get(0).get("text"));
- dataMap.put("companyId",list.get(0).get("text"));
- return dataMap;
- }
-
- @Override
- public Map selectDeptSubordinate(Map param) {
- List> deptList = ProjectInfoMapper.getDeptSubordinate(param);
- Map dataMap = new HashMap<>(16);
- for(Map map:deptList){
- map.put("userId",param.get("userId"));
- dataMap.put(map.get("text").toString(),ProjectInfoMapper.getQUDeptSubordinate(map));
- }
- return dataMap;
- }
-
- @Override
- public List> getProjectByDeptIdAndCompanyId(Map map) {
- List> list = new ArrayList<>();
- String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleId(Convert.toLong(map.get("userId"))));
- if(SysRoleEnum.ZGS.getCode().equals(nowRole)){
- Long deptId = this.getZgsDept(Convert.toLong(map.get("deptId"))).getDeptId();
- map.put("nowDeptId",Convert.toStr(deptId));
- }else{
- map.put("nowDeptId",Convert.toStr(map.get("deptId")));
- }
- //当前角色时管理员时，修改角色为集团公司
- if(Convert.toInt(SysRoleEnum.JTGS.getCode())>Convert.toInt(nowRole)){
- nowRole = SysRoleEnum.JTGS.getCode();
- }
- map.put("nowRole",nowRole);
- List> getProjec = ProjectInfoMapper.getProjectByDeptIdAndCompanyId(map);
- for(int i=0;i map) {
- return ProjectInfoMapper.getDeptIdNext(map);
- }
-
- @Override
- public Object getCompanyJG(Map map) {
- Map twoMap =new HashMap<>();
-// if("2".equals(map.get("type"))){
-// twoMap.put("startTime", DateUtil.getStartTimes());
-// twoMap.put("endTime", DateUtil.getNowEndTime());
-// }
-// twoMap.put("deptId",map.get("deptId"));
-// twoMap.put("num",map.get("superiorCompanyId").toString().length()+4);
-// twoMap.put("num1",map.get("superiorCompanyId").toString().length());
-// twoMap.put("companyId",map.get("superiorCompanyId"));
- return ProjectInfoMapper.getCompanyQY(twoMap);
- }
-
- @Override
- public List> getYCData(Map map) {
-// List> list = new ArrayList<>();
-// JSONArray jsonArray = JSONArray.parseArray(map.get("projectData").toString());
-// for(int i = 0;i3) {
-// Map ycMap = new HashMap<>();
-// ycMap.put("projectId", jsonArray.getJSONObject(i).getString("projectId"));
-// ycMap.put("startTime", DateUtil.getStartTimes());
-// ycMap.put("endTime", DateUtil.getNowEndTime());
-// //根据项目id查询扬尘数据
-// Integer YNnum = mapper.getYangchenCount(ycMap);
-// Map spMap = new HashMap<>();
-// spMap.put("projectName", jsonArray.getJSONObject(i).getString("projectName"));
-// spMap.put("startTime", DateUtil.getStartTimes());
-// spMap.put("endTime", DateUtil.getNowEndTime());
-// List> shnum = projectVideoMapper.selectVideoOutline(spMap);
-// Integer dayCount = 0;
-// for(Map dayMap1:shnum){
-// dayCount+= Integer.valueOf(dayMap1.get("value").toString());
-// }
-// //组装数据
-// Map zzMap = new HashMap<>();
-// zzMap.put("projectCount", YNnum);
-// zzMap.put("videoNum", dayCount);
-// zzMap.put("projectId", jsonArray.getJSONObject(i).getString("projectId"));
-// zzMap.put("projectName", jsonArray.getJSONObject(i).getString("projectName"));
-// zzMap.put("companyName", jsonArray.getJSONObject(i).getString("companyName"));
-// zzMap.put("projectAddress", jsonArray.getJSONObject(i).getString("projectAddress"));
-// list.add(zzMap);
-// }
-// }
- return null;//list;
- }
-
-
- @Override
- public Map getProjectPointCount(Map map) {
- //返回的Map
-// Map resultMap = new HashMap<>(16);
-// //根据选中的公司deptId查询所有的项目经纬度，和项目的总数
-// List> list = new ArrayList<>();
-// List> getProjectPoint = ProjectInfoMapper.selectProjectPoint(map.get("deptId").toString());
-// for(int i=0;i> getProjectList(Map map) {
- List> list = new ArrayList<>();
-// //根据参数查询所有的项目列表
-// List> proList = ProjectInfoMapper.selectProjectInfo(map);
-// proList.forEach(proMap->{
-// //查询出预警信息预警
-// Map PM25Map = new HashMap<>();
-// PM25Map.put("projectId",proMap.get("streamNumber"));
-// PM25Map.put("startTime", DateUtil.getStartTimes());
-// PM25Map.put("endTime", DateUtil.getNowEndTime());
-// int envirCount = mapper.getEarlyWarning(PM25Map);
-//
-// //查询实时接入数据
-// String videoNum = mapper.selectVideoByProjectName(proMap.get("name").toString());
-//
-// //组装数据
-// Map dataMap = new HashMap<>();
-// dataMap.put("id",proMap.get("id"));
-// dataMap.put("engineeringName",proMap.get("engineeringName"));
-// dataMap.put("name",proMap.get("name"));
-// dataMap.put("projectAddress",proMap.get("projectAddress"));
-// dataMap.put("streamNumber",proMap.get("streamNumber"));
-// dataMap.put("envirCount",envirCount);
-// dataMap.put("videoNum",(videoNum == null)?'0':videoNum);
-// list.add(dataMap);
-// });
- return list;
- }
-
- @Override
- public Map getProjectBasicInfo(String id) {
- //根据项目的id查基本信息
- return ProjectInfoMapper.selectProjectOverview(id);
- }
-
- @Override
- public Map getProjectManageInfo(String id) {
- //根据项目的id查询管理信息
- return ProjectInfoMapper.selectProjectManage(id);
- }
-
- @Override
- public List> getProjectInfoByName(Map map) {
- List> list = new ArrayList<>();
- //1所有项目 2 预警项目
-// List> getProjec = ProjectInfoMapper.getProjectInfoByName(map);
-// for(int i=0;i> list = ProjectInfoMapper.getChinaProvince();
-// for(Map map:list){
-// try {
-// OkHttpClient client = new OkHttpClient().newBuilder()
-// .build();
-// Request request = new Request.Builder()
-// .url("http://datavmap-public.oss-cn-hangzhou.aliyuncs.com/areas/csv/"+map.get("adcode").toString()+"_district.json")
-// .method("GET", null)
-// .build();
-// Response response = client.newCall(request).execute();
-// String json = response.body().string();
-// System.out.println(json);
-// System.out.println("id=="+map.get("id"));
-// JSONArray object = JSON.parseObject(json).getJSONArray("rows");
-// List> list1 = new ArrayList<>();
-// for(int i = 0;i data = new HashMap<>(16);
-// data.put("areaName",object.getJSONObject(i).getString("name"));
-// data.put("provinceId",map.get("provinceId"));
-// data.put("provinceName",map.get("provinceName"));
-// data.put("cityId",map.get("id"));
-// data.put("cityName",object.getJSONObject(i).getString("parent"));
-// data.put("adcode",object.getJSONObject(i).getString("adcode"));
-// data.put("lat",object.getJSONObject(i).getString("lat"));
-// data.put("lng",object.getJSONObject(i).getString("lng"));
-// list1.add(data);
-// }
-// ProjectInfoMapper.addChinaCity(list1);
-// } catch (IOException e) {
-// e.printStackTrace();
-// }
-// }
- }
-
- @Override
- public List> getProjectUnitList(String projectId) {
- return ProjectInfoMapper.getProjectUnitList(projectId);
- }
-
- /**
- * 查询子公司部门ID
- *
- * @param deptId 部门ID
- * @return 结果
- */
- private SysDept getZgsDept(Long deptId){
- SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
- if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){
- //comFlag标识为1是子公司
- if(DeptTypeEnum.COMFLAG.getCode().equals(sysDept.getComFlag())){
- return sysDept;
- }else{
- return getZgsDept(sysDept.getParentId());
- }
- }else{
- return sysDept;
- }
- }
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java
deleted file mode 100644
index 35cc809a..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/controller/PshController.java
+++ /dev/null
@@ -1,582 +0,0 @@
-package com.ruoyi.web.pshManage.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.QiniuUploadUtil;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.web.pshManage.service.IPshService;
-import com.ruoyi.web.sspMarks.domain.ProcessName;
-import com.ruoyi.web.sspMarks.domain.SspMarks;
-import com.ruoyi.web.sspMarks.service.ISspMarksService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpSession;
-import java.util.*;
-
-/**
- * @ClassName:SspController
- * @Description:随手拍的控制层
- * @Author:
- * @Date:2021/3/31 9:08
- * @version:V1.0
- */
-@Controller
-@RequestMapping("/weixin/pshManage")
-@CrossOrigin(origins = "*",maxAge = 3600)
-public class PshController {
-
- @Autowired
- private ServerConfig serverConfig;
-
- @Autowired
- private IPshService pshService;
-
- @Autowired
- private ISspMarksService sspMarksService;
-
- @Autowired
- private ISysUserService sysUserService;
-
- private String prefix = "pshManage";
-
- /**********************************************************页面跳转*************************************************/
- /**
- * @describe:跳转到列表初始化页
- * @author:
- * @date:2021/3/31&11:07
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goListPage")
- public String goListPage(@RequestParam Map map, HttpSession HttpSession, Model Model) {
- HttpSession.setAttribute("loginName", map.get("loginName").toString());
- HttpSession.setAttribute("projectId", map.get("projectId").toString());
- HttpSession.setAttribute("projectName", map.get("projectName").toString());
-
- Model.addAttribute("projectId", map.get("projectId").toString());
- Model.addAttribute("projectName", map.get("projectName").toString());
- return prefix + "/sspListPage";
- }
-
- /**
- * @describe:跳转到列表页发布记录
- * @author:
- * @date:2021/3/31&11:07
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goListPageBack")
- public String goListPageBack(@RequestParam Map map , HttpSession HttpSession , Model Model) {
- Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():"");
- Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():"");
- Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():"");
- Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId"));
- Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName"));
- return prefix + "/sspListPage";
- }
-
- /**
- * @describe:跳转到列表页我发布
- * @author:
- * @date:2021/3/31&11:07
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goListPageMy")
- public String goListPageMy(@RequestParam Map map , HttpSession HttpSession , Model Model) {
- Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():"");
- Model.addAttribute("typeChangeText", map.containsKey("typeChangeText")?map.get("typeChangeText").toString():"");
- Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():"");
- Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId"));
- Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName"));
- return prefix + "/sspListPageMy";
- }
-
- /**
- * @describe:跳转到列表页我发布2
- * @author:
- * @date:2021/3/31&11:07
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goListPageMy2")
- public String goListPageMy2(@RequestParam Map map , HttpSession HttpSession , Model Model) {
- Model.addAttribute("searchText", map.containsKey("searchText")?map.get("searchText").toString():"");
- Model.addAttribute("flowText", map.containsKey("flowText")?map.get("flowText").toString():"");
- Model.addAttribute("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId"));
- Model.addAttribute("projectName", map.containsKey("projectName")?map.get("projectName").toString():HttpSession.getAttribute("projectName"));
- return prefix + "/sspListPageMy2";
- }
-
- /**
- * 跳转至质量留痕上报页面
- * @param model
- * @return
- */
- @RequestMapping("/goNickedSave")
- public String goNickedSave(String projectName, Model model, HttpSession session) {
- //项目id
- model.addAttribute("projectId",session.getAttribute("projectId"));
- //项目名称
- model.addAttribute("projectName", projectName);
- return prefix + "/reportWithmarks";
- }
-
- /**
- * 跳转至质量留痕上报页面
- * @param model
- * @return
- */
- @RequestMapping("/goNickedSave2")
- public String goNickedSave2(HttpSession session, Model model, String projectName, String projectId) {
- String ZJUser = "";
- String ZJUserId = "";
- String ZJUserName = "";
- String ZJUserPhone = "";
- if(session.getAttribute("loginName") != null && !"".equals(session.getAttribute("loginName"))){
- String loginName = session.getAttribute("loginName").toString();
- Map user = pshService.queryUserInfo(loginName);
- if(user != null && user.size() > 0){
- ZJUser = user.get("user_name").toString() + "-" + user.get("login_name").toString();
- ZJUserId = user.get("user_id").toString();
- ZJUserName = user.get("user_name").toString();
- ZJUserPhone = user.get("login_name").toString();
- }
- }
- model.addAttribute("ZJUser",ZJUser);
- model.addAttribute("ZJUserId",ZJUserId);
- model.addAttribute("ZJUserName",ZJUserName);
- model.addAttribute("ZJUserPhone",ZJUserPhone);
- model.addAttribute("projectId",projectId != null && !"".equals(projectId)?projectId:session.getAttribute("projectId"));
- model.addAttribute("projectName", projectName);
- return prefix + "/reportWithmarks2";
- }
-
- /**
- * @describe:跳转到问题整改的页面
- * @author:
- * @date:2021/4/1&10:41
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goChangeSave")
- public String goChangeSave(String projectName, Model Model,HttpSession HttpSession) {
- //项目名称
- Model.addAttribute("projectName", projectName);
- SysUser sysUser = sysUserService.selectUserByUserName(Convert.toStr(HttpSession.getAttribute("loginName")));
- Model.addAttribute("recheckSend", sysUser.getNickName());
- Model.addAttribute("recheckSendUser", sysUser.getPhonenumber());
- Date date = new Date();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- //当前时间基础上加3天默认为整改截至时间
- calendar.add(Calendar.DATE, 3);
- Model.addAttribute("nickedTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,calendar.getTime()));
- return prefix + "/sspChange";
- }
-
- /********************************************************数据页面跳转************************************************/
- /**
- * @describe:跳转到待整改的页面
- * @author:
- * @date:2021/4/1&11:04
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goStayCheckPageMy")
- public Object goStayCheckPageMy(@RequestParam Map map, Model Model, HttpSession HttpSession) {
- map.put("loginUser", HttpSession.getAttribute("loginName"));
- Model.addAttribute("queryChangeNicked", pshService.queryChangeNicked(map));
- return prefix + "/myChanges";
- }
-
- /**
- * @describe:跳转到待审核的页面
- * @author:
- * @date:2021/4/1&11:04
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/goStayCheckPage")
- public Object goStayCheckPage(@RequestParam Map map, Model Model, HttpSession HttpSession) {
- map.put("loginUser", HttpSession.getAttribute("loginName"));
- Model.addAttribute("queryChangeNicked", pshService.queryChangeNicked(map));
- return prefix + "/sspStayCheck";
- }
-
- /**
- * 质量留痕记录审批详情页面
- * @param map
- * @param Model
- * @param HttpSession
- * @return
- */
- @RequestMapping("/sspQualityMarkDetail")
- public Object sspQualityMarkDetail(@RequestParam Map map, Model Model, HttpSession HttpSession) {
- map.put("loginUser", HttpSession.getAttribute("loginName"));
- Model.addAttribute("data", pshService.querySspQualityMarkInfo(map));
- return prefix + "/sspQualityMarkDetail";
- }
-
- /**********************************************************数据接口*************************************************/
- /**
- * @describe:问题整改的列表接口
- * @author:
- * @date:2021/3/31&9:10
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @RequestMapping("/listSspInfoChanges")
- public Object listSspInfoChanges(@RequestParam Map map, HttpSession HttpSession) {
- map.put("projectId", HttpSession.getAttribute("projectId"));
- map.put("loginName", HttpSession.getAttribute("loginName"));
- return pshService.listSspInfoChanges(map);
- }
-
- /**
- * 获取质量留痕数据发布记录
- * @param map
- * @param HttpSession
- * @return
- */
- @ResponseBody
- @RequestMapping("/getSspQualityMark")
- public Object getSspQualityMark(@RequestParam Map map, HttpSession HttpSession) {
- map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId"));
- map.put("loginName", HttpSession.getAttribute("loginName"));
- return pshService.querySspQualityMarkList(map);
- }
-
- /**
- * 获取当前用户提交的质量留痕数据发布记录
- * @param map
- * @param HttpSession
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/getSspQualityMarkMy",method = RequestMethod.POST)
- public Object getSspQualityMarkMy(@RequestParam Map map, HttpSession HttpSession) {
- map.put("projectId", map.containsKey("projectId")?map.get("projectId").toString():HttpSession.getAttribute("projectId"));
- map.put("loginName", HttpSession.getAttribute("loginName"));
- return pshService.querySspQualityMarkMyList(map);
- }
-
-
- /**
- * @describe:查询随手拍信息的列表(问题整改，留痕上报)
- * @author:
- * @date:2021/3/31&9:12
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @PostMapping(value = "/listSspInfoMyNicked")
- public Object listSspInfoMyNicked(@RequestParam Map map, HttpSession HttpSession, SspMarks sspMarks) {
- map.put("projectId", HttpSession.getAttribute("projectId"));
- map.put("createUser", HttpSession.getAttribute("loginName"));
- return pshService.listSspInfoNicked(map);
- }
-
- /**
- * @describe:新增整改的信息
- * @author:
- * @date:2021/4/1&17:19
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @RequestMapping("/saveChangeMy")
- public Object saveChangeMy(@RequestParam Map map, HttpSession HttpSession) {
- map.put("createUser", HttpSession.getAttribute("loginName"));
- return pshService.saveSspInfoChanges(map);
- }
-
- /**
- * 新增留痕数据上报
- *
- * @param sspMarks
- * @param httpSession
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/saveMarksMy", method = RequestMethod.POST)
- public Object saveMarksMy(@RequestBody SspMarks sspMarks, HttpSession httpSession) {
- sspMarks.setProjectId(Integer.parseInt(httpSession.getAttribute("projectId").toString()));
- sspMarks.setCreateUser(httpSession.getAttribute("loginName").toString());
- return sspMarksService.saveMarksAndMore(sspMarks);
- }
-
- /**
- * 质量留痕数据提交
- *
- * @param jsonObject
- * @param httpSession
- * @return
- */
- @ResponseBody
- @RequestMapping(value = "/saveQualityMark", method = RequestMethod.POST)
- public Map saveQualityMark(@RequestBody JSONObject jsonObject, HttpSession httpSession) {
- Map resultMap = new HashMap<>();
- jsonObject.put("create_user",httpSession.getAttribute("loginName")==null?"":httpSession.getAttribute("loginName").toString());
- if(sspMarksService.saveQualityMark(jsonObject) == 1){
- resultMap.put("code","200");
- resultMap.put("msg","提交成功");
- }else{
- resultMap.put("code","201");
- resultMap.put("msg","提交失败");
- }
- return resultMap;
- }
-
-
- /**
- * @describe:七牛文件上传token
- * @author:
- * @date:2021/4/6&14:29
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @RequestMapping("/getToken")
- public String getToken() { return QiniuUploadUtil.getToken();};
-
- /**
- * @describe:查询用户列表
- * @author:
- * @date:2021/4/6&18:02
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @RequestMapping("/queryUserInfo")
- @ResponseBody
- public Object queryUserInfo(@RequestParam Map map, HttpSession HttpSession) {
- map.put("loginName", HttpSession.getAttribute("loginName"));
- map.put("projectId", HttpSession.getAttribute("projectId"));
- return pshService.queryUserInfo(map);
- }
-
- /**
- * 获取项目用户列表
- * @param map
- * @return
- */
- @RequestMapping("/queryUserList")
- @ResponseBody
- public Object queryUserList(@RequestBody Map map){
- return pshService.queryUserList(map);
- }
-
- /**
- * @describe:修改审核流程的状态
- * @author:
- * @date:2021/4/7&11:39
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @RequestMapping("/updateChange")
- public Object updateChange(@RequestParam Map map, HttpSession HttpSession) {
- map.put("createUser", HttpSession.getAttribute("loginName"));
- return pshService.updateState(map);
- }
-
- /**
- * 查询留痕上报页面
- *
- * @param sspMarks
- * @return
- */
- @ResponseBody
- @RequestMapping("/listMarks")
- public Object listMarks(SspMarks sspMarks, HttpSession session) {
- sspMarks.setProjectId(Integer.parseInt(session.getAttribute("projectId").toString()));
- return sspMarksService.queryMarksList(sspMarks);
- }
-
-
- /**
- * 回显质量留痕页面
- *
- * @param map
- * @param model
- * @return
- */
- @RequestMapping("/goMarksView")
- public Object goMarksView(@RequestParam Map map, Model model) {
- Map pictureMap = new HashMap<>();
- Map videoMap = new HashMap<>();
- SspMarks sspMarks = new SspMarks();
- sspMarks.setId(map.get("id").toString());
- sspMarks.setCheckState(map.get("numState").toString());
- SspMarks dbSSpMark = sspMarksService.selectSspMarksList(sspMarks).get(0);
- String marksPicture = dbSSpMark.getMarksPicture();
- if(StringUtils.isNotBlank(marksPicture)) {
- List fileListPicture = sspMarksService.queryPicture(dbSSpMark);
- if(fileListPicture != null && fileListPicture.size() > 0) {
- pictureMap.put("fileListPictureState", "OK");
- pictureMap.put("fileListPicture", fileListPicture);
- } else {
- pictureMap.put("fileListPictureState", "NO");
- }
- }
- if(StringUtils.isNotBlank(dbSSpMark.getMarksVideo())) {
- List fileListVideo = sspMarksService.queryVideo(dbSSpMark);
- if(fileListVideo != null && fileListVideo.size() > 0) {
- videoMap.put("fileListVideoState", "OK");
- videoMap.put("fileListVideo", fileListVideo);
- } else {
- videoMap.put("fileListVideoState", "NO");
- }
- }
- model.addAttribute("dbSSpMark",dbSSpMark);
- model.addAttribute("pictureMap",pictureMap);
- model.addAttribute("videoMap",videoMap);
- return prefix + "/sspMarkView";
- }
-
-
- /**
- * @describe:修改审核流程的状态
- * @author:
- * @date:2021/4/7&11:39
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- @ResponseBody
- @RequestMapping("/sspQualityMarkApprove")
- public Object sspQualityMarkApprove(@RequestParam Map map, HttpSession HttpSession) {
- map.put("loginName", HttpSession.getAttribute("loginName"));
- return pshService.updateSspQualityMarkApprove(map);
- }
-
- /**
- *获取工程类型
- * @param param
- * @return
- */
- @RequestMapping("/getProjectType")
- @ResponseBody
- public Object selectProjectTypeList(@RequestParam Map param){
- return pshService.selectProjectTypeList(param);
- }
-
- @RequestMapping("/treesList")
- @ResponseBody
- public Map getFatherNode(ProcessName processName) {
- Map resultMap = new HashMap<>();
- // 查询所有部门信息
- List treesList = pshService.selectProcessName("0");
- List newTrees = new ArrayList();
- for (ProcessName department : treesList) {
- // 如果pId为0，则该节点为父节点
- if ((department.getParentCode().equals("0"))) {
- // 递归获取父节点下的子节点
- department.setList(getChildrenNode(department.getId(), treesList));
- newTrees.add(department);
- }
- }
- resultMap.put("children", newTrees);
- System.out.println(resultMap);
- return resultMap;
- }
-
- /**
- * 递归获取子节点下的子节点
- * @param integer 父节点的ID
- * @param treesList 所有菜单树集合
- * @return
- */
- private List getChildrenNode(String integer, List treesList) {
- List newTrees = new ArrayList();
- for (ProcessName department : treesList) {
- if ((department.getParentCode().equals("0"))) {
- continue;
- }
- if (department.getParentCode().equals(integer)) {
- // 递归获取子节点下的子节点，即设置树控件中的children
- department.setList(getChildrenNode(department.getId(), treesList));
- newTrees.add(department);
- }
- }
- return newTrees;
- }
-
- /**
- * 查询工程编码、名称
- * @return
- */
- @RequestMapping("selectCodeFromSmark")
- @ResponseBody
- public Object selectCodeFromSmark(String projectId) {
- return pshService.querySmarkCode(projectId);
- }
-
- /**
- * 通用上传请求（单个）
- */
- @PostMapping("/upload")
- @ResponseBody
- public AjaxResult uploadFile(MultipartFile file) throws Exception
- {
- try
- {
- // 上传文件路径
- String filePath = RuoYiConfig.getUploadPath();
- // 上传并返回新文件名称
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- AjaxResult ajax = AjaxResult.success();
- ajax.put("url", url);
- ajax.put("fileName", fileName);
- ajax.put("newFileName", FileUtils.getName(fileName));
- ajax.put("originalFilename", file.getOriginalFilename());
- return ajax;
- }
- catch (Exception e)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
-
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java
deleted file mode 100644
index 56a10f61..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package com.ruoyi.web.pshManage.mapper;
-
-import com.ruoyi.web.sspMarks.domain.ProcessName;
-import com.ruoyi.web.sspMarks.domain.SspMarkfileinfo;
-import com.ruoyi.web.sspMarks.domain.SspMarksflow;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName:sspMapper
- * @Description:随手拍的数据层
- * @Author:
- * @Date:2021/3/30 15:23
- * @version:V1.0
- */
-@Repository
-public interface PshMapper {
-
- /**
- * @describe:查询随手拍信息的列表(问题整改)
- * @author:
- * @date:2021/3/30&15:25
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listSspInfoChanges(Map map);
-
-
- /**
- * @describe:查询随手拍信息的列表(问题整改，留痕上报)
- * @author:
- * @date:2021/3/30&15:25
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listSspInfoMyNicked(Map map);
-
- /**
- * @describe:根据id查询相关基本信息
- * @author:
- * @date:2021/4/1&11:15
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryChangeNickedInfo(Map map);
-
- /**
- * @describe:根据id查询相关的文件
- * @author:
- * @date:2021/4/1&11:19
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listChangeNickedFile(Map map);
-
- /**
- * @describe:新增问题整改主表信息
- * @author:
- * @date:2021/3/31&9:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspInfoChanges(Map map);
-
- /**
- * @describe:新增留痕上报主表信息
- * @author:
- * @date:2021/3/31&9:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspInfoNicked(Map map);
-
- /**
- * @describe:修改留痕上报主表信息
- * @author:
- * @date:2021/3/31&9:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int updateSmzSspProblemmodify(Map map);
-
- /**
- * @describe:新增流程信息
- * @author:
- * @date:2021/3/31&9:27
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspAuditInfo(Map map);
-
- /**
- * @describe:新增文件信息
- * @author:
- * @date:2021/3/31&9:36
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspFileInfo(Map map);
-
- /**
- * @describe:修改状态
- * @author:
- * @date:2021/4/2&11:28
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int updateState(Map map);
-
- /**
- * @describe:修改状态
- * @author:
- * @date:2021/4/2&11:28
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int updateStateOk(Map map);
-
- /**
- * @describe:查询已整改的基本信息
- * @author:
- * @date:2021/4/6&9:57
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryOpinion(Map map);
-
- /**
- * @describe:查询已整改的基本信息
- * @author:
- * @date:2021/4/6&9:57
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryOpinionChange(Map map);
-
- /**
- * @describe:查询已整改的文件信息
- * @author:
- * @date:2021/4/6&9:59
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listOpinionFile(Map map);
-
- /**
- * @describe:查询人员的信息
- * @author:
- * @date:2021/4/6&17:18
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listUserInfo(Map map);
-
- /**
- * 根据用户账号查询用户信息
- * @param loginName
- * @return
- */
- public Map queryUserInfo(String loginName);
-
- /**
- * 获取项目用户列表
- * @param map
- * @return
- */
- public List> queryUserList(Map map);
-
- /**
- * @describe:查询负责人的项目归属
- * @author:
- * @date:2021/4/6&17:24
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryUserProjectInfo(Map map);
-
- /**
- * @describe:添加驳回的审核意见
- * @author:
- * @date:2021/4/7&15:35
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspAuditInfoReject(Map map);
-
- /**
- * @describe:添加通过的审核意见
- * @author:
- * @date:2021/4/7&15:35
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public int saveSspAuditInfoPass(Map map);
-
- /**
- * @describe:查询当前审核流程的信息
- * @author:
- * @date:2021/4/7&16:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryAuditInfo(Map map);
-
- /**
- * @describe:查询驳回信息
- * @author:
- * @date:2021/4/7&16:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public String queryRejectInfo(Map map);
-
-
- /**
- * @describe:查询N次提交的图片信息
- * @author:
- * @date:2021/4/7&17:18
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> listRejectFile(Map map);
-
-
- /**
- * 新增留痕上报流程
- *
- * @param sspMarksflow
- * @return
- */
- int saveSspMarkFlow(SspMarksflow sspMarksflow);
-
- /**
- * 新增留痕审批文件
- *
- * @param sspMarkfileinfo
- * @return
- */
- int saveMarkFileInfo(SspMarkfileinfo sspMarkfileinfo);
-
-
- /**
- * 根据type获取url
- *
- * @return
- */
- Map queryFileInfo(Map map);
-
- /**
- * 获取质量留痕数据发布记录
- * @param map
- * @return
- */
- List> querySspQualityMarkList(Map map);
-
- /**
- * 获取当前用户提交的质量留痕数据发布记录
- * @param map
- * @return
- */
- List> querySspQualityMarkMyList(Map map);
-
- /**
- * 获取质量留痕记录详情
- * @param map
- * @return
- */
- Map querySspQualityMarkInfo(Map map);
-
- /**
- * 获取质量留痕审批流下一个待审批账号
- * @param map
- * @return
- */
- String querySspQualityMarkApproveNextLoginName(Map map);
-
- /**
- * 获取质量留痕审批流待审批数量
- */
- int querySspQualityMarkToBeApprovedNum(Map map);
-
- /**
- * 更新隐蔽工程留痕记录审批流审批状态
- * @param map
- * @return
- */
- int updateSspQualityMarkApproveState(Map map);
-
- /**
- * 更新隐蔽工程留痕记录审批状态
- * @param map
- * @return
- */
- int updateSspQualityMarkState(Map map);
-
- /**
- * 查询工程类型列表
- *
- * @param projectType 工程类型信息
- * @return 工程类型集合
- */
- public List> selectProjectTypeList(Map projectType);
-
- /**
- * 查询关键工序名称列表
- *
- * @param isDel
- * @return
- */
- List selectProcessName(String isDel);
-
- /**
- * 根据入工区编码, 查询工程编码
- *
- * @param proId
- * @return
- */
- List> selectCodeFromSmark(String proId);
-
- /**
- * 查询项目用户信息
- * @param map
- * @return
- */
- List> queryProjectUserinfo(Map map);
-}
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java
deleted file mode 100644
index f0423630..00000000
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/IPshService.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.ruoyi.web.pshManage.service;
-
-import com.ruoyi.web.sspMarks.domain.ProcessName;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName:SspService
- * @Description:随手拍服务层
- * @Author:
- * @Date:2021/3/30 17:03
- * @version:V1.0
- */
-public interface IPshService {
-
- /**
- * @describe:查询随手拍信息的列表(问题整改)
- * @author:
- * @date:2021/3/30&15:25
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map listSspInfoChanges(Map map);
-
-
- /**
- * @describe:查询随手拍信息的列表(留痕上报)
- * @author:
- * @date:2021/3/30&15:25
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Object listSspInfoNicked(Map map);
-
- /**
- * @describe:查询审批流的信息
- * @author:
- * @date:2021/4/1&11:49
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public Map queryChangeNicked(Map map);
-
- /**
- * @describe:新增问题整改主表信息
- * @author:
- * @date:2021/3/31&9:22
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public String saveSspInfoChanges(Map map);
-
- /**
- * @describe:查询人员的信息
- * @author:
- * @date:2021/4/6&17:26
- * @version:V1.0
- * @param:
- * @return:
- * @Exception:
- */
- public List> queryUserInfo(Map