Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
YeeAmosFireAutoSysRoot
Commits
5a519749
Commit
5a519749
authored
Mar 01, 2021
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改无用引用
parent
f5afd28e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
23 deletions
+6
-23
application-dev.properties
...utoSysStart/src/main/resources/application-dev.properties
+1
-1
dbTemplate_fire_equip.xml
...rt/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
+5
-22
No files found.
YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties
View file @
5a519749
...
...
@@ -10,7 +10,7 @@ eureka.client.healthcheck.enabled = true
eureka.client.fetchRegistry
=
true
eureka.instance.prefer-ip-address
=
true
#DB properties:
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/safety-business-
2.1.4
?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.url
=
jdbc:mysql://172.16.10.66:3306/safety-business-
3.0.0
?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
spring.datasource.username
=
root
spring.datasource.password
=
root_123
...
...
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml
View file @
5a519749
...
...
@@ -285,24 +285,7 @@
<!-- )-->
<!-- </select>-->
<select
id=
"queryStorageEquips"
resultType=
"map"
>
SELECT
wed.`name`,
u.`name` AS unit,
sum(wsd.amount) fireEquipmentCount
FROM
wl_stock_detail wsd
LEFT JOIN wl_equipment_detail wed ON wed.id = wsd.equipment_detail_id
LEFT JOIN wl_equipment we ON we.id = wed.equipment_id
LEFT JOIN wl_unit u ON u.id = we.unit_id
LEFT JOIN wl_warehouse_structure ws ON ws.source_id = wsd.warehouse_structure_id
left join f_risk_source as sce on sce.source_id = ws.source_id
WHERE
sce.id = #{riskSourceId}
GROUP BY
wsd.equipment_detail_id,
wed.`name`
</select>
<!-- <select id="findEquipDetailsById" resultType="com.yeejoin.amos.fas.core.common.response.EquipDetailsResponse">-->
<!-- SELECT-->
...
...
@@ -318,8 +301,7 @@
<!-- <if test="id!=null">AND eq.id = #{id}</if>-->
<!-- </where>-->
<!-- </select>-->
<select
id=
"queryStorageEquips"
resultType=
"map"
>
SELECT
wed.id,
...
...
@@ -673,7 +655,7 @@
<!-- where s.id = r.source_id and s.id = #{id}-->
<!-- </select>-->
<
select
id=
"findFireStationById"
resultType=
"com.yeejoin.amos.fas.dao.entity.FireStation
"
>
<
!-- <select id="findFireStationById" resultType="java.util.Map
">
SELECT
wb.`name`,
wb.`code`,
...
...
@@ -686,5 +668,5 @@
wl_building wb
WHERE
wb.id = #{id}
</select>
</select>
-->
</mapper>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment