Skip to content

A
amos-boot-biz
Commit fc9c8894 authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

修改一级弹窗接口

parent 02647a1a
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 44 deletions
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev2.properties
View file @ fc9c8894
#DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url=jdbc:mysql://36.46.151.113:23306/per_tzs_amos_tzs_biz?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username=root
spring.datasource.password=Yeejoin@2020
spring.datasource.driver-class-name=cn.com.vastbase.Driver
spring.datasource.url=jdbc:vastbase://36.46.151.113:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
#eureka properties:
eureka.instance.hostname= eureka
eureka.instance.prefer-ip-address = true
eureka.client.serviceUrl.defaultZone =http://36.46.151.113:10001/eureka/
eureka.instance.ip-address = 172.16.3.133
#DB properties:
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.url=jdbc:mysql://172.16.10.210:53306/${TZS_BIZ_DATABASE}?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
#spring.datasource.username=${MYSQL_ROOT_USER}
#spring.datasource.password=${MYSQL_ROOT_PASSWORD}
#eureka prioperties:
#eureka.client.serviceUrl.defaultZone=http://172.16.10.210:10001/eureka/
#eureka.client.register-with-eureka=true
#eureka.client.fetch-registry=true
#eureka.client.healthcheck.enabled=true
#ribbon.eureka.enabled=true
#eureka.instance.hostname=${spring.cloud.client.ip-address}
#eureka.instance.prefer-ip-address=true
#eureka.instance.instance-id=${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}
#eureka.instance.lease-expiration-duration-in-seconds=10
#eureka.instance.lease-renewal-interval-in-seconds=5
#management.endpoint.health.show-details=always
#management.endpoints.web.exposure.include=*
#
#eureka.instance.prefer-ip-address = true
#eureka.instance.ip-address = 172.16.10.210
eureka.client.service-url.defaultZone =http://36.46.151.113:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address = localhost
## ES properties:
biz.elasticsearch.port=9200
biz.elasticsearch.address=36.46.151.113
spring.data.elasticsearch.cluster-name=docker-cluster
spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
elasticsearch.username=elastic
elasticsearch.password=123456
elasticsearch.username= elastic
elasticsearch.password= a123456
## unit(h)
alertcall.es.synchrony.time=48
......@@ -42,9 +73,12 @@ emqx.user-name=super
emqx.password=123456
emqx.keepAliveInterval=1000
tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
tzs.cti.url=http://36.46.151.113:8000
tzs.cti.url=http://36.41.172.83:8000
##wechatToken
......@@ -86,16 +120,35 @@ flc.sms.tempCode=SMS_TZS_0001
## \u9884\u8B66\u901A\u77E5\u6A21\u677Fid
## ??????id
tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
##\u7763\u67E5\u6574\u6539\u901A\u77E5
##??????
tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
## \u516C\u4F17\u53F7\u6D4B\u8BD5\u7528\u6237id\uFF08\u5E73\u53F0userId\uFF09
## ???????id???userId?
tzs.wechat.test.userId=3413513
fileserver.domain=https://rpm.yeeamos.com:8888/
##new properties
org.filter.group.seq=1564150103147573249
fileserver.domain=http://36.46.151.113:19000/
log.level=INFO
duty.seats.role.ids=1585956200472674305,1585956257590706177
## ???? properties:
rule.definition.load=false
##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
rule.definition.default-agency=tzs
rule.definition.local-ip=172.16.10.210
#\u6C14\u74F6\u5145\u88C5\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.fill.cron=0 0 12 * * ?
#\u6C14\u74F6\u57FA\u672C\u4FE1\u606F\u5B9A\u65F6\u540C\u6B65\u81F3es
tzs.cylinder.info.cron=0 0 1 * * ?
# ??????????
minio.url.path=http://172.16.10.210:9000/
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev3.properties
View file @ fc9c8894
......@@ -27,17 +27,17 @@ spring.datasource.password=Yeejoin@2023
#
#eureka.instance.prefer-ip-address = true
#eureka.instance.ip-address = 172.16.10.210
eureka.client.service-url.defaultZone =http://172.16.10.210:10001/eureka/
# 172.16.8.12
eureka.client.service-url.defaultZone =http://172.16.8.12:10001/eureka/
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url=http://192.168.1.113:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.status-page-url=http://192.168.1.113:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://192.168.1.113:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.ip-address = 172.16.3.34
eureka.instance.ip-address = 192.168.1.113
## ES properties:
biz.elasticsearch.port=9200
......@@ -57,7 +57,7 @@ alertcall.es.synchrony.time=48
#redis properties:
spring.redis.database=1
spring.redis.host=172.16.10.210
spring.redis.host=172.16.8.12
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
......@@ -69,7 +69,7 @@ spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=false
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://36.46.151.113:1883
emqx.broker=tcp://172.16.8.12:1883
emqx.user-name=super
emqx.password=123456
emqx.keepAliveInterval=1000
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties
View file @ fc9c8894
spring.application.name=TZS
spring.application.name=TZS-cpp
server.servlet.context-path=/tzs
server.port=11000
spring.profiles.active=dev3
......@@ -10,7 +10,10 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
##liquibase
spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled= true
spring.liquibase.enabled= false
feign.httpclient.connection-timeout=60000
......@@ -160,7 +163,7 @@ regulator.unit.code=50
spring.main.allow-bean-definition-overriding=true
# \u82E5tzs\u548Cugp\u4E00\u8D77\uFF0C\u5219true
is.ugp=false
is.ugp=true
#\u5DE5\u4F5C\u53F0\u7528\u6237\u7EDF\u4E00\u663E\u793A\u5934\u50CF
tzs.auth.user.photo=/public/common/userPic.png
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/WeldDto.java
View file @ fc9c8894
......@@ -121,8 +121,11 @@ public class WeldDto extends BaseDto {
*/
private String equipmentCode;
/**修复标注*/
/**重焊*/
private Integer repairMark;
/**切除*/
private Integer cut;
private String binding;
}
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Weld.java
View file @ fc9c8894
......@@ -100,9 +100,15 @@ public class Weld extends BaseEntity {
@TableField("voltage_latitude")
private String voltageLatitude;
/**重焊*/
@TableField("repair_mark")
private Integer repairMark;
/**切除*/
@TableField("cut")
private Integer cut;
@TableField("binding")
private String binding;
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml
View file @ fc9c8894
......@@ -217,6 +217,7 @@
</select>
<select id="getWelders" resultType="java.util.Map">
SELECT tupr.resource_id AS sequenceNbr,
tupr.remark AS remark,
CASE
WHEN tupr.audit_status ISNULL THEN 1
ELSE tupr.status
......@@ -236,6 +237,7 @@
tue.service_life as service_Life,
tue.verify_status as verifyStatus,
tua.info as files,
tupr.remark AS remark,
CASE
WHEN tupr.audit_status ISNULL THEN 1
ELSE tupr.status
......@@ -254,6 +256,7 @@
tum.manufacturer,
tum.code,
tua.info as files,
tupr.remark AS remark,
CASE
WHEN tupr.audit_status ISNULL THEN 1
ELSE tupr.status
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WeldServiceImpl.java
View file @ fc9c8894
......@@ -515,7 +515,7 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
return projectDtos;
}
// 修复标识 2-重焊 1-切除 3-重焊和切除
//切除
public List<Map<String, String>> updateWeldRepairMark(String projectId, List<String> weldCodes) {
List<Map<String, String>> lists = new ArrayList();
List<Weld> weldList = weldMapper.getWeldListRepir(Long.valueOf(projectId),weldCodes);
......@@ -525,27 +525,15 @@ class WeldServiceImpl extends BaseService<WeldDto, Weld, WeldMapper> implements
Map<String, String> maps = new HashMap<>();
wrapper.eq(Weld::getProjectId,projectId)
.eq(Weld::getCode,e.getCode());
if (!ValidationUtil.isEmpty(e.getRepairMark())) {
if (e.getRepairMark()==2) {
//重焊过了
weld1.setRepairMark(3);
maps.put(e.getCode(),"ok");
lists.add(maps);
}else if (e.getRepairMark()==1){
//切除过了
if (!ValidationUtil.isEmpty(e.getCut()) && e.getCut() !=1) {
maps.put(e.getCode(),"切除过了,不能在切除了");
lists.add(maps);
}else if (e.getRepairMark()==3){
// 重焊,切除过了
maps.put(e.getCode(),"已经重焊.切除过了,不能在切除了");
lists.add(maps);
}
}else {
weld1.setRepairMark(1);
weld1.setCut(1);
weldMapper.update(weld1, wrapper);
maps.put(e.getCode(),"ok");
lists.add(maps);
}
weldMapper.update(weld1, wrapper);
});
return lists;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment