Skip to content

A
amos-boot-zx-biz
Commit 4b44b2ae authored by chenzhao's avatar chenzhao
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents 50319641 f05fe12e
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 63 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TestController.java
View file @ 4b44b2ae
package com.yeejoin.amos.boot.module.hygf.biz.controller; 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.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.qiyuesuo.sdk.v2.bean.Contract; import com.qiyuesuo.sdk.v2.bean.Contract;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils; 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.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
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;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.util.AesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -20,17 +26,11 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType; ...@@ -20,17 +26,11 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import java.time.LocalDateTime;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil; import java.time.ZoneId;
import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser; import java.util.*;
import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper; import java.util.concurrent.ExecutorService;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import java.util.concurrent.Executors;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.util.AesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* 农户信息 * 农户信息
...@@ -84,76 +84,76 @@ public class TestController extends BaseController { ...@@ -84,76 +84,76 @@ public class TestController extends BaseController {
private void dealYsTime() { private void dealYsTime() {
log.info("================开始初始验收时间========================="); log.info("================开始初始验收时间=========================");
List<Map<String,Object>> ysCreateTime = acceptanceCheckMapper.getYsCreateTime(); List<Map<String, Object>> ysCreateTime = acceptanceCheckMapper.getYsCreateTime();
for (Map<String, Object> stringObjectMap : ysCreateTime) { for (Map<String, Object> stringObjectMap : ysCreateTime) {
LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(AcceptanceCheck::getYsCreateTime,stringObjectMap.get("time")) wrapper.set(AcceptanceCheck::getYsCreateTime, dealHour(stringObjectMap.get("time")))
.eq(AcceptanceCheck::getInstanceId,stringObjectMap.get("processInstanceId")); .eq(AcceptanceCheck::getInstanceId, stringObjectMap.get("processInstanceId"));
acceptanceCheckMapper.update(null,wrapper); acceptanceCheckMapper.update(null, wrapper);
} }
List<Map<String,Object>> ysEndTime = acceptanceCheckMapper.getYsEndTime(); List<Map<String, Object>> ysEndTime = acceptanceCheckMapper.getYsEndTime();
for (Map<String, Object> stringObjectMap : ysEndTime) { for (Map<String, Object> stringObjectMap : ysEndTime) {
LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(AcceptanceCheck::getYsEndTime,stringObjectMap.get("time")) wrapper.set(AcceptanceCheck::getYsEndTime, stringObjectMap.get("time"))
.eq(AcceptanceCheck::getSequenceNbr,stringObjectMap.get("sequenceNbr")); .eq(AcceptanceCheck::getSequenceNbr, stringObjectMap.get("sequenceNbr"));
acceptanceCheckMapper.update(null,wrapper); acceptanceCheckMapper.update(null, wrapper);
} }
log.info("================验收时间更新完成========================="); log.info("================验收时间更新完成=========================");
} }
private void dealBwTime() { private void dealBwTime() {
log.info("================开始初始并网时间========================="); log.info("================开始初始并网时间=========================");
List<Map<String,Object>> bwCreateTime = basicGridRecordMapper.getBwCreateTime(); List<Map<String, Object>> bwCreateTime = basicGridRecordMapper.getBwCreateTime();
for (Map<String, Object> stringObjectMap : bwCreateTime) { for (Map<String, Object> stringObjectMap : bwCreateTime) {
LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(BasicGridRecord::getBwCreateTime,stringObjectMap.get("time")) wrapper.set(BasicGridRecord::getBwCreateTime, dealHour(stringObjectMap.get("time")))
.eq(BasicGridRecord::getInstanceId,stringObjectMap.get("processInstanceId")); .eq(BasicGridRecord::getInstanceId, stringObjectMap.get("processInstanceId"));
basicGridRecordMapper.update(null,wrapper); basicGridRecordMapper.update(null, wrapper);
} }
List<Map<String,Object>> bwEndTime = basicGridRecordMapper.getBwEndTime(); List<Map<String, Object>> bwEndTime = basicGridRecordMapper.getBwEndTime();
for (Map<String, Object> stringObjectMap : bwEndTime) { for (Map<String, Object> stringObjectMap : bwEndTime) {
LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(BasicGridRecord::getBwEndTime,stringObjectMap.get("time")) wrapper.set(BasicGridRecord::getBwEndTime, stringObjectMap.get("time"))
.eq(BasicGridRecord::getSequenceNbr,stringObjectMap.get("sequenceNbr")); .eq(BasicGridRecord::getSequenceNbr, stringObjectMap.get("sequenceNbr"));
basicGridRecordMapper.update(null,wrapper); basicGridRecordMapper.update(null, wrapper);
} }
log.info("================并网时间更新完成========================="); log.info("================并网时间更新完成=========================");
} }
private void dealSgTime() { private void dealSgTime() {
log.info("================开始初始施工时间========================="); log.info("================开始初始施工时间=========================");
List<Map<String,Object>> sgCreateTime = workOrderPowerStationMapper.getSgCreateTime(); List<Map<String, Object>> sgCreateTime = workOrderPowerStationMapper.getSgCreateTime();
for (Map<String, Object> stringObjectMap : sgCreateTime) { for (Map<String, Object> stringObjectMap : sgCreateTime) {
LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(WorkOrderPowerStation::getSgCreateTime,DateUtils.dateParse(String.valueOf(stringObjectMap.get("time")))) wrapper.set(WorkOrderPowerStation::getSgCreateTime, DateUtils.dateParse(String.valueOf(stringObjectMap.get("time"))))
.eq(WorkOrderPowerStation::getWorkOrderId,stringObjectMap.get("workOrderId")); .eq(WorkOrderPowerStation::getWorkOrderId, stringObjectMap.get("workOrderId"));
workOrderPowerStationMapper.update(null,wrapper); workOrderPowerStationMapper.update(null, wrapper);
} }
List<Map<String,Object>> sgEndTime = workOrderPowerStationMapper.getSgEndTime(); List<Map<String, Object>> sgEndTime = workOrderPowerStationMapper.getSgEndTime();
for (Map<String, Object> stringObjectMap : sgEndTime) { for (Map<String, Object> stringObjectMap : sgEndTime) {
LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(WorkOrderPowerStation::getSgEndTime,stringObjectMap.get("time")) wrapper.set(WorkOrderPowerStation::getSgEndTime, stringObjectMap.get("time"))
.eq(WorkOrderPowerStation::getSequenceNbr,stringObjectMap.get("sequenceNbr")); .eq(WorkOrderPowerStation::getSequenceNbr, stringObjectMap.get("sequenceNbr"));
workOrderPowerStationMapper.update(null,wrapper); workOrderPowerStationMapper.update(null, wrapper);
} }
log.info("================施工时间更新完成========================="); log.info("================施工时间更新完成=========================");
} }
private void dealSjTime() { private void dealSjTime() {
log.info("================开始初始设计时间========================="); log.info("================开始初始设计时间=========================");
List<Map<String,Object>> sjCreateTime = powerStationMapper.getSjCreateTime(); List<Map<String, Object>> sjCreateTime = powerStationMapper.getSjCreateTime();
for (Map<String, Object> stringObjectMap : sjCreateTime) { for (Map<String, Object> stringObjectMap : sjCreateTime) {
LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(PowerStation::getSjCreateTime,stringObjectMap.get("time")) wrapper.set(PowerStation::getSjCreateTime, dealHour(stringObjectMap.get("time")))
.eq(PowerStation::getProcessInstanceId,stringObjectMap.get("processInstanceId")); .eq(PowerStation::getProcessInstanceId, stringObjectMap.get("processInstanceId"));
powerStationMapper.update(null,wrapper); powerStationMapper.update(null, wrapper);
} }
List<Map<String,Object>> sjEndTime = powerStationMapper.getSjEndTime(); List<Map<String, Object>> sjEndTime = powerStationMapper.getSjEndTime();
for (Map<String, Object> stringObjectMap : sjEndTime) { for (Map<String, Object> stringObjectMap : sjEndTime) {
LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(PowerStation::getSjEndTime,stringObjectMap.get("time")) wrapper.set(PowerStation::getSjEndTime, dealHour(stringObjectMap.get("time")))
.eq(PowerStation::getProcessInstanceId,stringObjectMap.get("processInstanceId")); .eq(PowerStation::getProcessInstanceId, stringObjectMap.get("processInstanceId"));
powerStationMapper.update(null,wrapper); powerStationMapper.update(null, wrapper);
} }
log.info("================设计时间更新完成========================="); log.info("================设计时间更新完成=========================");
} }
...@@ -161,37 +161,54 @@ public class TestController extends BaseController { ...@@ -161,37 +161,54 @@ public class TestController extends BaseController {
private void dealDzhtqyTime() { private void dealDzhtqyTime() {
log.info("================开始初始电子合同时间========================="); log.info("================开始初始电子合同时间=========================");
Map<Long, Contract> contractMap = qiyuesuoService.getContractMap(); Map<Long, Contract> contractMap = qiyuesuoService.getContractMap();
contractMap.forEach((k,v)->{ contractMap.forEach((k, v) -> {
LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(HouseholdContract::getDzhtqyCreateTime, DateUtils.dateParse(v.getPublishTime())) wrapper.set(HouseholdContract::getDzhtqyCreateTime, DateUtils.dateParse(v.getPublishTime()))
.eq(HouseholdContract::getContractLockId,k); .eq(HouseholdContract::getContractLockId, k);
householdContractMapper.update(null,wrapper); householdContractMapper.update(null, wrapper);
}); });
List<Map<String,Object>> dzhtqyEndTime = householdContractMapper.getDzhtqyEndTime(); List<Map<String, Object>> dzhtqyEndTime = householdContractMapper.getDzhtqyEndTime();
for (Map<String, Object> stringObjectMap : dzhtqyEndTime) { for (Map<String, Object> stringObjectMap : dzhtqyEndTime) {
LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(HouseholdContract::getSigningTime,stringObjectMap.get("time")) wrapper.set(HouseholdContract::getSigningTime, stringObjectMap.get("time"))
.eq(HouseholdContract::getSequenceNbr,stringObjectMap.get("sequenceNbr")); .eq(HouseholdContract::getSequenceNbr, stringObjectMap.get("sequenceNbr"));
householdContractMapper.update(null,wrapper); householdContractMapper.update(null, wrapper);
} }
log.info("================电子合同时间更新完成========================="); log.info("================电子合同时间更新完成=========================");
} }
private Date dealHour(Object dateString) {
if(Objects.isNull(dateString)){
return null;
}
// 转换为 LocalDateTime
LocalDateTime localDateTime = LocalDateTime.parse(String.valueOf(dateString));
// 转换为 Date
Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
// 加8小时
calendar.add(Calendar.HOUR_OF_DAY, 8);
return calendar.getTime();
}
private void dealKcTime() { private void dealKcTime() {
log.info("================开始初始勘察时间========================="); log.info("================开始初始勘察时间=========================");
List<Map<String,Object>> kcCreateTime = powerStationMapper.getKcCreateTime(); List<Map<String, Object>> kcCreateTime = powerStationMapper.getKcCreateTime();
for (Map<String, Object> stringObjectMap : kcCreateTime) { for (Map<String, Object> stringObjectMap : kcCreateTime) {
LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(PowerStation::getKcCreateTime,stringObjectMap.get("time")) wrapper.set(PowerStation::getKcCreateTime, dealHour(stringObjectMap.get("time")))
.eq(PowerStation::getProcessInstanceId,stringObjectMap.get("processInstanceId")); .eq(PowerStation::getProcessInstanceId, stringObjectMap.get("processInstanceId"));
powerStationMapper.update(null,wrapper); powerStationMapper.update(null, wrapper);
} }
List<Map<String,Object>> kcEndTime = powerStationMapper.getKcEndTime(); List<Map<String, Object>> kcEndTime = powerStationMapper.getKcEndTime();
for (Map<String, Object> stringObjectMap : kcEndTime) { for (Map<String, Object> stringObjectMap : kcEndTime) {
LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PowerStation> wrapper = new LambdaUpdateWrapper<>();
wrapper.set(PowerStation::getKcEndTime,stringObjectMap.get("time")) wrapper.set(PowerStation::getKcEndTime, dealHour(stringObjectMap.get("time")))
.eq(PowerStation::getProcessInstanceId,stringObjectMap.get("processInstanceId")); .eq(PowerStation::getProcessInstanceId, stringObjectMap.get("processInstanceId"));
powerStationMapper.update(null,wrapper); powerStationMapper.update(null, wrapper);
} }
log.info("================勘察时间更新完成========================="); log.info("================勘察时间更新完成=========================");
dealSjTime(); dealSjTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment