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
f158b86d
Commit
f158b86d
authored
Aug 09, 2024
by
Fuzy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正
parent
d9515735
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
17 deletions
+34
-17
ruoyi-wages/src/main/java/com/ruoyi/system/controller/RuleController.java
...main/java/com/ruoyi/system/controller/RuleController.java
+6
-0
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/RuleMapper.java
...ges/src/main/java/com/ruoyi/system/mapper/RuleMapper.java
+4
-2
ruoyi-wages/src/main/java/com/ruoyi/system/service/RuleService.java
...s/src/main/java/com/ruoyi/system/service/RuleService.java
+2
-0
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
...om/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
+3
-1
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/RuleServiceImpl.java
...n/java/com/ruoyi/system/service/impl/RuleServiceImpl.java
+12
-9
ruoyi-wages/src/main/resources/mapper/system/RuleMapper.xml
ruoyi-wages/src/main/resources/mapper/system/RuleMapper.xml
+7
-5
No files found.
ruoyi-wages/src/main/java/com/ruoyi/system/controller/RuleController.java
View file @
f158b86d
...
@@ -5,6 +5,7 @@ import com.ruoyi.system.model.rule.RuleRequestModel;
...
@@ -5,6 +5,7 @@ import com.ruoyi.system.model.rule.RuleRequestModel;
import
com.ruoyi.system.service.RuleService
;
import
com.ruoyi.system.service.RuleService
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
@RestController
@RestController
...
@@ -20,4 +21,9 @@ public class RuleController {
...
@@ -20,4 +21,9 @@ public class RuleController {
public
AjaxResult
save
(
@RequestBody
RuleRequestModel
ruleRequestModel
){
public
AjaxResult
save
(
@RequestBody
RuleRequestModel
ruleRequestModel
){
return
ruleService
.
save
(
ruleRequestModel
);
return
ruleService
.
save
(
ruleRequestModel
);
}
}
@PostMapping
(
"/rule/query"
)
public
AjaxResult
query
(
@RequestParam
(
"templateId"
)
String
ruleRequestModel
){
return
ruleService
.
query
(
ruleRequestModel
);
}
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/mapper/RuleMapper.java
View file @
f158b86d
package
com.ruoyi.system.mapper
;
package
com.ruoyi.system.mapper
;
import
com.alibaba.fastjson.JSON
;
import
com.ruoyi.system.model.rule.RuleModel
;
import
com.ruoyi.system.model.rule.RuleModel
;
import
com.ruoyi.system.model.rule.RuleRequestModel
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.List
;
public
interface
RuleMapper
{
public
interface
RuleMapper
{
void
save
(
@Param
(
"rule"
)
RuleRequestModel
ruleRequestModel
,
@Param
(
"json"
)
JSON
json
);
List
<
RuleModel
>
query
(
@Param
(
"id"
)
String
ruleRequestModel
);
void
save
(
@Param
(
"rules"
)
List
<
RuleModel
>
rules
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/RuleService.java
View file @
f158b86d
...
@@ -5,4 +5,6 @@ import com.ruoyi.system.model.rule.RuleRequestModel;
...
@@ -5,4 +5,6 @@ import com.ruoyi.system.model.rule.RuleRequestModel;
public
interface
RuleService
{
public
interface
RuleService
{
AjaxResult
save
(
RuleRequestModel
ruleRequestModel
);
AjaxResult
save
(
RuleRequestModel
ruleRequestModel
);
AjaxResult
query
(
String
ruleRequestModel
);
}
}
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerDisplayServiceImpl.java
View file @
f158b86d
...
@@ -8,6 +8,7 @@ import com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.LinXi;
...
@@ -8,6 +8,7 @@ import com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.LinXi;
import
com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.SaveOnTheLargeScreenImpl
;
import
com.ruoyi.system.service.impl.saveOnTheLargeScreenPower.SaveOnTheLargeScreenImpl
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -26,7 +27,8 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
...
@@ -26,7 +27,8 @@ public class PowerDisplayServiceImpl implements PowerDisplayService {
String
mindId
=
powerDisplayDtoList
.
get
(
0
).
getMindId
().
replaceAll
(
" "
,
""
);
String
mindId
=
powerDisplayDtoList
.
get
(
0
).
getMindId
().
replaceAll
(
" "
,
""
);
List
<
PowerClassificationQueryDao
>
dao
=
powerDisplayMapper
.
selectClassificationToMid
(
mindId
);
List
<
PowerClassificationQueryDao
>
dao
=
powerDisplayMapper
.
selectClassificationToMid
(
mindId
);
SaveOnTheLargeScreenImpl
saveOnTheLargeScreen
=
null
;
SaveOnTheLargeScreenImpl
saveOnTheLargeScreen
=
null
;
if
(
"011704"
.
equals
(
mindId
))
{
List
<
String
>
asList
=
Arrays
.
asList
(
"011704"
);
if
(
asList
.
contains
(
mindId
))
{
saveOnTheLargeScreen
=
new
SaveOnTheLargeScreenImpl
(
new
LinXi
());
saveOnTheLargeScreen
=
new
SaveOnTheLargeScreenImpl
(
new
LinXi
());
}
}
if
(
saveOnTheLargeScreen
!=
null
)
{
if
(
saveOnTheLargeScreen
!=
null
)
{
...
...
ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/RuleServiceImpl.java
View file @
f158b86d
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.system.mapper.RuleMapper
;
import
com.ruoyi.system.mapper.RuleMapper
;
import
com.ruoyi.system.model.rule.RuleModel
;
import
com.ruoyi.system.model.rule.RuleRequestModel
;
import
com.ruoyi.system.model.rule.RuleRequestModel
;
import
com.ruoyi.system.service.RuleService
;
import
com.ruoyi.system.service.RuleService
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Service
@Service
public
class
RuleServiceImpl
implements
RuleService
{
public
class
RuleServiceImpl
implements
RuleService
{
private
final
RuleMapper
ruleMapper
;
private
final
RuleMapper
ruleMapper
;
...
@@ -17,15 +21,14 @@ public class RuleServiceImpl implements RuleService {
...
@@ -17,15 +21,14 @@ public class RuleServiceImpl implements RuleService {
@Override
@Override
public
AjaxResult
save
(
RuleRequestModel
ruleRequestModel
)
{
public
AjaxResult
save
(
RuleRequestModel
ruleRequestModel
)
{
String
templateId
=
ruleRequestModel
.
getTemplateId
();
JSON
json
=
(
JSON
)
JSON
.
toJSON
(
ruleRequestModel
.
getRules
());
String
firstRule
=
ruleRequestModel
.
getFirstRule
();
ruleMapper
.
save
(
ruleRequestModel
,
json
);
String
secondRule
=
ruleRequestModel
.
getSecondRule
();
ruleRequestModel
.
getRules
().
forEach
(
rule
->{
rule
.
setFirstRule
(
firstRule
);
rule
.
setSecondRule
(
secondRule
);
rule
.
setTemplateId
(
templateId
);
});
ruleMapper
.
save
(
ruleRequestModel
.
getRules
());
return
AjaxResult
.
success
();
return
AjaxResult
.
success
();
}
}
@Override
public
AjaxResult
query
(
String
ruleRequestModel
)
{
List
<
RuleModel
>
rules
=
ruleMapper
.
query
(
ruleRequestModel
);
return
new
AjaxResult
(
200
,
"成功"
,
rules
);
}
}
}
ruoyi-wages/src/main/resources/mapper/system/RuleMapper.xml
View file @
f158b86d
...
@@ -4,11 +4,13 @@
...
@@ -4,11 +4,13 @@
<insert
id=
"save"
>
<insert
id=
"save"
>
INSERT INTO
INSERT INTO
rule_sheet(template_id,
name,old_sheet,old_start_row,old_end_row,old_start_column,old_end_column,new_sheet,new_start_row,new_end_row,new_start_column,new_end_column,first_rule,
second_rule)
rule_sheet(template_id,
rules, first_rule,
second_rule)
values
values
<foreach
collection=
"rules"
item=
"item"
index=
""
separator=
","
>
(#{rule.templateId}, #{json}, #{rule.firstRule}, #{rule.secondRule})
(#{item.templateId},#{item.name},#{item.oldSheet},#{item.oldStartRow},#{item.oldEndRow},#{item.oldStartColumn},
#{item.oldEndColumn},#{item.newSheet},#{item.newStartRow},#{item.newEndRow},#{item.newStartColumn},#{item.newEndColumn},#{item.firstRule},#{item.secondRule})
</foreach>
>
</insert>
</insert>
<select
id=
"query"
resultType=
"com.ruoyi.system.model.rule.RuleModel"
>
select *
from rule_sheet
where template_id = #{id};
</select>
</mapper>
</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