diff --git a/pom.xml b/pom.xml
index feda528..b7e43a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.cm
system-inspection
- 2.1.0-SNAPSHOT
+ v2
system-inspection
隐患排查系统
diff --git a/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java b/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java
index af25720..222ca68 100644
--- a/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/publicareareport/impl/PublicAreaReportServiceImpl.java
@@ -89,7 +89,7 @@ public class PublicAreaReportServiceImpl extends BaseService implements IPublicA
LOG.debug("处理失败,上报领导");
publicLogService.savePublicLogSimple(token, publicAreaReportId, null, "处理失败,上报上级处理", userName);
// 领导处理
- GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getLeader(params.get("creator").toString(), 0);
+ GridPersonnelDTO gridPersonnelDTO = gridPersonnelService.getLeader(params.get("creator").toString(), 1);
if (gridPersonnelDTO == null) {
throw new SaveException("非网格员,上报失败");
}
diff --git a/src/main/resources/application-btyj.yml b/src/main/resources/application-btyj.yml
index 8c52612..22de14a 100644
--- a/src/main/resources/application-btyj.yml
+++ b/src/main/resources/application-btyj.yml
@@ -1,7 +1,7 @@
server:
port: 7012
url: http://1.180.60.42:8084/inspection
- title: inspection
+ title: 隐患上报系统
servlet:
context-path: /inspection
@@ -20,7 +20,7 @@ spring:
max-request-size: 1GB
datasource:
druid:
- url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+ url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection_v2?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
db-type: mysql
driver-class-name: com.mysql.jdbc.Driver
username: root
@@ -72,7 +72,7 @@ swagger:
# 文件
file:
- uploadPath: /root/projects_test/uploadFiles/
+ uploadPath: /root/projects/uploadFiles/
imageTypes: png,jpg,jpeg,gif,blob
videoTypes: mp4,rmvb
audioTypes: mp3,wmv
@@ -131,7 +131,7 @@ access-control:
# 日志
logging:
- file: /root/projects_test/logs/inspection/inspection-logs.log
+ file: /root/projects/logs/inspection/inspection-v2-logs.log
level:
root: error
com.cm: debug
diff --git a/src/main/resources/application-btyjtest.yml b/src/main/resources/application-btyjtest.yml
new file mode 100644
index 0000000..eab4099
--- /dev/null
+++ b/src/main/resources/application-btyjtest.yml
@@ -0,0 +1,142 @@
+server:
+ port: 7012
+ url: http://192.168.0.103:7012/inspection
+ title: inspection
+ servlet:
+ context-path: /inspection
+
+spring:
+ thymeleaf:
+ prefix: classpath:/templates/
+ suffix: .html
+ mode: HTML5
+ encoding: UTF-8
+ cache: false
+ main:
+ allow-bean-definition-overriding: true
+ servlet:
+ multipart:
+ max-file-size: 1GB
+ max-request-size: 1GB
+ datasource:
+ druid:
+ url: jdbc:mysql://127.0.0.1:3306/db_btyjj_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+ db-type: mysql
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
+ initial-size: 2
+ min-idle: 2
+ max-active: 5
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: SELECT 1 FROM DUAL
+ test-while-idle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 10
+ filter:
+ commons-log:
+ connection-logger-name: stat,wall,log4j
+ stat:
+ log-slow-sql: true
+ slow-sql-millis: 2000
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ activiti:
+ database-schema-update: true
+ db-history-used: true
+ history-level: full
+ check-process-definitions: false
+ rest-api-enabled: true
+ rest-api-servlet-name: activiti-swagger-document
+ SpringProcessEngineConfiguration:
+ activityFontName: 宋体
+ labelFontName: 宋体
+ dataSource: datasource
+
+# 数据库
+mybatis:
+ config-location: classpath:mybatis/mybatis-config.xml
+ mapper-locations: classpath*:mybatis/mapper/**/*.xml
+
+# 文档
+swagger:
+ title: 接口文档
+ description: 隐患排查系统接口文档
+ service-url: http://1.180.60.42:8084/inspection
+ version: 1.0
+ swagger-base-package: com.cm
+
+# 文件
+file:
+ uploadPath: /Users/wanggeng/Desktop/UploadFiles/
+ imageTypes: png,jpg,jpeg,gif,blob
+ videoTypes: mp4,rmvb
+ audioTypes: mp3,wmv
+ fileTypes: doc,docx,xls,xlsx,ppt,pptx,txt,zip,rar,apk,pdf
+ maxFileCount: 6
+
+# 安全
+security:
+ oauth2:
+ oauth-server: http://192.168.0.103:7001/usercenter
+ oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
+ client:
+ client-id: 32ec344a5fd04fd9911586df5d1dc36b
+ client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
+ user-authorization-uri: ${security.oauth2.oauth-server}/oauth_client/authorize
+ access-token-uri: ${security.oauth2.oauth-server}/oauth_client/token
+ grant-type: authorization_code
+ resource:
+ jwt:
+ key-uri: ${security.oauth2.oauth-server}/oauth_client/token_key
+ token-info-uri: ${security.oauth2.oauth-server}/oauth_client/check_token
+ user-info-uri: ${security.oauth2.oauth-server}/user
+ authorization:
+ check-token-access: ${security.oauth2.oauth-server}/oauth_client/token_key
+
+api-path:
+ user-center: ${security.oauth2.oauth-server}
+ notice-url: ${security.oauth2.oauth-server}
+version: 1
+report-form:
+ check-detail: false
+
+# 访问控制
+access-control:
+ pass-paths:
+ - /index.html
+ - /logout.html
+ - /default.html
+ - /assets/**
+ - /route/file/downloadfile/**
+ save-paths:
+ - /**/save*/**
+ - /**/add*/**
+ delete-paths:
+ - /**/delete*/**
+ - /**/remove*/**
+ update-paths:
+ - /**/update*/**
+ - /**/edit*/**
+ query-paths:
+ - /**/get*/**
+ - /**/query*/**
+ - /**/find*/**
+ - /**/list*/**
+ - /**/count*/**
+
+# 日志
+logging:
+ # file: /root/projects_test/logs/inspection/inspection-logs.log
+ level:
+ root: error
+ com.cm: debug
+
+#大数据统计参数
+count-big-data:
+ jiniqu-dept-id: 0
+ shengtaiwei-dept-id: 0
\ No newline at end of file
diff --git a/src/main/resources/static/route/gridpersonnel/update-gridpersonnel.html b/src/main/resources/static/route/gridpersonnel/update-gridpersonnel.html
index abb4264..bee08b2 100644
--- a/src/main/resources/static/route/gridpersonnel/update-gridpersonnel.html
+++ b/src/main/resources/static/route/gridpersonnel/update-gridpersonnel.html
@@ -153,7 +153,7 @@