diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index ca2d6fdd..c9b1fd24 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow") +@FeignClient(value = "bat-wkflow-wh") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index d10482d6..930a5c60 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -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 :3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -11,14 +11,14 @@ spring.datasource.password = root #============================================== # 应用设置 -spring.application.name=FotonLAWSSystem +spring.application.name=BAT-WKFLOW-WH application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ #============================================== # 邮箱配置1 @@ -43,7 +43,7 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.10.248 +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 spring.rabbitmq.username=ca spring.rabbitmq.password=cs986432 @@ -65,4 +65,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH \ No newline at end of file +OCR.convertType=BOTH diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties index 203e71c7..dd9b39be 100644 --- a/adc-da-main/src/main/resources/application-prod.properties +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -25,14 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +# +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties index 55f14c4b..bf84333a 100644 --- a/adc-da-main/src/main/resources/application-test.properties +++ b/adc-da-main/src/main/resources/application-test.properties @@ -25,14 +25,18 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +spring.rabbitmq.host=192.168.1.109 spring.rabbitmq.port=5672 -spring.rabbitmq.virtual-host=uat_pcms -spring.rabbitmq.username=uat_pcms -spring.rabbitmq.password=VxsBLL5bJruwzXfS +spring.rabbitmq.username=ca +spring.rabbitmq.password=cs986432 +#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc +#spring.rabbitmq.port=5672 +#spring.rabbitmq.virtual-host=uat_pcms +#spring.rabbitmq.username=uat_pcms +#spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ \ No newline at end of file +file.path=/usr/laws/file/ diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 5b30f553..f1e79d41 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,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://101.36.227.25:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -146,4 +146,4 @@ elasticsearch.clustername=elasticsearch elasticsearch.ip=192.168.10.47 elasticsearch.port=9300 elasticsearch.poolSize=5 -elas.flag=true \ No newline at end of file +elas.flag=true diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java index d91792c6..8c35c794 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandUnqualified.dao; import com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author super_liu * @since 2021-06-15 */ +@Mapper public interface SarStandUnqualifiedDao extends BaseMapper { } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index bfa7a494..fb3e1461 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -10,10 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.stereotype.Service; import java.sql.Timestamp; import java.time.LocalDateTime; import java.util.ArrayList; @@ -42,13 +43,18 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) { QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>(); if(sarStandUnqualifiedPage.getStandId()!=null){ - sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%")); + sarStandUnqualifiedQueryWrapper + .and(wrapper->wrapper + .like("stand_id",sarStandUnqualifiedPage.getStandId()) + .or() + .like("stand_name",sarStandUnqualifiedPage.getStandId()) + .eq("close_state",1)); // sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"); } //仅查询未关闭的 sarStandUnqualifiedQueryWrapper.eq("close_state",1); if(sarStandUnqualifiedPage.getProductName()!=null){ - sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%"); + sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName()); } if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){ sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());