From 6175ea6b9f23a8b3da8e663dee1103ea014ec61f Mon Sep 17 00:00:00 2001
From: cuijiaming <1410452759@qq.com>
Date: Thu, 1 Dec 2022 11:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81-=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=87=BA=E6=9D=A5=E7=9A=84=E6=95=B0=E6=8D=AE=E8=B7=9F?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=EF=BC=88=E5=B7=B2=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
adc-da-main/pom.xml | 5 ++
.../src/main/resources/application.properties | 81 ++++++++++---------
.../controller/SarPublicIdeaController.java | 4 +-
.../Impl/SarPublicIdeaServiceImpl.java | 32 +++++++-
.../java/com/adc/da/sys/util/DateUtil.java | 2 +-
5 files changed, 77 insertions(+), 47 deletions(-)
diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index 66563e43..5be728c4 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -90,6 +90,11 @@
+
+ net.sf.dozer
+ dozer
+ 5.4.0
+
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index 8a6d29cb..3805e720 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -1,89 +1,90 @@
##############################################
-# 项目启动模式
+# \u9879\u76EE\u542F\u52A8\u6A21\u5F0F
##############################################
spring.profiles.active=dev
##############################################
-#公共配置信息
+#\u516C\u5171\u914D\u7F6E\u4FE1\u606F
##############################################
server.compression.enabled=true
server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
-# 端口号设置
+# \u7AEF\u53E3\u53F7\u8BBE\u7F6E
server.port=10086
-#主服务session超时
+#\u4E3B\u670D\u52A1session\u8D85\u65F6
server.servlet.session.timeout =600
-#tomcat /resource/local/version-manager 创建tomcat指定临时目录
+#tomcat /resource/local/version-manager \u521B\u5EFAtomcat\u6307\u5B9A\u4E34\u65F6\u76EE\u5F55
server.tomcat.basedir=/data/slrs/temp
# http-only
server.session.cookie.http-only=true
spring.mvc.async.request-timeout=20000
-# file模块上传文件大小限制
+# file\u6A21\u5757\u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236
spring.http.multipart.max-request-size=100MB
spring.http.multipart.max-file-size=100MB
-#显示sql
+#\u663E\u793Asql
logging.level.com.adc=DEBUG
logging.level.org.springframework=info
-# 请求前缀
+# \u8BF7\u6C42\u524D\u7F00
restPath=/api
-#是否将自己注册到Eureka Server上，默认为true
+#\u662F\u5426\u5C06\u81EA\u5DF1\u6CE8\u518C\u5230Eureka Server\u4E0A\uFF0C\u9ED8\u8BA4\u4E3Atrue
eureka.client.register-with-eureka=true
-##是否从Eureka Server上获取注册信息，默认为true
+##\u662F\u5426\u4ECEEureka Server\u4E0A\u83B7\u53D6\u6CE8\u518C\u4FE1\u606F\uFF0C\u9ED8\u8BA4\u4E3Atrue
eureka.client.fetch-registry=true
eureka.instance.prefer-ip-address=true
+
eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
-# 请求连接的超时时间 默认的时间为 1 秒
+# \u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 \u9ED8\u8BA4\u7684\u65F6\u95F4\u4E3A 1 \u79D2
ribbon.ConnectTimeout=500000
-# 请求处理的超时时间
+# \u8BF7\u6C42\u5904\u7406\u7684\u8D85\u65F6\u65F6\u95F4
ribbon.ReadTimeout=500000
# ===============================
# = DATA SOURCE
# ===============================
spring.datasource.type = com.alibaba.druid.pool.DruidDataSource
-# 下面为连接池的补充设置，应用到上面所有数据源中
-# 初始化大小，最小，最大
+# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
+# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
spring.datasource.druid.initial-size= 5
spring.datasource.druid.min-idle= 5
spring.datasource.druid.max-active= 50
-# 配置获取连接等待超时的时间
+# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
spring.datasource.druid.max-wait= 60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
spring.datasource.druid.time-between-eviction-runs-millis= 60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
+# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
spring.datasource.druid.min-evictable-idle-time-millis= 300000
spring.datasource.druid.validation-query= SELECT 1 FROM DUAL
-# 空闲时间监测连接是否优秀奥
+# \u7A7A\u95F2\u65F6\u95F4\u76D1\u6D4B\u8FDE\u63A5\u662F\u5426\u4F18\u79C0\u5965
spring.datasource.druid.test-while-idle= true
-# 数据库连接心跳监测
+# \u6570\u636E\u5E93\u8FDE\u63A5\u5FC3\u8DF3\u76D1\u6D4B
spring.datasource.druid.keep-alive= true
-# 获取链接前检查链接是否有效
+# \u83B7\u53D6\u94FE\u63A5\u524D\u68C0\u67E5\u94FE\u63A5\u662F\u5426\u6709\u6548
spring.datasource.druid.test-on-borrow= true
-# 返回连接池时检查链接是否可用
+# \u8FD4\u56DE\u8FDE\u63A5\u6C60\u65F6\u68C0\u67E5\u94FE\u63A5\u662F\u5426\u53EF\u7528
spring.datasource.druid.test-on-return= false
-# 打开PSCache，并且指定每个连接上PSCache的大小
+# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
spring.datasource.druid.pool-prepared-statements= true
spring.datasource.druid.max-pool-prepared-statement-per-connection-size= 20
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
spring.datasource.druid.filters=stat,wall
-#合并多个DruidDataSource的监控数据
+#\u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
spring.datasource.druid.use-global-data-source-stat=true
-# druid web管理页面开启
+# druid web\u7BA1\u7406\u9875\u9762\u5F00\u542F
spring.datasource.druid.stat-view-servlet.enabled=true
-# druid web管理页面白名单
+# druid web\u7BA1\u7406\u9875\u9762\u767D\u540D\u5355
#spring.datasource.druid.stat-view-servlet.allow=127.0.0.1
-# druid web管理页面账号
+# druid web\u7BA1\u7406\u9875\u9762\u8D26\u53F7
spring.datasource.druid.stat-view-servlet.login-username=druid
-# druid web管理页面密码
+# druid web\u7BA1\u7406\u9875\u9762\u5BC6\u7801
spring.datasource.druid.stat-view-servlet.login-password=laws1q2w3e4r
-# druid web管理页面URL访问前缀地址
+# druid web\u7BA1\u7406\u9875\u9762URL\u8BBF\u95EE\u524D\u7F00\u5730\u5740
spring.datasource.druid.stat-view-servlet.url-pattern=/druid/*
# ===============================
@@ -94,7 +95,7 @@ mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
# ========================================
-# activiti 配置信息
+# activiti \u914D\u7F6E\u4FE1\u606F
# ========================================
#spring.activiti.database-schema=ACT
spring.activiti.database-schema-update=false
@@ -103,7 +104,7 @@ spring.activiti.job-executor-activate=false
spring.activiti.process-definition-location-prefix=classpath:/mybatis/mapper/activiti/
# =============================================================================
-# 邮箱配置
+# \u90AE\u7BB1\u914D\u7F6E
# =============================================================================
mail.valid=false
spring.mail.host=smtp.163.com
@@ -115,9 +116,9 @@ spring.mail.properties.smtp.starttls.enable=true
spring.mail.properties.smtp.starttls.required=true
spring.mail.properties.mail.smtp.ssl.enable=true
spring.mail.port=465
-#全球标准法规管理系统 十六进制码
+#\u5168\u7403\u6807\u51C6\u6CD5\u89C4\u7BA1\u7406\u7CFB\u7EDF \u5341\u516D\u8FDB\u5236\u7801
mail.personName=E585A8E79083E6A087E58786E6B395E8A784E7AEA1E79086E7B3BBE7BB9F
-#邮箱内容中嵌入的系统地址
+#\u90AE\u7BB1\u5185\u5BB9\u4E2D\u5D4C\u5165\u7684\u7CFB\u7EDF\u5730\u5740
Lawss.address =http://standard.gacrnd.com:60090
@@ -128,20 +129,20 @@ maxLoginErrorCount=3
verifyCodeMode=1
# =============================================================================
-# 文件上传管控及配置
+# \u6587\u4EF6\u4E0A\u4F20\u7BA1\u63A7\u53CA\u914D\u7F6E
# =============================================================================
-# file模块上传文件的服务器地址
+# file\u6A21\u5757\u4E0A\u4F20\u6587\u4EF6\u7684\u670D\u52A1\u5668\u5730\u5740
file.path=/data/slrs/file
stand.edit.file.path = /data/slrs/file/
-# onlyoffice 预览地址
+# onlyoffice \u9884\u89C8\u5730\u5740
file.downloadUrl=https://srms.foton.com.cn/file/
-#上传文件白名单-以,分隔
+#\u4E0A\u4F20\u6587\u4EF6\u767D\u540D\u5355-\u4EE5,\u5206\u9694
upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip,dot
# =============================================================================
-# elasticsearch 配置
+# elasticsearch \u914D\u7F6E
# =============================================================================
elasticsearch.clustername=elasticsearch
elasticsearch.ip=127.0.0.1
@@ -149,10 +150,10 @@ elasticsearch.port=9306
elasticsearch.poolSize=5
elas.flag=true
-# 文档转换TCP通讯地址
+# \u6587\u6863\u8F6C\u6362TCP\u901A\u8BAF\u5730\u5740
convert.host=127.0.0.1
# =============================================================================
-# scheduled 配置
+# scheduled \u914D\u7F6E
# =============================================================================
isNotScheduled=true
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
index aaf0202c..d042bea5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
@@ -56,7 +56,7 @@ public class SarPublicIdeaController extends BaseController {
startdate = formater.parse(start);
}
if (end!=null){
- enddate=formater.parse(DateUtil.addOneDay(end));
+ enddate=formater.parse(end);
}
} catch (ParseException e) {
e.printStackTrace();
@@ -83,7 +83,7 @@ public class SarPublicIdeaController extends BaseController {
//
Calendar c2 = Calendar.getInstance();
c2.setTime(sarPublicIdea.getEndTime());
- c2.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天
+ c2.add(Calendar.DAY_OF_MONTH, 0);// 今天+1天
sarPublicIdea.setEndTime(c2.getTime());
sarPublicIdeaService.save(sarPublicIdea);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
index e5351209..d445e631 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
/**
@@ -50,6 +51,21 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl