Skip to content

A
amos-boot-zx-biz
Commit 47f8ab44 authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

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

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
parents 6d8fc62d 69de4bbd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 88 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java
View file @ 47f8ab44
package com.yeejoin.amos.boot.module.hygf.api.config;
import lombok.extern.slf4j.Slf4j;
import java.io.PrintWriter;
import java.io.StringWriter;
import javax.servlet.http.HttpServletRequest;
import org.springframework.context.annotation.Primary;
import org.springframework.http.HttpStatus;
import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MaxUploadSizeExceededException;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
/**
* @description: 全局异常处理器
......@@ -46,8 +44,13 @@ public class GlobalExceptionHandler {
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
response.setTraceId(RequestContext.getTraceId());
response.setPath(request.getServletPath());
response.setDevMessage(e.getMessage());
response.setMessage(e.getMessage());
// 获取异常的堆栈跟踪信息
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
String stackTrace = sw.toString();
response.setDevMessage(stackTrace);
response.setMessage(stackTrace);
return response;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml
View file @ 47f8ab44
......@@ -35,10 +35,9 @@
<if test="params.type == 3 ">
and info.status in ('待整改','整改未完成')
</if>
</where>
ORDER BY
info.rec_date DESC ,hph.sequence_nbr ASC ) as sta
info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
<where>
<if test="params.status != null and params.status != ''">
and sta.status = #{params.status}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 47f8ab44
......@@ -624,6 +624,24 @@ public class UnitInfoController extends BaseController {
return ResponseHelper.buildResponse(chil);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getGroupTreeAll")
@ApiOperation(httpMethod = "GET", value = "经销商用户组全部", notes = "经销商用户组全部")
public ResponseModel<Collection<GroupModel>> getGroupTreeAll() {
FeignClientResult<Collection<GroupModel>> feignClientResult= Privilege.groupClient.selectForList(group,null);
Collection<GroupModel> children = feignClientResult.getResult();
Collection<GroupModel> chil =new ArrayList<>();
for (GroupModel child : children) {
if("用户光伏-农户".equals(child.getGroupName())){
//排除其余角色
}else{
chil.add(child);
}
}
return ResponseHelper.buildResponse(chil);
}
//根据角色获取区域公司
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -670,9 +688,7 @@ public class UnitInfoController extends BaseController {
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies);
companyModel = (List<CompanyModel>)feignClientResult.getResult();
}
return ResponseHelper.buildResponse(companyModel);
}
......@@ -755,9 +771,6 @@ public class UnitInfoController extends BaseController {
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq
) {
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null);
......
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 @ 47f8ab44
......@@ -34,6 +34,8 @@ public class BasicGridAcceptanceServiceImpl
@Autowired
HygfOnGridMapper onGridMapper;
@Autowired
HygfOnGridServiceImpl hygfOnGridServiceImpl;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
WorkflowImpl workflow;
......@@ -124,11 +126,17 @@ public class BasicGridAcceptanceServiceImpl
peasantHouseholdMapper.update(null, up);
}
if (grid.getSequenceNbr() != null) {
onGridMapper.updateById(grid);
} else {
onGridMapper.insert(grid);
}
//防止重复提交
// if (grid.getSequenceNbr() != null) {
// onGridMapper.updateById(grid);
// } else {
// onGridMapper.insert(grid);
// }
LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
basicGridAcceptanceMapper.updateById(basicGridAcceptance);
//发起待办
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java
View file @ 47f8ab44
......@@ -110,13 +110,12 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
} catch (Exception e) {
e.printStackTrace();
return false;
//throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
//
}
}
public WorkDto getNodeInfoCode(String flowTaskId, boolean token) {
WorkDto workDto = null;
try {
FeignClientResult<JSONObject> jSONObject = null;
if (token) {
jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
......@@ -145,16 +144,11 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
}
return workDto;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
public String getTaskNoAuth(String processInstanceId, boolean token) {
String flowTaskId = null;
try {
JSONObject jSONObject = null;
if (token) {
jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
......@@ -170,11 +164,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
return flowTaskId;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 47f8ab44
......@@ -152,7 +152,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override
@Transactional
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
try{
try {
//流程节点code
// if (flag) {
// String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
......@@ -220,8 +220,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
return fl;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
return false;
}
@Override
......@@ -353,7 +353,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// }
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
return code;
......@@ -438,7 +438,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
public WorkDto getNodeInfoCode(String flowTaskId) {
WorkDto workDto = null;
try {
FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
JSONObject js = jSONObject.getResult();
......@@ -463,16 +462,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
}
return workDto;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
public String getTaskNoAuth(String processInstanceId) {
String flowTaskId = null;
try {
JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
......@@ -482,12 +477,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
return flowTaskId;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
}
// 设计信息填充
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 47f8ab44
......@@ -282,7 +282,6 @@ public class SurveyInformationServiceImpl
} catch (Exception e) {
e.printStackTrace();
throw new BadRequest("系统异常");
}
return surveyInfoAllDto;
......@@ -369,7 +368,6 @@ public class SurveyInformationServiceImpl
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
// PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 47f8ab44
......@@ -292,8 +292,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.登记中.getCode());
}
workOrderMapper.update(null, upq);
// 新增施工信息
powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
// 防止重复添加
LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
powerStationConstructionData.getWorkOrderPowerStationId());
psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
// 增加操作日志
if (powerStationConstructionData.getSequenceNbr() != null) {
......@@ -830,7 +837,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
powerStationEngineeringInfo
.setWorkOrderPowerStationId(powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId());
powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
// 防止重复提交
LambdaQueryWrapper<PowerStationEngineeringInfo> pse = new LambdaQueryWrapper<>();
pse.eq(PowerStationEngineeringInfo::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId()).eq(
PowerStationEngineeringInfo::getWorkOrderPowerStationId,
powerStationEngineeringInfo.getWorkOrderPowerStationId());
// powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo);
powerStationEngineeringInfoService.saveOrUpdate(powerStationEngineeringInfo, pse);
// 增加操作日志
ConstructionRecords da = new ConstructionRecords(powerStationEngineeringInfo.getRecUserName(), "完工登记",
new Date(), "", workOrderPowerStation.getWorkOrderId(), workOrderPowerStation.getSequenceNbr(),
......@@ -863,69 +876,68 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
}
@Transactional(isolation = Isolation.REPEATABLE_READ)
public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords){
public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
synchronized (constructionRecords) {
LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId());
WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu);
LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
if(constructionRecords.getOperationResults().equals("通过")){
//修改电站状态
if (constructionRecords.getOperationResults().equals("通过")) {
// 修改电站状态
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
//修改完工时间
LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1=new LambdaUpdateWrapper();
upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStation.getSequenceNbr());
upq1.set(PowerStationEngineeringInfo::getCompletionDate,new Date());
powerStationEngineeringInfoMapper.update(null,upq1);
// 修改完工时间
LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
workOrderPowerStation.getSequenceNbr());
upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
powerStationEngineeringInfoMapper.update(null, upq1);
BasicGridAcceptance dat=new BasicGridAcceptance();
BasicGridAcceptance dat = new BasicGridAcceptance();
dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
dat.setGridStatus("1");
//新增并网记录
// 新增并网记录
LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
//防止重复增加
if(b==null)
{
// 防止重复增加
if (b == null) {
basicGridAcceptanceMapper.insert(dat);
}
workOrderPowerStationMapper.updateById(workOrderPowerStation);
//修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper();
qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId());
List<String> d=new ArrayList<>();
// 修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
List<String> d = new ArrayList<>();
d.add(WorkOrderEnum.施工中.getCode());
d.add(WorkOrderEnum.待施工.getCode());
d.add(WorkOrderEnum.待登记.getCode());
d.add(WorkOrderEnum.待审核.getCode());
qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d);
List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu1);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
if(list==null||list.isEmpty()){
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode());
workOrderMapper.update(null,upq);
}
}else{
//修改电站状态
qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
if (list == null || list.isEmpty()) {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
workOrderMapper.update(null, upq);
}
} else {
// 修改电站状态
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
workOrderPowerStationMapper.updateById(workOrderPowerStation);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId());
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.未通过
.getCode());
workOrderMapper.update(null,upq);
LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
workOrderMapper.update(null, upq);
}
//增加操作日志
// 增加操作日志
constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
constructionRecords.setOperationContent("完工自审-"+constructionRecords.getOperationResults());
constructionRecords.setOperationContent("完工自审-" + constructionRecords.getOperationResults());
constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
constructionRecordsServiceImpl.save(constructionRecords);
......
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