Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
klck
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
位宇华
klck
Commits
1ad81a23
Commit
1ad81a23
authored
Oct 22, 2024
by
位宇华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
东欢坨电--代码提交
parent
02773d8b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
102 additions
and
9 deletions
+102
-9
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
.../main/java/com/ruoyi/framework/config/SecurityConfig.java
+4
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/ImportExpenseSourceServiceImpl.java
...i/system/service/impl/ImportExpenseSourceServiceImpl.java
+3
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
...om/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
+95
-8
No files found.
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View file @
1ad81a23
...
@@ -114,6 +114,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
...
@@ -114,6 +114,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.
antMatchers
(
"/*/api-docs"
).
anonymous
()
.
antMatchers
(
"/*/api-docs"
).
anonymous
()
.
antMatchers
(
"/druid/**"
).
anonymous
()
.
antMatchers
(
"/druid/**"
).
anonymous
()
.
antMatchers
(
"/powerDisplay/save"
).
anonymous
()
.
antMatchers
(
"/power/source"
).
anonymous
()
.
antMatchers
(
"/test/source"
).
anonymous
()
.
antMatchers
(
"/powerDisplay/peek"
).
anonymous
()
.
antMatchers
(
"/current/rule/salary"
).
anonymous
()
.
antMatchers
(
"/current/rule/salary"
).
anonymous
()
.
antMatchers
(
"/expense/source"
).
anonymous
()
.
antMatchers
(
"/expense/source"
).
anonymous
()
// activiti modeler 放行
// activiti modeler 放行
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/ImportExpenseSourceServiceImpl.java
View file @
1ad81a23
package
com.ruoyi.system.service.impl
;
package
com.ruoyi.system.service.impl
;
import
com.alibaba.excel.EasyExcelFactory
;
import
com.alibaba.excel.EasyExcelFactory
;
import
com.alibaba.fastjson.JSON
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.system.listener.ExcelListener
;
import
com.ruoyi.system.listener.ExcelListener
;
import
com.ruoyi.system.mapper.ImportExpenseSourceMapper
;
import
com.ruoyi.system.mapper.ImportExpenseSourceMapper
;
...
@@ -35,11 +36,12 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
...
@@ -35,11 +36,12 @@ public class ImportExpenseSourceServiceImpl implements ImportExpenseSourceServic
@Override
@Override
@SneakyThrows
@SneakyThrows
public
AjaxResult
save
(
MultipartFile
multipartFile
)
{
public
AjaxResult
save
(
MultipartFile
multipartFile
)
{
List
<
PowerImportSourceModel
>
powerImportSourceModelList
=
EasyExcelFactory
.
read
(
multipartFile
.
getInputStream
(),
PowerImportSourceModel
.
class
,
new
ExcelListener
<>()).
sheet
(
"Sheet
2
"
).
headRowNumber
(
1
).
doReadSync
();
List
<
PowerImportSourceModel
>
powerImportSourceModelList
=
EasyExcelFactory
.
read
(
multipartFile
.
getInputStream
(),
PowerImportSourceModel
.
class
,
new
ExcelListener
<>()).
sheet
(
"Sheet
3
"
).
headRowNumber
(
1
).
doReadSync
();
powerImportSourceModelList
.
forEach
(
v
->{
powerImportSourceModelList
.
forEach
(
v
->{
v
.
setClassificationName
(
v
.
getClassificationName
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
v
.
setClassificationName
(
v
.
getClassificationName
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
v
.
setLevelOneClassification
(
v
.
getLevelOneClassification
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
v
.
setLevelOneClassification
(
v
.
getLevelOneClassification
().
replaceAll
(
StringUtils
.
SPACE
,
StringUtils
.
EMPTY
));
});
});
System
.
err
.
println
(
JSON
.
toJSONString
(
powerImportSourceModelList
));
importExpenseSourceMapper
.
saveSource
(
powerImportSourceModelList
);
importExpenseSourceMapper
.
saveSource
(
powerImportSourceModelList
);
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
View file @
1ad81a23
package
com.ruoyi.system.service.impl
;
package
com.ruoyi.system.service.impl
;
import
com.alibaba.fastjson.JSON
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
...
@@ -272,12 +273,83 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -272,12 +273,83 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
if
(
StringUtils
.
equals
(
"011701"
,
mineid
))
{
if
(
StringUtils
.
equals
(
"011701"
,
mineid
))
{
saveFGZPowerData
(
newRuleRequestModelList
);
saveFGZPowerData
(
newRuleRequestModelList
);
}
}
if
(
StringUtils
.
equals
(
"010101"
,
mineid
))
{
saveTsPowerData
(
newRuleRequestModelList
);
}
if
(
StringUtils
.
equals
(
"010102"
,
mineid
))
{
saveDHTPowerData
(
newRuleRequestModelList
);
}
if
(
StringUtils
.
equals
(
"011706"
,
mineid
))
{
saveZRPowerData
(
newRuleRequestModelList
);
}
}
else
{
}
else
{
return
AjaxResult
.
error
();
return
AjaxResult
.
error
();
}
}
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
/**
* 中润
*
* @param newRuleRequestModelList
*/
private
void
saveZRPowerData
(
List
<
NewRuleRequestModel
>
newRuleRequestModelList
)
{
String
month
=
newRuleRequestModelList
.
get
(
0
).
getWageMonth
();
String
minId
=
newRuleRequestModelList
.
get
(
0
).
getMineid
();
ReplaceBlank
(
newRuleRequestModelList
);
List
<
PowerDisplayDto
>
displayDtoList
=
this
.
getPowerDisplayDtoList
(
newRuleRequestModelList
);
List
<
PowerDisplayDto
>
powerDisplayDtoList
=
groupData
(
displayDtoList
);
powerDisplayDtoList
.
forEach
(
v
->
{
v
.
setPowerTotal
(
String
.
valueOf
(
new
BigDecimal
(
v
.
getPowerTotal
())));
v
.
setElectricityTotal
(
String
.
valueOf
(
new
BigDecimal
(
v
.
getElectricityTotal
())));
});
getPowerSource
(
month
,
minId
,
powerDisplayDtoList
);
}
/**
* 东欢坨
*/
private
void
saveDHTPowerData
(
List
<
NewRuleRequestModel
>
newRuleRequestModelList
)
{
String
month
=
newRuleRequestModelList
.
get
(
0
).
getWageMonth
();
String
minId
=
newRuleRequestModelList
.
get
(
0
).
getMineid
();
ReplaceBlank
(
newRuleRequestModelList
);
List
<
PowerDisplayDto
>
displayDtoList
=
this
.
getPowerDisplayDtoList
(
newRuleRequestModelList
);
List
<
PowerSourceModel
>
powerSourceModelList
=
powerDisplayMapper
.
selectSource
(
minId
);
List
<
PowerDisplayDto
>
collect
=
displayDtoList
.
stream
().
filter
(
v
->
powerSourceModelList
.
stream
().
anyMatch
(
source
->
{
if
(!
StringUtils
.
contains
(
v
.
getClassificationName
(),
"开滦"
))
{
return
StringUtils
.
contains
(
v
.
getClassificationName
().
replaceAll
(
".*)"
,
StringUtils
.
EMPTY
),
source
.
getClassificationName
());
}
return
StringUtils
.
contains
(
v
.
getClassificationName
(),
source
.
getClassificationName
());
})).
collect
(
Collectors
.
toList
());
collect
.
forEach
(
v
->
{
if
(!
StringUtils
.
contains
(
v
.
getClassificationName
(),
"开滦"
))
{
v
.
setClassificationName
(
v
.
getClassificationName
().
replaceAll
(
".*\\)"
,
StringUtils
.
EMPTY
).
replaceAll
(
".*)"
,
StringUtils
.
EMPTY
).
replaceAll
(
"\\u3000"
,
StringUtils
.
EMPTY
));
}
else
{
v
.
setClassificationName
(
StringUtils
.
substringAfterLast
(
v
.
getClassificationName
(),
"."
));
}
v
.
setPowerTotal
(
new
BigDecimal
(
v
.
getPowerTotal
()).
toPlainString
());
v
.
setElectricityTotal
(
new
BigDecimal
(
v
.
getElectricityTotal
().
toLowerCase
()).
toPlainString
());
});
List
<
PowerDisplayDto
>
powerDisplayDtoList
=
groupData
(
collect
);
getPowerSource
(
month
,
minId
,
powerDisplayDtoList
);
}
/**
* 唐山矿
*
* @param newRuleRequestModelList
*/
private
void
saveTsPowerData
(
List
<
NewRuleRequestModel
>
newRuleRequestModelList
)
{
String
month
=
newRuleRequestModelList
.
get
(
0
).
getWageMonth
();
String
minId
=
newRuleRequestModelList
.
get
(
0
).
getMineid
();
ReplaceBlank
(
newRuleRequestModelList
);
List
<
PowerDisplayDto
>
displayDtoList
=
this
.
getPowerDisplayDtoList
(
newRuleRequestModelList
);
List
<
PowerDisplayDto
>
powerDisplayDtoList
=
groupData
(
displayDtoList
);
getPowerSource
(
month
,
minId
,
powerDisplayDtoList
);
}
/**
/**
* 范各庄
* 范各庄
*
*
...
@@ -304,12 +376,7 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -304,12 +376,7 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
ReplaceBlank
(
powerDisplayDtoList
);
ReplaceBlank
(
powerDisplayDtoList
);
List
<
PowerDisplayDto
>
displayDtoList
=
getPowerDisplayDtoList
(
powerDisplayDtoList
);
List
<
PowerDisplayDto
>
displayDtoList
=
getPowerDisplayDtoList
(
powerDisplayDtoList
);
disposeParamter
(
displayDtoList
);
disposeParamter
(
displayDtoList
);
Map
<
String
,
List
<
PowerDisplayDto
>>
map
=
displayDtoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
PowerDisplayDto:
:
getClassificationName
));
List
<
PowerDisplayDto
>
finalList
=
groupData
(
displayDtoList
);
List
<
PowerDisplayDto
>
finalList
=
new
ArrayList
<>();
map
.
forEach
((
k
,
v
)
->
{
PowerDisplayDto
pd
=
meagreData
(
v
);
finalList
.
add
(
pd
);
});
List
<
PowerDisplayDto
>
collect
=
finalList
.
stream
().
filter
(
v
->
!
StringUtils
.
contains
(
v
.
getClassificationName
(),
"合计"
)).
collect
(
Collectors
.
toList
());
List
<
PowerDisplayDto
>
collect
=
finalList
.
stream
().
filter
(
v
->
!
StringUtils
.
contains
(
v
.
getClassificationName
(),
"合计"
)).
collect
(
Collectors
.
toList
());
List
<
PowerSourceModel
>
powerSourceModelList
=
powerDisplayMapper
.
selectSource
(
"011702"
);
List
<
PowerSourceModel
>
powerSourceModelList
=
powerDisplayMapper
.
selectSource
(
"011702"
);
collect
=
collect
.
stream
().
filter
(
v
->
powerSourceModelList
.
stream
().
noneMatch
(
powerSourceModel
->
StringUtils
.
equals
(
v
.
getClassificationName
(),
powerSourceModel
.
getLevelOneClassification
()))).
collect
(
Collectors
.
toList
());
collect
=
collect
.
stream
().
filter
(
v
->
powerSourceModelList
.
stream
().
noneMatch
(
powerSourceModel
->
StringUtils
.
equals
(
v
.
getClassificationName
(),
powerSourceModel
.
getLevelOneClassification
()))).
collect
(
Collectors
.
toList
());
...
@@ -326,6 +393,27 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -326,6 +393,27 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
powerDisplayMapper
.
insert
(
collect
);
powerDisplayMapper
.
insert
(
collect
);
}
}
private
void
getPowerSource
(
String
month
,
String
minId
,
List
<
PowerDisplayDto
>
powerDisplayDtoList
)
{
List
<
PowerSourceModel
>
powerSourceModelList
=
powerDisplayMapper
.
selectSource
(
minId
);
powerDisplayDtoList
.
forEach
(
v
->
powerSourceModelList
.
forEach
(
source
->
{
if
(
StringUtils
.
equals
(
source
.
getClassificationName
(),
v
.
getClassificationName
()))
{
v
.
setLevelOneClassification
(
source
.
getLevelOneClassification
());
}
}));
powerDisplayMapper
.
deleteRepeat
(
month
,
minId
);
powerDisplayMapper
.
insert
(
powerDisplayDtoList
);
}
private
List
<
PowerDisplayDto
>
groupData
(
List
<
PowerDisplayDto
>
displayDtoList
)
{
Map
<
String
,
List
<
PowerDisplayDto
>>
collect
=
displayDtoList
.
stream
().
collect
(
Collectors
.
groupingBy
(
PowerDisplayDto:
:
getClassificationName
));
List
<
PowerDisplayDto
>
finalList
=
new
ArrayList
<>();
collect
.
forEach
((
k
,
v
)
->
{
PowerDisplayDto
pd
=
mergeData
(
v
);
finalList
.
add
(
pd
);
});
return
finalList
;
}
private
void
calculateEleFeeByDept
(
List
<
NewRuleRequestModel
>
sourceDataList
,
List
<
PowerDisplayDto
>
displayDtoList
,
List
<
PowerConvertSourceModel
>
sourceModelList
)
{
private
void
calculateEleFeeByDept
(
List
<
NewRuleRequestModel
>
sourceDataList
,
List
<
PowerDisplayDto
>
displayDtoList
,
List
<
PowerConvertSourceModel
>
sourceModelList
)
{
String
month
=
sourceDataList
.
get
(
0
).
getWageMonth
();
String
month
=
sourceDataList
.
get
(
0
).
getWageMonth
();
String
mindId
=
sourceDataList
.
get
(
0
).
getMineid
();
String
mindId
=
sourceDataList
.
get
(
0
).
getMineid
();
...
@@ -385,7 +473,7 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -385,7 +473,7 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
powerDisplayMapper
.
insert
(
displayDtoList
);
powerDisplayMapper
.
insert
(
displayDtoList
);
}
}
private
PowerDisplayDto
me
agr
eData
(
List
<
PowerDisplayDto
>
powerDisplayDtoList
)
{
private
PowerDisplayDto
me
rg
eData
(
List
<
PowerDisplayDto
>
powerDisplayDtoList
)
{
return
powerDisplayDtoList
.
stream
().
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toMap
(
data
->
data
.
getMindId
()
+
data
.
getClassificationName
()
+
data
.
getDateColumn
(),
data
->
data
,
(
existingData
,
newData
)
->
{
return
powerDisplayDtoList
.
stream
().
collect
(
Collectors
.
collectingAndThen
(
Collectors
.
toMap
(
data
->
data
.
getMindId
()
+
data
.
getClassificationName
()
+
data
.
getDateColumn
(),
data
->
data
,
(
existingData
,
newData
)
->
{
existingData
.
setPowerTotal
(
StringUtils
.
isEmpty
(
existingData
.
getPowerTotal
())
?
newData
.
getPowerTotal
()
:
existingData
.
getPowerTotal
());
existingData
.
setPowerTotal
(
StringUtils
.
isEmpty
(
existingData
.
getPowerTotal
())
?
newData
.
getPowerTotal
()
:
existingData
.
getPowerTotal
());
existingData
.
setPowerTip
(
StringUtils
.
isEmpty
(
existingData
.
getPowerTip
())
?
newData
.
getPowerTip
()
:
existingData
.
getPowerTip
());
existingData
.
setPowerTip
(
StringUtils
.
isEmpty
(
existingData
.
getPowerTip
())
?
newData
.
getPowerTip
()
:
existingData
.
getPowerTip
());
...
@@ -462,5 +550,4 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -462,5 +550,4 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
powerDisplayDto
.
setClassificationName
(
powerDisplayDto
.
getClassificationName
().
replaceAll
(
"[^\\u4e00-\\u9fa5]"
,
StringUtils
.
EMPTY
));
powerDisplayDto
.
setClassificationName
(
powerDisplayDto
.
getClassificationName
().
replaceAll
(
"[^\\u4e00-\\u9fa5]"
,
StringUtils
.
EMPTY
));
}
}
}
}
}
}
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