FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zyh自用

Browse Source
This commit is contained in:
Mr.Z
2021-08-11 23:03:40 +08:00
parent 440bb7d038
commit 1374bc5807
3 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+17 -9
View File
@@ -2,24 +2,26 @@
#============================================= #=============================================
# 数据库配置 # 数据库配置
#============================================= #=============================================
# dev config
#=============================================
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver 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://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.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root spring.datasource.username = root
spring.datasource.password = root spring.datasource.password = root
#============================================== #==============================================
# 应用设置 # 应用设置
spring.application.name=FotonLAWSSystem spring.application.name=FotonLAWSSystem-zyh
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
#Eruept #Eruept
eureka.client.allow-redirects=true eureka.client.allow-redirects=true
eureka.client.register-with-eureka=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 # 邮箱配置1
@@ -44,10 +46,16 @@ spring.mail.port=587
#spring.rabbitmq.username=uat_pcms #spring.rabbitmq.username=uat_pcms
#spring.rabbitmq.password=VxsBLL5bJruwzXfS #spring.rabbitmq.password=VxsBLL5bJruwzXfS
# spring.rabbitmq.publisher-confirms=true # 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.port=5672
spring.rabbitmq.username=admin spring.rabbitmq.virtual-host=/
spring.rabbitmq.password=admin spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
# ============================================== # ==============================================
# 文档存储路径指向 # 文档存储路径指向
# ============================================== # ==============================================
adc-da-main/src/main/resources/application.properties
+3 -6
View File
@@ -1,6 +1,3 @@
##############################################
# 项目启动模式
##############################################
spring.profiles.active=dev 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://127.0.0.1:8671/eureka/
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/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 秒 # 请求连接的超时时间 默认的时间为 1 秒
ribbon.ConnectTimeout=500000 ribbon.ConnectTimeout=500000
@@ -137,13 +134,13 @@ file.path=D:/uploadfile/bus
# 文件下载地址参数 # 文件下载地址参数
file.downloadUrl=http://39.98.140.126:10001/uploadPath 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 配置
# ============================================================================= # =============================================================================
elasticsearch.clustername=elasticsearch elasticsearch.clustername=elasticsearch
elasticsearch.ip=172.17.0.1 elasticsearch.ip=192.168.10.47
elasticsearch.port=9300 elasticsearch.port=9300
elasticsearch.poolSize=5 elasticsearch.poolSize=5
elas.flag=true elas.flag=true
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+37 -37
View File
@@ -72,17 +72,17 @@
<!-- SAR_STAND_ITEMS table all fields --> <!-- SAR_STAND_ITEMS table all fields -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
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, ,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.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
</sql> </sql>
<sql id="Base_Query_Column_List"> <sql id="Base_Query_Column_List">
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.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.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 SAR_STAND_ITEMS.claim_type,SAR_STAND_ITEMS.bus_stand_cover,SAR_STAND_ITEMS.file_type,SAR_STAND_ITEMS.fo
</sql> </sql>
<!-- 查询条件 --> <!-- 查询条件 -->
<sql id="Base_Where_Clause"> <sql id="Base_Where_Clause">
@@ -193,11 +193,11 @@
<!-- 插入记录 --> <!-- 插入记录 -->
<!--<insert id="insert" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" >--> <!--<insert id="insert" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems" >-->
<!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">--> <!--&lt;!&ndash; <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">-->
<!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL--> <!--SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL-->
<!--</selectKey> &ndash;&gt;--> <!--</selectKey> &ndash;&gt;-->
<!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)--> <!--insert into SAR_STAND_ITEMS(<include refid="Base_Column_List" />)-->
<!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})--> <!--values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})-->
<!--</insert>--> <!--</insert>-->
<!-- 动态插入记录 主键是序列 --> <!-- 动态插入记录 主键是序列 -->
@@ -261,22 +261,22 @@
<!-- 根据pk，修改记录--> <!-- 根据pk，修改记录-->
<update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <update id="updateByPrimaryKey" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
update SAR_STAND_ITEMS update SAR_STAND_ITEMS
set modify_time = #{modifyTime}, set modify_time = #{modifyTime},
creation_time = #{creationTime}, creation_time = #{creationTime},
creation_user = #{creationUser}, creation_user = #{creationUser},
valid_flag = #{validFlag}, valid_flag = #{validFlag},
remarks = #{remarks}, remarks = #{remarks},
responsible_unit = #{responsibleUnit}, responsible_unit = #{responsibleUnit},
energy_kind = #{energyKind}, energy_kind = #{energyKind},
apply_arctic = #{applyArctic}, apply_arctic = #{applyArctic},
tack_time = #{tackTime}, tack_time = #{tackTime},
parts = #{parts}, parts = #{parts},
items_name = #{itemsName}, items_name = #{itemsName},
items_num = #{itemsNum}, items_num = #{itemsNum},
stand_id = #{standId} stand_id = #{standId}
where id = #{id} where id = #{id}
</update> </update>
<!-- 修改记录，只修改只不为空的字段 --> <!-- 修改记录，只修改只不为空的字段 -->
<update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems"> <update id="updateByPrimaryKeySelective" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
@@ -361,10 +361,10 @@
<!-- 删除记录 --> <!-- 删除记录 -->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String"> <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from SAR_STAND_ITEMS delete from SAR_STAND_ITEMS
where id = #{value} where id = #{value}
</delete> </delete>
<!-- SAR_STAND_ITEMS 列表总数--> <!-- SAR_STAND_ITEMS 列表总数-->
<select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
@@ -374,10 +374,10 @@
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap" <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO"> parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT SELECT
* *
FROM FROM
sar_stand_items AS a sar_stand_items AS a
<where> <where>
<if test="standId!=null and standId!=''"> <if test="standId!=null and standId!=''">
@@ -385,7 +385,7 @@
</if> </if>
<if test="fileType !=null and fileType!=''"> <if test="fileType !=null and fileType!=''">
and a.file_type=#{fileType} and a.file_type=#{fileType}
</if> </if>
<if test="itemsName != null and itemsName!=''"> <if test="itemsName != null and itemsName!=''">
@@ -404,7 +404,7 @@
</select> </select>
<!-- 查询SAR_STAND_ITEMS列表 --> <!-- 查询SAR_STAND_ITEMS列表 -->
<select id="queryByPage" resuCOMPLIANCE_REQUIRltMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from from
@@ -740,10 +740,10 @@
a.STAND_ID a.STAND_ID
FROM FROM
sar_stand_items a sar_stand_items a
LEFT JOIN sar_standards_info b LEFT JOIN sar_standards_info b
on a.STAND_ID=b.ID on a.STAND_ID=b.ID
WHERE b.VALID_FLAG = 0 WHERE b.VALID_FLAG = 0
and a.FILE_TYPE ='FBGBJBD' and a.FILE_TYPE ='FBGBJBD'
GROUP BY GROUP BY
a.STAND_ID a.STAND_ID
limit #{page},#{size} limit #{page},#{size}