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
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 199 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/PersonnelBusinessServiceImpl.java
View file @ 47f8ab44
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -66,7 +67,6 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Value("${hygf.user.group.empty}")
private long userGroupempty;
/**
* 分页查询
*/
......@@ -78,13 +78,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
* 列表查询 示例
*/
public List<PersonnelBusinessDto> queryForPersonnelBusinessList() {
return this.queryForList("", false);
return this.queryForList("" , false);
}
@Override
public IPage<CompanyDtoUserDto> getCompanyDtoUserDto(CompanyDtoUserDto dto) {
Map<String, String> map = personnelBusinessMapper.getorgcode(dto.getAmosUnitId());
Map<String,String> map= personnelBusinessMapper.getorgcode(dto.getAmosUnitId());
dto.setAmosUnitOrgCode(map.get("orgCode"));
IPage<CompanyDtoUserDto> pag = personnelBusinessMapper.getCompanyDtoUserDtopage(dto);
......@@ -92,10 +92,10 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
@Transactional
public void savePersonnelBusiness(UserDataDto model) {
UserDataZHDto userDataZHDto = model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null;
public void savePersonnelBusiness(UserDataDto model){
UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult =null;
//新增平台用户
try {
// 1 创建平台用户
......@@ -118,8 +118,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组
userResult = Privilege.agencyUserClient.create(agencyUserModel);
if (userResult == null || userResult.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + userResult.getDevMessage());
if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+userResult.getDevMessage());
}
List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId());
......@@ -129,7 +129,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
//新增人员基础信息表
PublicAgencyUser publicAgencyUser = new PublicAgencyUser();
PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
publicAgencyUser.setRealName(userDataJBDto.getRealName());
publicAgencyUser.setGender(userDataJBDto.getGender());
publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber());
......@@ -138,35 +138,35 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + companyResult.getDevMessage());
if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+companyResult.getDevMessage());
}
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole()));
publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
publicAgencyUser.setPosition(userDataJBDto.getPosition() != null ? JSON.toJSONString(userDataJBDto.getPosition()) : null);
publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.insert(publicAgencyUser);
PersonnelBusiness re = new PersonnelBusiness();
PersonnelBusiness re=new PersonnelBusiness();
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus() != 200) {
throw new BadRequest("新增人员失败！" + companyResult1.getDevMessage());
if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("新增人员失败！"+companyResult1.getDevMessage());
}
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
re.setCertificate(model.getUserDataZZDto() != null ? JSON.toJSONString(model.getUserDataZZDto().getCertificate()) : null);
re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
......@@ -175,8 +175,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
personnelBusinessMapper.insert(re);
//增加人员权限
List<String> lisk = new ArrayList<>();
StdUserEmpower stdUserEmpower = new StdUserEmpower();
List<String> lisk=new ArrayList<>();
StdUserEmpower stdUserEmpower= new StdUserEmpower();
lisk.add(re.getRegionalCompaniesCode());
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
......@@ -185,8 +185,12 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userEmpowerMapper.insert(stdUserEmpower);
} catch (Exception e) {
if (userResult != null && userResult.getResult() != null && StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
}catch (Exception e){
if (userResult != null && userResult.getResult() != null
&& StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
}
log.error(e.getMessage(), e);
......@@ -197,14 +201,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Transactional
public void updatePersonnelBusiness(UserDataDto model, long id) {
public void updatePersonnelBusiness( UserDataDto model ,long id){
PublicAgencyUser publicAgencyUser = publicAgencyUserMapper.selectById(id);
PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
UserDataZHDto userDataZHDto = model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null;
UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult =null;
try {
// 1 修改平台用户
......@@ -226,9 +230,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组
userResult = Privilege.agencyUserClient.update(agencyUserModel, publicAgencyUser.getAmosUserId());
if (userResult == null || userResult.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + userResult.getDevMessage());
userResult = Privilege.agencyUserClient.update(agencyUserModel,publicAgencyUser.getAmosUserId());
if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+userResult.getDevMessage());
}
List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId());
......@@ -246,56 +250,56 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + companyResult.getDevMessage());
if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+companyResult.getDevMessage());
}
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole()));
publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress());
publicAgencyUser.setPosition(userDataJBDto.getPosition() != null ? JSON.toJSONString(userDataJBDto.getPosition()) : null);
publicAgencyUser.setPosition(userDataJBDto.getPosition()!=null?JSON.toJSONString(userDataJBDto.getPosition()):null);
publicAgencyUser.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.updateById(publicAgencyUser);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUser.getSequenceNbr());
PersonnelBusiness re = personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUser.getSequenceNbr());
PersonnelBusiness re=personnelBusinessMapper.selectOne(qug);
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus() != 200) {
throw new BadRequest("修改人员失败！" + companyResult1.getDevMessage());
if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("修改人员失败！"+companyResult1.getDevMessage());
}
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode());
re.setCertificate(model.getUserDataZZDto() != null ? JSON.toJSONString(model.getUserDataZZDto().getCertificate()) : null);
re.setCertificate(model.getUserDataZZDto()!=null?JSON.toJSONString(model.getUserDataZZDto().getCertificate()):null);
re.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
personnelBusinessMapper.updateById(re);
//增加人员权限
List<String> lisk = new ArrayList<>();
LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId, publicAgencyUser.getAmosUserId());
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
List<String> lisk=new ArrayList<>();
LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUser.getAmosUserId());
StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
// lisk.add(publicAgencyUser.getAmosOrgCode());
lisk.add(re.getRegionalCompaniesCode());
if (stdUserEmpower != null) {
if(stdUserEmpower!=null){
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk);
userEmpowerMapper.updateById(stdUserEmpower);
} else {
stdUserEmpower = new StdUserEmpower();
}else{
stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk);
stdUserEmpower.setPermissionType("HYGF");
......@@ -303,7 +307,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
} catch (Exception e) {
}catch (Exception e){
log.error(e.getMessage(), e);
throw new BadRequest(e.getMessage());
......@@ -312,30 +320,36 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
@Transactional
public void replace(String id) {
public void replace(String id){
try {
//获取当前用户
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
personnelBusines.setUserType("2");
personnelBusinessMapper.updateById(personnelBusines);
//获取经销商管理员
LambdaQueryWrapper<UnitInfo> qudg = new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getAmosCompanySeq, personnelBusines.getAmosDealerId());
UnitInfo unitInfo = unitInfoMapper.selectOne(qudg);
LambdaQueryWrapper<PublicAgencyUser> qudx = new LambdaQueryWrapper<>();
qudx.eq(PublicAgencyUser::getAmosUserId, unitInfo.getAdminUserId());
PublicAgencyUser publicAgencyUsex = publicAgencyUserMapper.selectOne(qudx);
LambdaQueryWrapper<PersonnelBusiness> qugf = new LambdaQueryWrapper<>();
qugf.eq(PersonnelBusiness::getFoundationId, publicAgencyUsex.getSequenceNbr());
PersonnelBusiness personnelBusinesx = personnelBusinessMapper.selectOne(qugf);
LambdaQueryWrapper<UnitInfo> qudg=new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getAmosCompanySeq,personnelBusines.getAmosDealerId());
UnitInfo unitInfo= unitInfoMapper.selectOne(qudg);
LambdaQueryWrapper<PublicAgencyUser> qudx=new LambdaQueryWrapper<>();
qudx.eq(PublicAgencyUser::getAmosUserId,unitInfo.getAdminUserId());
PublicAgencyUser publicAgencyUsex= publicAgencyUserMapper.selectOne(qudx);
LambdaQueryWrapper<PersonnelBusiness> qugf=new LambdaQueryWrapper<>();
qugf.eq(PersonnelBusiness::getFoundationId,publicAgencyUsex.getSequenceNbr());
PersonnelBusiness personnelBusinesx=personnelBusinessMapper.selectOne(qugf);
personnelBusinesx.setUserType("1");
personnelBusinessMapper.updateById(personnelBusinesx);
......@@ -345,7 +359,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
unitInfo.setAdminUserName(publicAgencyUse.getRealName());
unitInfoMapper.updateById(unitInfo);
//修改管理员
List<Long> roidx = JSONArray.parseArray(publicAgencyUsex.getRole(), Long.class);
List<Long> roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
//修改平台用户
......@@ -353,58 +369,66 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userId.add(publicAgencyUse.getAmosUserId());
System.out.println("删除旧管理员===================================:" + publicAgencyUsex.getAmosUserId());
if (roidx != null && !roidx.isEmpty() && roidx.size() == 1 && roidx.get(0).longValue() == userGroupId) {
//新增空角色防止单位丢失
System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
List<String> userId1 = new ArrayList<>();
if(roidx!=null&&!roidx.isEmpty()&&roidx.size()==1&&roidx.get(0).longValue()==userGroupId){
//新增空角色防止单位丢失
userId1.add(publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.create(userGroupempty, userId1);
}
//删除旧管理员
Privilege.groupUserClient.deleteGroupUser(userGroupId, publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
// 1 修改平台用户
Privilege.groupUserClient.create(userGroupId, userId);
System.out.println("新增角色用户===================================:" + userId);
System.out.println("新增角色用户===================================:"+userId);
//修改权限
if (roidx == null) {
if(roidx==null){
publicAgencyUsex.setRole(null);
} else {
}else{
roidx.remove(userGroupId);
publicAgencyUsex.setRole(JSON.toJSONString(roidx));
publicAgencyUsex.setRole(CollectionUtil.isEmpty(roidx)? JSON.toJSONString(Arrays.asList(userGroupempty)):JSON.toJSONString(roidx));
}
//修改当前用户角色权限
List<Long> roid = JSONArray.parseArray(publicAgencyUse.getRole(), Long.class);
if (roid == null) {
roid = new ArrayList<>();
List<Long> roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
if(roid==null){
roid=new ArrayList<>();
}
roid.add(userGroupId);
if (roid.contains(userGroupempty)){
roid.remove(userGroupempty);
Privilege.groupUserClient.deleteGroupUser(userGroupempty,publicAgencyUsex.getAmosUserId());
}
publicAgencyUse.setRole(JSON.toJSONString(roid));
publicAgencyUserMapper.updateById(publicAgencyUsex);
publicAgencyUserMapper.updateById(publicAgencyUse);
//旧管理员去除
List<String> li = null;
LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId, publicAgencyUsex.getAmosUserId());
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo);
li = stdUserEmpower.getAmosOrgCode();
List<String> li=null;
LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUsex.getAmosUserId());
StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
li=stdUserEmpower.getAmosOrgCode();
if (stdUserEmpower != null) {
if(stdUserEmpower!=null){
stdUserEmpower.setAmosOrgCode(null);
userEmpowerMapper.updateById(stdUserEmpower);
} else {
stdUserEmpower = new StdUserEmpower();
}else{
stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosOrgCode(null);
stdUserEmpower.setPermissionType("HYGF");
stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
......@@ -412,18 +436,20 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
//新管理员新增
LambdaQueryWrapper<StdUserEmpower> uo1 = new LambdaQueryWrapper();
uo1.eq(StdUserEmpower::getAmosUserId, publicAgencyUse.getAmosUserId());
StdUserEmpower stdUserEmpower1 = userEmpowerMapper.selectOne(uo1);
LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
StdUserEmpower stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
if (stdUserEmpower1 != null) {
if(stdUserEmpower1!=null){
stdUserEmpower1.setAmosOrgCode(li);
userEmpowerMapper.updateById(stdUserEmpower1);
} else {
stdUserEmpower1 = new StdUserEmpower();
}else{
stdUserEmpower1=new StdUserEmpower();
stdUserEmpower1.setAmosOrgCode(li);
stdUserEmpower1.setPermissionType("HYGF");
stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
......@@ -431,12 +457,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
}
UserMessage userMessage = new UserMessage(TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr(), publicAgencyUse.getAmosUserId(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode());
UserMessage userMessage= new UserMessage( TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr() , publicAgencyUse.getAmosUserId(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode());
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
} catch (Exception e) {
}catch (Exception e){
e.printStackTrace();
throw new BadRequest("设置失败！");
}
......@@ -444,29 +472,29 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Override
public UserDataDto getPersonnelBusinessById(String id) {
public UserDataDto getPersonnelBusinessById(String id){
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug);
LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
UserDataZHDto userDataZHDto = new UserDataZHDto();
UserDataJBDto userDataJBDto = new UserDataJBDto();
UserDataZZDto userDataZZDto = new UserDataZZDto();
UserDataZHDto userDataZHDto=new UserDataZHDto();
UserDataJBDto userDataJBDto=new UserDataJBDto();
UserDataZZDto userDataZZDto=new UserDataZZDto();
userDataZZDto.setCertificate(personnelBusines.getCertificate() != null ? JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class) : null);
userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(), long.class));
userDataZZDto.setCertificate(personnelBusines.getCertificate()!=null?JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class):null);
userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
userDataZHDto.setUserName(publicAgencyUse.getAmosUserName());
BeanUtils.copyProperties(publicAgencyUse, userDataJBDto);
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(), String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq() != null ? personnelBusines.getRegionalCompaniesSeq().toString() : null);
BeanUtils.copyProperties(publicAgencyUse,userDataJBDto);
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
return new UserDataDto(userDataZHDto, userDataJBDto, userDataZZDto);
return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto);
}
@Override
......
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