From 1374bc5807c02d53f3d8f1e53363fb816d9d9586 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 11 Aug 2021 23:03:40 +0800 Subject: [PATCH] =?UTF-8?q?zyh=E8=87=AA=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-dev.properties | 26 ++++--- .../src/main/resources/application.properties | 9 +-- .../SarStandItems/SarStandItemsMapper.xml | 74 +++++++++---------- 3 files changed, 57 insertions(+), 52 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..50d13982 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -2,24 +2,26 @@ #============================================= # 数据库配置 #============================================= +# dev config +#============================================= +# 数据库配置 +#============================================= 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=UTC&useSSL=false -#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root - - #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=FotonLAWSSystem-zyh application.code=20200101 application.center=1 #============================================== #Eruept 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.96.10.171:8761/eureka/ #============================================== # 邮箱配置1 @@ -44,10 +46,16 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.118.181 + +#spring.rabbitmq.host=192.168.10.248 +#spring.rabbitmq.port=5672 +#spring.rabbitmq.username=ca +#spring.rabbitmq.password=cs986432 +spring.rabbitmq.host=localhost spring.rabbitmq.port=5672 -spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.virtual-host=/ +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 27bb37f1..1aa5483e 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -1,6 +1,3 @@ -############################################## -# 项目启动模式 -############################################## spring.profiles.active=dev ############################################## @@ -39,7 +36,7 @@ eureka.client.fetch-registry=true #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,13 +134,13 @@ file.path=D:/uploadfile/bus # 文件下载地址参数 file.downloadUrl=http://39.98.140.126:10001/uploadPath #上传文件白名单-以,分隔 -upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt +upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg # ============================================================================= # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index ac7fc966..663e9abf 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -72,17 +72,17 @@ - SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,tsFo.UNAME as foShow,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow,SAR_STAND_ITEMS.fo - + - SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, + SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id ,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS,SAR_STAND_ITEMS.duty_engineer,SAR_STAND_ITEMS.svpps, SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo - + @@ -193,11 +193,11 @@ - - - - - + + + + + @@ -261,22 +261,22 @@ - update SAR_STAND_ITEMS - set modify_time = #{modifyTime}, - creation_time = #{creationTime}, - creation_user = #{creationUser}, - valid_flag = #{validFlag}, - remarks = #{remarks}, - responsible_unit = #{responsibleUnit}, - energy_kind = #{energyKind}, - apply_arctic = #{applyArctic}, - tack_time = #{tackTime}, - parts = #{parts}, - items_name = #{itemsName}, - items_num = #{itemsNum}, - stand_id = #{standId} - where id = #{id} - + update SAR_STAND_ITEMS + set modify_time = #{modifyTime}, + creation_time = #{creationTime}, + creation_user = #{creationUser}, + valid_flag = #{validFlag}, + remarks = #{remarks}, + responsible_unit = #{responsibleUnit}, + energy_kind = #{energyKind}, + apply_arctic = #{applyArctic}, + tack_time = #{tackTime}, + parts = #{parts}, + items_name = #{itemsName}, + items_num = #{itemsNum}, + stand_id = #{standId} + where id = #{id} + @@ -361,10 +361,10 @@ - delete from SAR_STAND_ITEMS - where id = #{value} + delete from SAR_STAND_ITEMS + where id = #{value} - + - SELECT - * - FROM - sar_stand_items AS a + SELECT + * + FROM + sar_stand_items AS a @@ -385,7 +385,7 @@ - and a.file_type=#{fileType} + and a.file_type=#{fileType} @@ -404,7 +404,7 @@ - select from @@ -740,10 +740,10 @@ a.STAND_ID FROM sar_stand_items a - LEFT JOIN sar_standards_info b - on a.STAND_ID=b.ID + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID WHERE b.VALID_FLAG = 0 - and a.FILE_TYPE ='FBGBJBD' + and a.FILE_TYPE ='FBGBJBD' GROUP BY a.STAND_ID limit #{page},#{size}