Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!368

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -101,6 +101,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     addInterceptor.excludePathPatterns("/api/lawss/activiti/getImg");
 
+    addInterceptor.excludePathPatterns("/api/lawss/activiti/loginMobile");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");

adc-da-main/src/main/resources/application-dev.properties

@@ -3,10 +3,9 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
+spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.username = tempuser
-spring.datasource.username = root
+spring.datasource.password = Fting&8g35g#geg2
-spring.datasource.password = root
 
 
 
@@ -16,10 +15,10 @@ spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
-#Eruept
+#Eureka
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
 
 #==============================================
 # 邮箱配置1
@@ -35,22 +34,18 @@ spring.mail.properties.smtp.starttls.required=false
 spring.mail.properties.mail.smtp.ssl.enable=false
 spring.mail.port=587
 
-# ==============================================
+#==============================================
-# rabbitMQ
+# MQ配置
-# ==============================================
+#==============================================
-#spring.rabbitmq.host=10.2.186.93
+spring.rabbitmq.host=10.100.5.119
-#spring.rabbitmq.port=5672
-#spring.rabbitmq.username=ca
-#spring.rabbitmq.password=cs986432
-spring.rabbitmq.host=62.234.118.181
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin
-spring.rabbitmq.password=admin
+spring.rabbitmq.password=foton@admin
 spring.rabbitmq.listener.simple.acknowledge-mode= manual
 # 生产者 默认关闭 发版 需改为 true
-spring.rabbitmq.listener.direct.auto-startup=false
+spring.rabbitmq.listener.direct.auto-startup=true
 # 消费者 默认关闭 发版 需改为 true
-spring.rabbitmq.listener.simple.auto-startup=false
+spring.rabbitmq.listener.simple.auto-startup=true
 #消费失败消息干掉
 spring.rabbitmq.listener.simple.default-requeue-rejected= true
 #5秒
@@ -58,22 +53,23 @@ spring.rabbitmq.listener.simple.retry.initial-interval= 5000
 spring.rabbitmq.listener.simple.retry.enabled= true
 #最大重试5次
 spring.rabbitmq.listener.simple.retry.max-attempts= 5
+# ==============================================
 # 文档存储路径指向
 # ==============================================
-file.path=/usr/laws/file/
+file.path=/data/slrs/file
-file.split.path=/usr/laws/file/
+file.split.path=/data/slrs/file/splitImage/
 
 # 云端OCR识别集成配置参数
 #OCR请求识别URL地址
 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
 # OCR回调接口地址 配置客户本地的IP及端口号
-OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult
+OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
 OCR.userId =dayuzhou1234
 OCR.authCode =123456
 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M
 # OCR文件存储路径
-OCR.ocrPath=/opt/foton-slrs/front/dist/file/
+OCR.ocrPath=/data/slrs/ocrResultFile/
 # OCR文件请求下载或在线预览时URL
-OCR.ocrDownPath=http://62.234.136.153:8038/file/
+OCR.ocrDownPath=/data/slrs/ocrResultFile/
 OCR.times=20
 OCR.convertType=BOTH

adc-da-main/src/main/resources/application.properties

@@ -9,12 +9,12 @@ spring.profiles.active=dev
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
 # 端口号设置
-server.port=9999
+server.port=4202
 #主服务session超时
 server.servlet.session.timeout =600
 
 #tomcat /resource/local/version-manager 创建tomcat指定临时目录
-server.tomcat.basedir=/resource/local/version-manager
+server.tomcat.basedir=/data/slrs/temp
 
 # http-only
 server.session.cookie.http-only=true
@@ -30,20 +30,14 @@ logging.level.org.springframework=info
 
 # 请求前缀
 restPath=/api
-#server.servlet.context-path=/api
 
 #是否将自己注册到Eureka Server上，默认为true
 eureka.client.register-with-eureka=true
 ##是否从Eureka Server上获取注册信息，默认为true
 eureka.client.fetch-registry=true
+eureka.instance.prefer-ip-address=true
 
-
+eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
-#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
-#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
-#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
-
-eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
-#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
 
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000
@@ -137,11 +131,11 @@ verifyCodeMode=1
 # 文件上传管控及配置
 # =============================================================================
 # file模块上传文件的服务器地址
-file.path=D:/uploadfile/bus
+file.path=/data/slrs/file
 
-stand.edit.file.path = /usr/laws/file/
+stand.edit.file.path = /data/slrs/file/
 # onlyoffice 预览地址
-file.downloadUrl=http://10.100.5.116:1080/file/
+file.downloadUrl=https://srms.foton.com.cn/file/
 
 #上传文件白名单-以,分隔
 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt
@@ -150,14 +144,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt
 # elasticsearch 配置
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=172.17.0.1
+elasticsearch.ip=10.100.5.122
 elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true
 
 #  文档转换TCP通讯地址
 convert.host=127.0.0.1
-#convert.host=0.0.0.0
 
 # =============================================================================
 # scheduled 配置

adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java

@@ -71,7 +71,7 @@ public class ScheduledJob {
     private IWarningDateService iWarningDateService;// 预警日期
 
 //    @PostConstruct //程序启动时执行一次
-    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
+//    @Scheduled(cron = "0 0 0 * * ?")    //每天的凌晨0点执行
 //    @Scheduled(cron="*/5 * * * * ?")
 //    @Scheduled(fixedDelay = 120000)
     @Async

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -41,5 +41,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
     List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
 
     List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception;
+
+    List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception;
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -916,6 +916,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return sarlist;
     }
 
+
+    @Override
+    public List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception {
+        //查询当前登录人角色拥有权限的菜单
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
+            QueryWrapper<TsResource> qw = new QueryWrapper<>();
+            qw.eq("ID",page.getMenuId());
+            qw.isNull("PARENT_ID");
+            List<TsResource> children = iTsResourceService.list(qw);
+            if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+                List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
+                if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+                    page.setMenuRoleList(getMenuIdList);
+                } else {
+                    page.setMenuRoleList(null);
+                }
+                List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
+                if (ids != null && !ids.isEmpty()) {
+                    page.setMenuAllChildrenIdList(ids);
+                }
+            }
+        }
+
+        Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
+        page.getPager().setRowCount(rowCount);
+        List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
+        attrInfo(sarlist);
+        return sarlist;
+    }
     /***
      * @Description: 处理属性表数据
      * @Param: [sarlist]

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java

@@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO {
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期开始")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String startPutTime;
+    private String startIssueTime;
 
     @ExcelIgnore
     @ApiModelProperty("范围查询发布日期结束")
     @DateTimeFormat(pattern = "YYYY-MM-dd")
-    private String endPutTime;
+    private String endIssueTime;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             if (!file1.exists()) {
                 file1.mkdirs();
             }
-            String filepathandname = filePath + "/img/" + imageName;
+            String filepathandname = splitFilePath +"/" + imageName;
             try {
                 FileOutputStream fos = new FileOutputStream(filepathandname);
                 fos.write(bytev);

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml

@@ -9,7 +9,7 @@
         <result column="STAND_TYPE"      property="standType"></result>
         <result column="STAND_CODE"      property="standCode"></result>
         <result column="STAND_NAME"      property="standName"></result>
-        <result column="PUT_TIME"        property="putTime"></result>
+        <result column="ISSUE_TIME" property="issueTime"></result>
         <result column="APPLY_TYPE"      property="applyType"></result>
         <result column="DUTY_ENGINEER"   property="dutyEngineer"></result>
         <result column="ITEMS_ID"        property="itemsId"></result>
@@ -31,7 +31,7 @@
         	sarInfo.STAND_TYPE,
         	CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
         	sarInfo.STAND_NAME,
-        	sarInfo.PUT_TIME,
+        	sarInfo.ISSUE_TIME,
             attr.SSRQ as SSRQ
     </sql>
 
@@ -50,15 +50,15 @@
         <if test="waringEO.standName != null and waringEO.standName != ''">
             AND sarInfo.STAND_NAME like  concat('%', #{waringEO.standName},'%')
         </if>
-        <if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
+        <if test="waringEO.startIssueTime != null and waringEO.startIssueTime != '' and waringEO.endIssueTime != null and waringEO.endIssueTime != '' ">
             AND (
-            DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
+            DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
-            #{waringEO.endPutTime},
+            #{waringEO.startIssueTime},
             '%Y-%m-%d'
             )
             AND
-            DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
+            DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-            #{waringEO.endPutTime},
+            #{waringEO.endIssueTime},
             '%Y-%m-%d'
             )
             )
@@ -79,7 +79,7 @@
         	sarInfo.STAND_TYPE,
         	CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
         	sarInfo.STAND_NAME,
-        	sarInfo.PUT_TIME,
+        	sarInfo.ISSUE_TIME,
             attr.SSRQ as SSRQ,
             case stand_type
             when 'INLAND' then '国内标准'
@@ -223,7 +223,7 @@
             <if test="waringEO.startZCCSSRQ != null and waringEO.startZCCSSRQ != '' and waringEO.endZCCSSRQ != null and waringEO.endZCCSSRQ != ''">
                AND (
                 sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
-                DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d')
+                DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.endZCCSSRQ}, '%Y-%m-%d')
                 AND t.time_name = 'ZCCSSRQ' )
                 )
             </if>