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
cbbcdb80
Commit
cbbcdb80
authored
Oct 29, 2024
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
初始化统计时间
parent
038b4af8
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
332 additions
and
22 deletions
+332
-22
AcceptanceCheckMapper.java
...os/boot/module/hygf/api/mapper/AcceptanceCheckMapper.java
+4
-0
BasicGridRecordMapper.java
...os/boot/module/hygf/api/mapper/BasicGridRecordMapper.java
+6
-0
HouseholdContractMapper.java
.../boot/module/hygf/api/mapper/HouseholdContractMapper.java
+2
-0
PowerStationMapper.java
.../amos/boot/module/hygf/api/mapper/PowerStationMapper.java
+9
-1
WorkOrderPowerStationMapper.java
...t/module/hygf/api/mapper/WorkOrderPowerStationMapper.java
+4
-0
AcceptanceCheckMapper.xml
...src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml
+19
-0
BasicGridRecordMapper.xml
...src/main/resources/mapper/mysql/BasicGridRecordMapper.xml
+22
-0
HouseholdContractMapper.xml
...c/main/resources/mapper/mysql/HouseholdContractMapper.xml
+6
-0
PeasantHouseholdMapper.xml
...rc/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
+1
-0
PowerStationMapper.xml
...pi/src/main/resources/mapper/mysql/PowerStationMapper.xml
+48
-0
WorkOrderPowerStationMapper.xml
...in/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
+10
-0
TestController.java
.../amos/boot/module/hygf/biz/controller/TestController.java
+158
-17
PowerStationStatisticsServiceImpl.java
...f/biz/service/impl/PowerStationStatisticsServiceImpl.java
+4
-2
QiyuesuoServiceImpl.java
...oot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java
+37
-0
application.properties
...iop-analyse-biz/src/main/resources/application.properties
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceCheckMapper.java
View file @
cbbcdb80
...
...
@@ -18,4 +18,8 @@ import java.util.Map;
public
interface
AcceptanceCheckMapper
extends
BaseMapper
<
AcceptanceCheck
>
{
@UserEmpower
(
field
={
"hph.regional_companies_code"
}
,
dealerField
={
"hph.developer_code"
,
"hph.regional_companies_code"
,
"hph.developer_user_id"
},
fieldConditions
={
"in"
,
"in"
,
"in"
}
,
relationship
=
"and"
)
List
<
AcceptanceCheckDto
>
selectPageList
(
@Param
(
"map"
)
Map
<
String
,
Object
>
map
);
List
<
Map
<
String
,
Object
>>
getYsCreateTime
();
List
<
Map
<
String
,
Object
>>
getYsEndTime
();
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridRecordMapper.java
View file @
cbbcdb80
...
...
@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
import
com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridRecord
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
java.util.List
;
import
java.util.Map
;
/**
* 并网验收节点 Mapper 接口
*
...
...
@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public
interface
BasicGridRecordMapper
extends
BaseMapper
<
BasicGridRecord
>
{
List
<
Map
<
String
,
Object
>>
getBwCreateTime
();
List
<
Map
<
String
,
Object
>>
getBwEndTime
();
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HouseholdContractMapper.java
View file @
cbbcdb80
...
...
@@ -26,4 +26,6 @@ public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
String
getHygfCommercialScale
(
String
peasantHouseholdNumber
);
List
<
Map
<
String
,
String
>>
getHygfCommercialScaleList
(
@Param
(
"list"
)
List
<
String
>
peasantHouseholdNumberList
);
List
<
Map
<
String
,
Object
>>
getDzhtqyEndTime
();
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java
View file @
cbbcdb80
...
...
@@ -2,12 +2,12 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower
;
import
com.yeejoin.amos.boot.module.hygf.api.config.UserLimits
;
import
com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* Mapper 接口
...
...
@@ -24,4 +24,12 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
@Param
(
"province"
)
String
province
);
String
getInstanceIdByhouseId
(
String
peasantHouseholdId
);
List
<
Map
<
String
,
Object
>>
getKcCreateTime
();
List
<
Map
<
String
,
Object
>>
getKcEndTime
();
List
<
Map
<
String
,
Object
>>
getSjCreateTime
();
List
<
Map
<
String
,
Object
>>
getSjEndTime
();
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderPowerStationMapper.java
View file @
cbbcdb80
...
...
@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrderPowerStation;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* 施工派工单电站 Mapper 接口
...
...
@@ -17,4 +18,7 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt
List
<
PeasantHousehold
>
selectPeasantHousehold
(
@Param
(
"sequenceNbr"
)
Long
sequenceNbr
,
@Param
(
"ownersName"
)
String
ownersName
);
List
<
Map
<
String
,
Object
>>
getSgCreateTime
();
List
<
Map
<
String
,
Object
>>
getSgEndTime
();
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml
View file @
cbbcdb80
...
...
@@ -83,4 +83,23 @@
</where>
ORDER BY hbga.sequence_nbr desc
</select>
<select
id=
"getYsEndTime"
resultType=
"java.util.Map"
>
SELECT SEQUENCE_NBR as sequenceNbr,rec_date AS time
FROM hygf_acceptance_check
WHERE acceptance_check_status='3'
</select>
<select
id=
"getYsCreateTime"
resultType=
"java.util.Map"
>
SELECT
PROC_INST_ID_ AS processInstanceId,
MIN( START_TIME_ ) AS time
FROM
act_hi_taskinst aht
WHERE
EXISTS ( SELECT 1 FROM hygf_acceptance_check hac WHERE hac.instance_Id = aht.PROC_INST_ID_ and aht.NAME_='验收提交' )
GROUP BY
PROC_INST_ID_
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridRecordMapper.xml
View file @
cbbcdb80
...
...
@@ -2,4 +2,26 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridRecordMapper"
>
<select
id=
"getBwEndTime"
resultType=
"java.util.Map"
>
SELECT SEQUENCE_NBR AS sequenceNbr,rec_date as time
FROM hygf_basic_grid_record
WHERE grid_status='3'
</select>
<select
id=
"getBwCreateTime"
resultType=
"java.util.Map"
>
SELECT haga.peasant_household_id as peasantHouseholdId, a.time
FROM hygf_basic_grid_acceptance haga
LEFT JOIN (
SELECT
PROC_INST_ID_ AS processInstanceId,
MIN( START_TIME_ ) AS time
FROM
act_hi_taskinst aht
WHERE
EXISTS ( SELECT 1 FROM hygf_basic_grid_acceptance hbga WHERE hbga.instance_id = aht.PROC_INST_ID_ and aht.NAME_='并网登记提交' )
GROUP BY
PROC_INST_ID_
)a ON a.processInstanceId=haga.instance_id
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml
View file @
cbbcdb80
...
...
@@ -71,4 +71,10 @@
#{peasantHouseholdNumber}
</foreach>
</select>
<select
id=
"getDzhtqyEndTime"
resultType=
"java.util.Map"
>
SELECT sequence_nbr as sequenceNbr ,rec_date as time
FROM hygf_household_contract
WHERE status='双方已签署'
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @
cbbcdb80
...
...
@@ -288,6 +288,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
FROM
hygf_household_contract
<where>
status!='已作废'
<if
test=
"list != null and list.size()>0"
>
AND peasant_household_id IN
<foreach
collection=
"list"
item=
"item"
index=
"index"
open=
"("
close=
")"
separator=
","
>
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @
cbbcdb80
...
...
@@ -42,4 +42,52 @@
<select
id=
"getInstanceIdByhouseId"
resultType=
"java.lang.String"
>
select process_instance_id From hygf_power_station where peasant_household_id = #{peasantHouseholdId}
</select>
<select
id=
"getKcCreateTime"
resultType=
"java.util.Map"
>
SELECT
PROC_INST_ID_ AS processInstanceId,
MIN( TIME_ ) AS time
FROM
act_hi_detail ahd
WHERE
EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = ahd.PROC_INST_ID_ )
GROUP BY
PROC_INST_ID_
</select>
<select
id=
"getKcEndTime"
resultType=
"java.util.Map"
>
SELECT
PROC_INST_ID_ AS processInstanceId,
MAX( END_TIME_ ) AS time
FROM
act_hi_taskinst aht
WHERE
EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_ and hps.business_status='通过' and aht.NAME_='法务审核' )
GROUP BY
PROC_INST_ID_
</select>
<select
id=
"getSjCreateTime"
resultType=
"java.util.Map"
>
SELECT
PROC_INST_ID_ AS processInstanceId,
MIN( START_TIME_ ) AS time
FROM
act_hi_taskinst aht
WHERE
EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_ and aht.NAME_='设计上传典型图库' )
GROUP BY
PROC_INST_ID_
</select>
<select
id=
"getSjEndTime"
resultType=
"java.util.Map"
>
SELECT
PROC_INST_ID_ AS processInstanceId,
MAX( END_TIME_ ) AS time
FROM
act_hi_taskinst aht
WHERE
EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_ and hps.process_status='完成' and aht.NAME_='设计图纸审核' )
GROUP BY
PROC_INST_ID_
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @
cbbcdb80
...
...
@@ -18,6 +18,16 @@
</select>
<select
id=
"getSgCreateTime"
resultType=
"java.util.Map"
>
SELECT SEQUENCE_NBR AS workOrderId,planned_start_date as time
FROM hygf_work_order
</select>
<select
id=
"getSgEndTime"
resultType=
"java.util.Map"
>
SELECT SEQUENCE_NBR AS sequenceNbr,rec_date as time
FROM hygf_work_order_power_station
WHERE power_station_construction_status='已完工'
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TestController.java
View file @
cbbcdb80
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
biz
.
controller
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.qiyuesuo.sdk.v2.bean.Contract
;
import
com.yeejoin.amos.boot.biz.common.utils.DateUtils
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.*
;
import
com.yeejoin.amos.boot.module.hygf.api.mapper.*
;
import
com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -11,13 +21,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import
org.typroject.tyboot.core.restful.utils.ResponseModel
;
import
com.yeejoin.amos.boot.biz.common.controller.BaseController
;
import
com.yeejoin.amos.boot.biz.common.utils.RedisUtils
;
import
com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo
;
import
com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper
;
import
com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper
;
import
com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil
;
import
com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl
;
import
com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl
;
import
com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser
;
import
com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
...
...
@@ -37,26 +41,163 @@ import io.swagger.annotations.ApiOperation;
@RestController
@Api
(
tags
=
"农户信息Api"
)
@RequestMapping
(
value
=
"/test"
)
@Slf4j
public
class
TestController
extends
BaseController
{
@Autowired
SurveyInformationServiceImpl
surveyInformationServiceImpl
;
@Autowired
PeasantHouseholdServiceImpl
peasantHouseholdServiceImpl
;
@Autowired
RedisUtils
redisUtils
;
private
static
final
String
regionRedis
=
"app_region_redis"
;
@Autowired
PersonnelBusinessMapper
personnelBusinessMapper
;
@Autowired
UnitInfoMapper
unitInfoMapper
;
@Autowired
PublicAgencyUserMapper
publicAgencyUserMapper
;
@Autowired
PowerStationMapper
powerStationMapper
;
@Autowired
QiyuesuoServiceImpl
qiyuesuoService
;
@Autowired
HouseholdContractMapper
householdContractMapper
;
@Autowired
WorkOrderPowerStationMapper
workOrderPowerStationMapper
;
@Autowired
BasicGridRecordMapper
basicGridRecordMapper
;
@Autowired
AcceptanceCheckMapper
acceptanceCheckMapper
;
private
ExecutorService
executorService
;
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
,
needAuth
=
false
)
@GetMapping
(
value
=
"/initTime"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"初始时间"
,
notes
=
"初始时间"
)
public
ResponseModel
<
Object
>
initTime
()
{
// 创建线程池
executorService
=
Executors
.
newFixedThreadPool
(
5
);
// 提交不同的方法
// executorService.submit(this::dealKcTime);
executorService
.
submit
(
this
::
dealDzhtqyTime
);
// executorService.submit(this::dealSgTime);
// executorService.submit(this::dealBwTime);
// executorService.submit(this::dealYsTime);
// 关闭线程池
executorService
.
shutdown
();
return
CommonResponseNewUtil
.
success
();
}
private
void
dealYsTime
()
{
log
.
info
(
"================开始初始验收时间========================="
);
List
<
Map
<
String
,
Object
>>
ysCreateTime
=
acceptanceCheckMapper
.
getYsCreateTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
ysCreateTime
)
{
LambdaUpdateWrapper
<
AcceptanceCheck
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
AcceptanceCheck:
:
getYsCreateTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
AcceptanceCheck:
:
getInstanceId
,
stringObjectMap
.
get
(
"processInstanceId"
));
acceptanceCheckMapper
.
update
(
null
,
wrapper
);
}
List
<
Map
<
String
,
Object
>>
ysEndTime
=
acceptanceCheckMapper
.
getYsEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
ysEndTime
)
{
LambdaUpdateWrapper
<
AcceptanceCheck
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
AcceptanceCheck:
:
getYsEndTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
AcceptanceCheck:
:
getSequenceNbr
,
stringObjectMap
.
get
(
"sequenceNbr"
));
acceptanceCheckMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================验收时间更新完成========================="
);
}
private
void
dealBwTime
()
{
log
.
info
(
"================开始初始并网时间========================="
);
List
<
Map
<
String
,
Object
>>
bwCreateTime
=
basicGridRecordMapper
.
getBwCreateTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
bwCreateTime
)
{
LambdaUpdateWrapper
<
BasicGridRecord
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
BasicGridRecord:
:
getBwCreateTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
BasicGridRecord:
:
getPeasantHouseholdId
,
stringObjectMap
.
get
(
"peasantHouseholdId"
));
basicGridRecordMapper
.
update
(
null
,
wrapper
);
}
List
<
Map
<
String
,
Object
>>
bwEndTime
=
basicGridRecordMapper
.
getBwEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
bwEndTime
)
{
LambdaUpdateWrapper
<
BasicGridRecord
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
BasicGridRecord:
:
getBwEndTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
BasicGridRecord:
:
getSequenceNbr
,
stringObjectMap
.
get
(
"sequenceNbr"
));
basicGridRecordMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================并网时间更新完成========================="
);
}
private
void
dealSgTime
()
{
log
.
info
(
"================开始初始施工时间========================="
);
List
<
Map
<
String
,
Object
>>
sgCreateTime
=
workOrderPowerStationMapper
.
getSgCreateTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
sgCreateTime
)
{
LambdaUpdateWrapper
<
WorkOrderPowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
WorkOrderPowerStation:
:
getSgCreateTime
,
DateUtils
.
dateParse
(
String
.
valueOf
(
stringObjectMap
.
get
(
"time"
))))
.
eq
(
WorkOrderPowerStation:
:
getWorkOrderId
,
stringObjectMap
.
get
(
"workOrderId"
));
workOrderPowerStationMapper
.
update
(
null
,
wrapper
);
}
List
<
Map
<
String
,
Object
>>
sgEndTime
=
workOrderPowerStationMapper
.
getSgEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
sgEndTime
)
{
LambdaUpdateWrapper
<
WorkOrderPowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
WorkOrderPowerStation:
:
getSgEndTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
WorkOrderPowerStation:
:
getSequenceNbr
,
stringObjectMap
.
get
(
"sequenceNbr"
));
workOrderPowerStationMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================施工时间更新完成========================="
);
}
private
void
dealSjTime
()
{
log
.
info
(
"================开始初始设计时间========================="
);
List
<
Map
<
String
,
Object
>>
sjCreateTime
=
powerStationMapper
.
getSjCreateTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
sjCreateTime
)
{
LambdaUpdateWrapper
<
PowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
PowerStation:
:
getSjCreateTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
PowerStation:
:
getProcessInstanceId
,
stringObjectMap
.
get
(
"processInstanceId"
));
powerStationMapper
.
update
(
null
,
wrapper
);
}
List
<
Map
<
String
,
Object
>>
sjEndTime
=
powerStationMapper
.
getSjEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
sjEndTime
)
{
LambdaUpdateWrapper
<
PowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
PowerStation:
:
getSjEndTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
PowerStation:
:
getProcessInstanceId
,
stringObjectMap
.
get
(
"processInstanceId"
));
powerStationMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================设计时间更新完成========================="
);
}
private
void
dealDzhtqyTime
()
{
log
.
info
(
"================开始初始电子合同时间========================="
);
// Map<Long, Contract> contractMap = qiyuesuoService.getContractMap();
// contractMap.forEach((k,v)->{
// LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
// wrapper.set(HouseholdContract::getDzhtqyCreateTime, DateUtils.dateParse(v.getPublishTime()))
// .eq(HouseholdContract::getContractLockId,k);
// householdContractMapper.update(null,wrapper);
// });
List
<
Map
<
String
,
Object
>>
dzhtqyEndTime
=
householdContractMapper
.
getDzhtqyEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
dzhtqyEndTime
)
{
LambdaUpdateWrapper
<
HouseholdContract
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
HouseholdContract:
:
getSigningTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
HouseholdContract:
:
getSequenceNbr
,
stringObjectMap
.
get
(
"sequenceNbr"
));
householdContractMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================电子合同时间更新完成========================="
);
}
private
void
dealKcTime
()
{
log
.
info
(
"================开始初始勘察时间========================="
);
List
<
Map
<
String
,
Object
>>
kcCreateTime
=
powerStationMapper
.
getKcCreateTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
kcCreateTime
)
{
LambdaUpdateWrapper
<
PowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
PowerStation:
:
getKcCreateTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
PowerStation:
:
getProcessInstanceId
,
stringObjectMap
.
get
(
"processInstanceId"
));
powerStationMapper
.
update
(
null
,
wrapper
);
}
List
<
Map
<
String
,
Object
>>
kcEndTime
=
powerStationMapper
.
getKcEndTime
();
for
(
Map
<
String
,
Object
>
stringObjectMap
:
kcEndTime
)
{
LambdaUpdateWrapper
<
PowerStation
>
wrapper
=
new
LambdaUpdateWrapper
<>();
wrapper
.
set
(
PowerStation:
:
getKcEndTime
,
stringObjectMap
.
get
(
"time"
))
.
eq
(
PowerStation:
:
getProcessInstanceId
,
stringObjectMap
.
get
(
"processInstanceId"
));
powerStationMapper
.
update
(
null
,
wrapper
);
}
log
.
info
(
"================勘察时间更新完成========================="
);
dealSjTime
();
}
/**
* 新增农户信息
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationStatisticsServiceImpl.java
View file @
cbbcdb80
...
...
@@ -172,10 +172,12 @@ public class PowerStationStatisticsServiceImpl {
// 将毫秒差转换为小时、分钟和秒
long
diffInSeconds
=
diffInMillis
/
1000
;
long
hours
=
diffInSeconds
/
3600
;
// 计算天、小时、分钟和秒
long
days
=
diffInSeconds
/
86400
;
// 1天 = 86400秒
long
hours
=
(
diffInSeconds
%
86400
)
/
3600
;
long
minutes
=
(
diffInSeconds
%
3600
)
/
60
;
long
seconds
=
diffInSeconds
%
60
;
return
hours
+
"小时"
+
minutes
+
"分"
+
seconds
+
"秒"
;
return
days
+
"天"
+
hours
+
"小时"
+
minutes
+
"分"
+
seconds
+
"秒"
;
}
return
null
;
}
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java
View file @
cbbcdb80
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
biz
.
service
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.qiyuesuo.sdk.v2.SdkClient
;
import
com.qiyuesuo.sdk.v2.bean.*
;
import
com.qiyuesuo.sdk.v2.bean.vo.DocumentUrlVO
;
...
...
@@ -14,10 +16,15 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.ObjectUtils
;
import
org.typroject.tyboot.core.restful.exception.instance.BadRequest
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
/**
* @description:
...
...
@@ -334,4 +341,34 @@ public class QiyuesuoServiceImpl {
return
url
;
}
public
Map
<
Long
,
Contract
>
getContractMap
(){
List
<
Contract
>
list
=
new
ArrayList
<>();
Integer
pageNo
=
0
;
try
{
do
{
SdkClient
sdkClient
=
new
SdkClient
(
serverUrl
,
accessKey
,
accessSecret
);
ContractListRequest
contractListRequest
=
new
ContractListRequest
();
contractListRequest
.
setSelectOffset
(
pageNo
*
1000
);
String
response
=
sdkClient
.
service
(
contractListRequest
);
SdkResponse
<
ContractListResult
>
responseObj
=
JSONUtils
.
toQysResponse
(
response
,
ContractListResult
.
class
);
if
(
responseObj
.
getCode
()
==
0
)
{
ContractListResult
result
=
responseObj
.
getResult
();
list
.
addAll
(
result
.
getList
());
//处理其他页数的数据
Integer
selectOffset
=(
pageNo
+
1
)*
1000
;
if
(
result
.
getTotalCount
()
<=
selectOffset
){
break
;
}
else
{
pageNo
++;
}
}
else
{
logger
.
error
(
"请求失败,错误码:{},错误信息:{}"
,
responseObj
.
getCode
(),
responseObj
.
getMessage
());
}
}
while
(
true
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
(),
e
);
}
return
list
.
stream
().
collect
(
Collectors
.
toMap
(
Contract:
:
getId
,
Function
.
identity
(),
(
existing
,
replacement
)
->
existing
));
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/application.properties
View file @
cbbcdb80
...
...
@@ -90,4 +90,4 @@ healthValue_HourCount=6
healthValue_MinCount
=
5
##是否打开健康计算计算 true 打开 false 关闭
openHealth
=
false
\ No newline at end of file
openHealth
=
true
\ 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