Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
1c31154b
Commit
1c31154b
authored
Dec 17, 2024
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工作台
parent
8bba9270
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
36 additions
and
21 deletions
+36
-21
TdHygfJpInverterWarnMapper.java
...e/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java
+2
-2
PeasantHouseholdMapper.xml
...rc/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
+1
-1
TdHygfJpInverterWarnMapper.xml
.../resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
+12
-0
PersonnelBusinessController.java
...dule/hygf/biz/controller/PersonnelBusinessController.java
+4
-1
TdHygfJpInverterWarnController.java
...e/hygf/biz/controller/TdHygfJpInverterWarnController.java
+4
-3
BasicGridAcceptanceServiceImpl.java
...hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
+4
-6
PersonnelBusinessServiceImpl.java
...e/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
+3
-2
PreparationMoneyServiceImpl.java
...le/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
+1
-1
TdHygfJpInverterWarnServiceImpl.java
...ygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
+4
-4
hygfRouth.json
...ot-module-hygf-biz/src/main/resources/json/hygfRouth.json
+1
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java
View file @
1c31154b
...
...
@@ -33,10 +33,10 @@ public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterW
@UserEmpower
(
field
=
{
"regional_companies_code"
},
dealerField
=
{
"amos_company_code"
,
"regional_companies_code"
},
fieldConditions
=
{
"eq"
,
"in"
},
relationship
=
"and"
)
List
<
TdHygfJpInverterWarnDto
>
selectWarnList
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
Integer
current
,
Integer
size
,
String
handlerStatus
,
String
stationName
);
List
<
TdHygfJpInverterWarnDto
>
selectWarnList
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
Integer
current
,
Integer
size
,
String
handlerStatus
,
String
stationName
,
String
isDeal
);
@UserEmpower
(
field
=
{
"regional_companies_code"
},
dealerField
=
{
"amos_company_code"
,
"regional_companies_code"
},
fieldConditions
=
{
"eq"
,
"in"
},
relationship
=
"and"
)
int
selectWarnListTotal
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
String
handlerStatus
,
String
stationName
);
int
selectWarnListTotal
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
String
handlerStatus
,
String
stationName
,
String
isDeal
);
@UserEmpower
(
field
=
{
"regional_companies_code"
},
dealerField
=
{
"amos_company_code"
,
"regional_companies_code"
},
fieldConditions
=
{
"eq"
,
"in"
},
relationship
=
"and"
)
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @
1c31154b
...
...
@@ -105,7 +105,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
</select>
<select
id=
"selectReview"
resultType=
"com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold"
>
select review, amos_user_id from hygf_peasant_household where sequence_nbr = #{sequenceNbr}
select
sequence_nbr,
review, amos_user_id from hygf_peasant_household where sequence_nbr = #{sequenceNbr}
</select>
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @
1c31154b
...
...
@@ -71,6 +71,12 @@
handler_status as handlerStatus
FROM house_pv_data.td_hygf_jp_inverter_warn
<where>
<if
test=
"isDeal == '已处理'"
>
AND `state` in ('已恢复','已处理','已关闭')
</if>
<if
test=
"isDeal == '未处理'"
>
AND `state` in ('未处理','未确认')
</if>
<if
test=
"state != null and state.size>0"
>
AND `state` in
<foreach
collection=
"state"
item=
"item"
open=
'('
close=
')'
separator=
","
>
...
...
@@ -148,6 +154,12 @@
count (1)
FROM house_pv_data.td_hygf_jp_inverter_warn
<where>
<if
test=
"isDeal == '已处理'"
>
AND `state` in ('已恢复','已处理','已关闭')
</if>
<if
test=
"isDeal == '未处理'"
>
AND `state` in ('未处理','未确认')
</if>
<if
test=
"state != null and state.size>0"
>
AND `state` in
<foreach
collection=
"state"
item=
"item"
open=
'('
close=
')'
separator=
","
>
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java
View file @
1c31154b
...
...
@@ -30,6 +30,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -247,7 +248,9 @@ public class PersonnelBusinessController extends BaseController {
LambdaQueryWrapper
<
PersonnelBusiness
>
qug
=
new
LambdaQueryWrapper
<>();
qug
.
eq
(
PersonnelBusiness:
:
getFoundationId
,
publicAgencyUser
.
getSequenceNbr
());
PersonnelBusiness
personnelBusines
=
personnelBusinessMapper
.
selectOne
(
qug
);
UserMessage
userMessage
=
new
UserMessage
(
TaskTypeStationEnum
.
重置密码
.
getCode
(),
publicAgencyUser
.
getSequenceNbr
()
,
publicAgencyUser
.
getAmosUserId
(),
new
Date
(),
"您的密码已重置成功,密码为:Z2%Op9.q 请尽快修改密码。"
,
personnelBusines
.
getAmosUnitOrgCode
());
List
<
String
>
userIds
=
new
ArrayList
<>();
userIds
.
add
(
publicAgencyUser
.
getAmosUserId
());
UserMessage
userMessage
=
new
UserMessage
(
TaskTypeStationEnum
.
重置密码
.
getCode
(),
publicAgencyUser
.
getSequenceNbr
()
,
userIds
.
toString
()
,
new
Date
(),
"您的密码已重置成功,密码为:Z2%Op9.q 请尽快修改密码。"
,
personnelBusines
.
getAmosUnitOrgCode
());
if
(
data
==
null
||
data
.
getResult
()==
null
){
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @
1c31154b
...
...
@@ -244,7 +244,8 @@ public class TdHygfJpInverterWarnController extends BaseController {
@RequestParam
(
required
=
false
)
String
[]
time
,
@RequestParam
(
required
=
false
)
Integer
current
,
@RequestParam
(
required
=
false
)
Integer
size
,
@RequestParam
(
required
=
false
)
String
content
)
{
@RequestParam
(
required
=
false
)
String
content
,
@RequestParam
(
required
=
false
)
String
isDeal
)
{
Page
<
TdHygfJpInverterWarnDto
>
result
=
new
Page
<>();
result
.
setCurrent
(
current
);
...
...
@@ -290,7 +291,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
}
List
<
TdHygfJpInverterWarnDto
>
maps
=
tdHygfJpInverterWarnServiceImpl
.
selectWarnList
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
current
,
size
,
handlerStatus
,
stationName
);
List
<
TdHygfJpInverterWarnDto
>
maps
=
tdHygfJpInverterWarnServiceImpl
.
selectWarnList
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
current
,
size
,
handlerStatus
,
stationName
,
isDeal
);
for
(
TdHygfJpInverterWarnDto
map
:
maps
)
{
// if (nameMaps.containsKey(map.getThirdStationId())) {
// map.setStationName(nameMaps.get(map.getThirdStationId()));
...
...
@@ -299,7 +300,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
map
.
setTimeLongFormat
(
te
);
}
result
.
setTotal
(
tdHygfJpInverterWarnServiceImpl
.
selectWarnListTotal
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
,
stationName
));
result
.
setTotal
(
tdHygfJpInverterWarnServiceImpl
.
selectWarnListTotal
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
,
stationName
,
isDeal
));
List
<
Long
>
waringIds
=
maps
.
stream
().
map
(
tdHygfJpInverterWarnDto
->
tdHygfJpInverterWarnDto
.
getCreatedTime
()).
collect
(
Collectors
.
toList
());
if
(
waringIds
.
size
()
==
0
)
{
waringIds
=
Arrays
.
asList
(
0L
);
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @
1c31154b
...
...
@@ -258,7 +258,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
String
taskName
=
"您有一条并网的待办"
;
String
orgCode
=
""
;
if
(
Objects
.
nonNull
(
peasantHousehold
)){
taskName
=
peasantHousehold
.
getOwnersName
()
+
"待经销商管理审核"
;
taskName
=
peasantHousehold
.
getOwnersName
()
+
"待经销商管理
员
审核"
;
orgCode
=
peasantHousehold
.
getRegionalCompaniesCode
();
}
RouthPathVO
routhPathVO
=
new
RouthPathVO
();
...
...
@@ -536,15 +536,13 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
basicGridAuditingDto
.
setInstanceId
(
basicGridAuditing
.
getInstanceId
());
}
basicGridAuditingService
.
createWithModel
(
basicGridAuditingDto
);
if
(
BusinessWorkflowKey
.
设计审核
.
getCode
().
equals
(
taskKey
)){
if
(
BusinessWorkflowKey
.
设计审核
.
getCode
().
equals
(
taskKey
)
||
BusinessWorkflowKey
.
工程审核
.
getCode
().
equals
(
taskKey
)
){
//完成设计
ToDoTasks
toDoTasks1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
并网
.
getCode
(),
HygfRouthTypeEnum
.
HYGF_BWSJSH
.
getBusiness
());
toDoTasksService
.
completeToDoTasks
(
toDoTasks1
,
""
);
}
if
(
BusinessWorkflowKey
.
工程审核
.
getCode
().
equals
(
taskKey
)){
//完成工程
ToDoTasks
toDoTasks
1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
并网
.
getCode
(),
HygfRouthTypeEnum
.
HYGF_BWGCSH
.
getBusiness
());
toDoTasksService
.
completeToDoTasks
(
toDoTasks
1
,
""
);
ToDoTasks
toDoTasks
2
=
new
ToDoTasks
(
TaskTypeStationEnum
.
并网
.
getCode
(),
HygfRouthTypeEnum
.
HYGF_BWGCSH
.
getBusiness
());
toDoTasksService
.
completeToDoTasks
(
toDoTasks
2
,
""
);
}
RouthPathVO
routhPathVO
=
new
RouthPathVO
();
routhPathVO
.
setRouthPathId
(
String
.
valueOf
(
basicGridAuditing
.
getPeasantHouseholdId
()));
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @
1c31154b
...
...
@@ -467,8 +467,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userEmpowerMapper
.
insert
(
stdUserEmpower1
);
}
UserMessage
userMessage
=
new
UserMessage
(
TaskTypeStationEnum
.
设置管理员
.
getCode
(),
personnelBusines
.
getSequenceNbr
(),
publicAgencyUse
.
getAmosUserId
(),
new
Date
(),
"您已成为单位管理员。"
,
personnelBusines
.
getAmosUnitOrgCode
());
List
<
String
>
userIds
=
new
ArrayList
<>();
userIds
.
add
(
publicAgencyUse
.
getAmosUserId
());
UserMessage
userMessage
=
new
UserMessage
(
TaskTypeStationEnum
.
设置管理员
.
getCode
(),
personnelBusines
.
getSequenceNbr
(),
userIds
.
toString
(),
new
Date
(),
"您已成为单位管理员。"
,
personnelBusines
.
getAmosUnitOrgCode
());
userMessageMapper
.
insert
(
userMessage
);
emqKeeper
.
getMqttClient
().
publish
(
"MY_MESSAGE"
,
JSON
.
toJSONString
(
userMessage
).
getBytes
(),
2
,
false
);
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @
1c31154b
...
...
@@ -793,7 +793,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
String
wxRouthPath
=
toDoTasksServiceImpl
.
getWxRouthPath
(
TaskTypeStationEnum
.
发货
.
getCode
(),
workflowResultDto
.
getNextNodeKey
(),
routhPathVO
);
ToDoTasks
toDoTasks
=
new
ToDoTasks
(
TaskTypeStationEnum
.
发货
.
getCode
(),
model
.
getSequenceNbr
(),
taskName
+
"待确认收货单"
,
model
.
getRegionalCompaniesCode
(),
routhPath
,
wxRouthPath
);
List
<
String
>
userIds
=
Arrays
.
asList
(
Optional
.
ofNullable
(
workflowResultDto
.
getNextExecuteUserIds
()).
orElse
(
""
).
split
(
","
));
List
<
String
>
filterUsers
=
toDoTasksServiceImpl
.
filterUsers
(
TaskTypeStationEnum
.
发货
.
getCode
(),
workflowResultDto
.
getNextNodeKey
(),
userIds
,
model
.
getRegionalCompaniesCode
(),
model
.
getAmosUnitOrgCode
());
List
<
String
>
filterUsers
=
toDoTasksServiceImpl
.
filterUsers
(
TaskTypeStationEnum
.
发货
.
getCode
(),
workflowResultDto
.
getNextNodeKey
(),
userIds
,
model
.
getRegionalCompaniesCode
(),
model
.
getAmosUnitOrgCode
());
toDoTasksServiceImpl
.
addToDoTasksByUserIds
(
filterUsers
,
toDoTasks
);
}
else
{
up
.
set
(
PeasantHousehold:
:
getPreparationMoneyState
,
DeliveryStateeEnum
.
暂存发货
.
getCode
());
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
View file @
1c31154b
...
...
@@ -172,8 +172,8 @@ public class TdHygfJpInverterWarnServiceImpl
return
tdHygfJpInverterWarnDto
;
}
public
List
<
TdHygfJpInverterWarnDto
>
selectWarnList
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
Integer
current
,
Integer
size
,
String
handlerStatus
,
String
stationName
)
{
List
<
TdHygfJpInverterWarnDto
>
list
=
tdHygfJpInverterWarnMapper
.
selectWarnList
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
(
current
-
1
)
*
size
,
size
,
handlerStatus
,
stationName
);
public
List
<
TdHygfJpInverterWarnDto
>
selectWarnList
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
Integer
current
,
Integer
size
,
String
handlerStatus
,
String
stationName
,
String
isDeal
)
{
List
<
TdHygfJpInverterWarnDto
>
list
=
tdHygfJpInverterWarnMapper
.
selectWarnList
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
(
current
-
1
)
*
size
,
size
,
handlerStatus
,
stationName
,
isDeal
);
list
.
forEach
(
i
->
{
JpStation
jpStation
=
jpStationServiceImpl
.
getOne
(
new
LambdaQueryWrapper
<
JpStation
>()
.
eq
(
JpStation:
:
getThirdStationId
,
i
.
getThirdStationId
()));
...
...
@@ -186,8 +186,8 @@ public class TdHygfJpInverterWarnServiceImpl
return
list
;
}
public
int
selectWarnListTotal
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
String
handlerStatus
,
String
stationName
)
{
return
tdHygfJpInverterWarnMapper
.
selectWarnListTotal
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
,
stationName
);
public
int
selectWarnListTotal
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
String
amosCompanyCode
,
String
thirdStationId
,
String
type
,
String
level
,
String
minvalue
,
String
maxValue
,
String
snCode
,
List
<
String
>
stationId
,
String
startTime
,
String
endTime
,
String
content
,
String
handlerStatus
,
String
stationName
,
String
isDeal
)
{
return
tdHygfJpInverterWarnMapper
.
selectWarnListTotal
(
state
,
regionalCompaniesCode
,
amosCompanyCode
,
thirdStationId
,
type
,
level
,
minvalue
,
maxValue
,
snCode
,
stationId
,
startTime
,
endTime
,
content
,
handlerStatus
,
stationName
,
isDeal
);
}
public
int
selectWarnTotal
(
List
<
String
>
state
,
String
regionalCompaniesCode
,
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json
View file @
1c31154b
...
...
@@ -307,7 +307,7 @@
"key"
:
"WaitAbarbeitung"
,
"taskType"
:
"投融资"
,
"name"
:
"经销商重新提交验收/退回建档"
,
"url"
:
"/mixuap?appId=1677158789557547009&id=1
776873272973987842
"
,
"url"
:
"/mixuap?appId=1677158789557547009&id=1
828973864328105986
"
,
"isNeedSpecialDeal"
:
"0"
,
"isAdminRole"
:
"0"
},
...
...
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