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
Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 269 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; 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.context.annotation.Primary;
import org.springframework.http.HttpStatus; 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.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; 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.foundation.context.RequestContext;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest; import com.alibaba.fastjson.JSONObject;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
/** /**
* @description: 全局异常处理器 * @description: 全局异常处理器
...@@ -46,8 +44,13 @@ public class GlobalExceptionHandler { ...@@ -46,8 +44,13 @@ public class GlobalExceptionHandler {
response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
response.setTraceId(RequestContext.getTraceId()); response.setTraceId(RequestContext.getTraceId());
response.setPath(request.getServletPath()); 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; 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 @@ ...@@ -35,10 +35,9 @@
<if test="params.type == 3 "> <if test="params.type == 3 ">
and info.status in ('待整改','整改未完成') and info.status in ('待整改','整改未完成')
</if> </if>
</where> </where>
ORDER BY ORDER BY
info.rec_date DESC ,hph.sequence_nbr ASC ) as sta info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
<where> <where>
<if test="params.status != null and params.status != ''"> <if test="params.status != null and params.status != ''">
and sta.status = #{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 { ...@@ -624,6 +624,24 @@ public class UnitInfoController extends BaseController {
return ResponseHelper.buildResponse(chil); 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) @TycloudOperation(ApiLevel = UserType.AGENCY)
...@@ -670,9 +688,7 @@ public class UnitInfoController extends BaseController { ...@@ -670,9 +688,7 @@ public class UnitInfoController extends BaseController {
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies); FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies);
companyModel = (List<CompanyModel>)feignClientResult.getResult(); companyModel = (List<CompanyModel>)feignClientResult.getResult();
} }
return ResponseHelper.buildResponse(companyModel); return ResponseHelper.buildResponse(companyModel);
} }
...@@ -755,9 +771,6 @@ public class UnitInfoController extends BaseController { ...@@ -755,9 +771,6 @@ public class UnitInfoController extends BaseController {
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData( public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
@RequestParam(required=false) Long unitInfoId, @RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq @RequestParam(required=false) Long regionalCompaniesSeq
) { ) {
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId); UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null,null); 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 ...@@ -34,6 +34,8 @@ public class BasicGridAcceptanceServiceImpl
@Autowired @Autowired
HygfOnGridMapper onGridMapper; HygfOnGridMapper onGridMapper;
@Autowired @Autowired
HygfOnGridServiceImpl hygfOnGridServiceImpl;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper; PersonnelBusinessMapper personnelBusinessMapper;
@Autowired @Autowired
WorkflowImpl workflow; WorkflowImpl workflow;
...@@ -124,11 +126,17 @@ public class BasicGridAcceptanceServiceImpl ...@@ -124,11 +126,17 @@ public class BasicGridAcceptanceServiceImpl
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
} }
if (grid.getSequenceNbr() != null) {
onGridMapper.updateById(grid); //防止重复提交
} else { // if (grid.getSequenceNbr() != null) {
onGridMapper.insert(grid); // 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); 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 ...@@ -110,13 +110,12 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return false; return false;
//throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！"); //
} }
} }
public WorkDto getNodeInfoCode(String flowTaskId, boolean token) { public WorkDto getNodeInfoCode(String flowTaskId, boolean token) {
WorkDto workDto = null; WorkDto workDto = null;
try {
FeignClientResult<JSONObject> jSONObject = null; FeignClientResult<JSONObject> jSONObject = null;
if (token) { if (token) {
jSONObject = workflowFeignClient.getNodeInfo(flowTaskId); jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
...@@ -145,16 +144,11 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer ...@@ -145,16 +144,11 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
} }
return workDto; return workDto;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
} }
public String getTaskNoAuth(String processInstanceId, boolean token) { public String getTaskNoAuth(String processInstanceId, boolean token) {
String flowTaskId = null; String flowTaskId = null;
try {
JSONObject jSONObject = null; JSONObject jSONObject = null;
if (token) { if (token) {
jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId); jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
...@@ -170,11 +164,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer ...@@ -170,11 +164,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
} }
return flowTaskId; 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; 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.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -66,25 +67,24 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -66,25 +67,24 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Value("${hygf.user.group.empty}") @Value("${hygf.user.group.empty}")
private long userGroupempty; private long userGroupempty;
/** /**
* 分页查询 * 分页查询
*/ */
public Page<PersonnelBusinessDto> queryForPersonnelBusinessPage(Page<PersonnelBusinessDto> page) { public Page<PersonnelBusinessDto> queryForPersonnelBusinessPage(Page<PersonnelBusinessDto> page) {
return this.queryForPage(page, null, false); return this.queryForPage(page, null, false);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<PersonnelBusinessDto> queryForPersonnelBusinessList() { public List<PersonnelBusinessDto> queryForPersonnelBusinessList() {
return this.queryForList("", false); return this.queryForList("" , false);
} }
@Override @Override
public IPage<CompanyDtoUserDto> getCompanyDtoUserDto(CompanyDtoUserDto dto) { 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")); dto.setAmosUnitOrgCode(map.get("orgCode"));
IPage<CompanyDtoUserDto> pag = personnelBusinessMapper.getCompanyDtoUserDtopage(dto); IPage<CompanyDtoUserDto> pag = personnelBusinessMapper.getCompanyDtoUserDtopage(dto);
...@@ -92,11 +92,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -92,11 +92,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
} }
@Transactional @Transactional
public void savePersonnelBusiness(UserDataDto model) { public void savePersonnelBusiness(UserDataDto model){
UserDataZHDto userDataZHDto = model.getUserDataZHDto(); UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto(); UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null; FeignClientResult<AgencyUserModel> userResult =null;
//新增平台用户 //新增平台用户
try { try {
// 1 创建平台用户 // 1 创建平台用户
List<RoleModel> userRoleList = new ArrayList<>(); List<RoleModel> userRoleList = new ArrayList<>();
...@@ -113,13 +113,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -113,13 +113,13 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
Map<Long, List<RoleModel>> orgRoles = new HashMap<>(); Map<Long, List<RoleModel>> orgRoles = new HashMap<>();
roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole()); roleSeqMap.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userDataZHDto.getRole());
orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList); orgRoles.put(Long.valueOf(userDataJBDto.getAmosUnitId()), userRoleList);
// agencyUserModel.setAppCodes(split); // agencyUserModel.setAppCodes(split);
agencyUserModel.setOrgRoles(orgRoles); agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap); agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组 // 将创建用户加入用户组
userResult = Privilege.agencyUserClient.create(agencyUserModel); userResult = Privilege.agencyUserClient.create(agencyUserModel);
if (userResult == null || userResult.getStatus() != 200) { if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！" + userResult.getDevMessage()); throw new BadRequest("新增人员失败！"+userResult.getDevMessage());
} }
List<String> userId = new ArrayList<>(); List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId()); userId.add(userResult.getResult().getUserId());
...@@ -129,7 +129,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -129,7 +129,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
//新增人员基础信息表 //新增人员基础信息表
PublicAgencyUser publicAgencyUser = new PublicAgencyUser(); PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
publicAgencyUser.setRealName(userDataJBDto.getRealName()); publicAgencyUser.setRealName(userDataJBDto.getRealName());
publicAgencyUser.setGender(userDataJBDto.getGender()); publicAgencyUser.setGender(userDataJBDto.getGender());
publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber()); publicAgencyUser.setJobNumber(userDataJBDto.getJobNumber());
...@@ -138,35 +138,35 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -138,35 +138,35 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId()); publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId()); FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus() != 200) { if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("新增人员失败！" + companyResult.getDevMessage()); throw new BadRequest("新增人员失败！"+companyResult.getDevMessage());
} }
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode()); publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserId(userResult.getResult().getUserId()); publicAgencyUser.setAmosUserId(userResult.getResult().getUserId());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName()); publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey)); publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole())); publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK"); publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date()); publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight()); publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight()); publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone()); publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress()); 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.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace()); publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook()); publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.insert(publicAgencyUser); publicAgencyUserMapper.insert(publicAgencyUser);
PersonnelBusiness re = new PersonnelBusiness(); PersonnelBusiness re=new PersonnelBusiness();
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq())); FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus() != 200) { if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("新增人员失败！" + companyResult1.getDevMessage()); throw new BadRequest("新增人员失败！"+companyResult1.getDevMessage());
} }
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq())); re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName()); re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode()); 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.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName()); re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode()); re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
...@@ -175,8 +175,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -175,8 +175,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
personnelBusinessMapper.insert(re); personnelBusinessMapper.insert(re);
//增加人员权限 //增加人员权限
List<String> lisk = new ArrayList<>(); List<String> lisk=new ArrayList<>();
StdUserEmpower stdUserEmpower = new StdUserEmpower(); StdUserEmpower stdUserEmpower= new StdUserEmpower();
lisk.add(re.getRegionalCompaniesCode()); lisk.add(re.getRegionalCompaniesCode());
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId()); stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
...@@ -185,8 +185,12 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -185,8 +185,12 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userEmpowerMapper.insert(stdUserEmpower); 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()); Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
} }
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
...@@ -197,14 +201,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -197,14 +201,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Transactional @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(); UserDataZHDto userDataZHDto= model.getUserDataZHDto();
UserDataJBDto userDataJBDto = model.getUserDataJBDto(); UserDataJBDto userDataJBDto= model.getUserDataJBDto();
FeignClientResult<AgencyUserModel> userResult = null; FeignClientResult<AgencyUserModel> userResult =null;
try { try {
// 1 修改平台用户 // 1 修改平台用户
...@@ -226,9 +230,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -226,9 +230,9 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
agencyUserModel.setOrgRoles(orgRoles); agencyUserModel.setOrgRoles(orgRoles);
agencyUserModel.setOrgRoleSeqs(roleSeqMap); agencyUserModel.setOrgRoleSeqs(roleSeqMap);
// 将创建用户加入用户组 // 将创建用户加入用户组
userResult = Privilege.agencyUserClient.update(agencyUserModel, publicAgencyUser.getAmosUserId()); userResult = Privilege.agencyUserClient.update(agencyUserModel,publicAgencyUser.getAmosUserId());
if (userResult == null || userResult.getStatus() != 200) { if (userResult == null || userResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！" + userResult.getDevMessage()); throw new BadRequest("修改人员失败！"+userResult.getDevMessage());
} }
List<String> userId = new ArrayList<>(); List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId()); userId.add(userResult.getResult().getUserId());
...@@ -246,56 +250,56 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -246,56 +250,56 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId()); publicAgencyUser.setAmosId(userDataJBDto.getAmosUnitId());
FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId()); FeignClientResult<CompanyModel> companyResult = Privilege.companyClient.seleteOne(userDataJBDto.getAmosUnitId());
if (companyResult == null || companyResult.getStatus() != 200) { if (companyResult == null || companyResult.getStatus()!=200) {
throw new BadRequest("修改人员失败！" + companyResult.getDevMessage()); throw new BadRequest("修改人员失败！"+companyResult.getDevMessage());
} }
publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode()); publicAgencyUser.setAmosOrgCode(companyResult.getResult().getOrgCode());
publicAgencyUser.setAmosUserName(userDataZHDto.getUserName()); publicAgencyUser.setAmosUserName(userDataZHDto.getUserName());
publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey)); publicAgencyUser.setPassword(DesUtil.encode(userDataZHDto.getPassword(), secretKey));
publicAgencyUser.setRole(JSON.toJSONString(userDataZHDto.getRole())); publicAgencyUser.setRole(JSON.toJSONString( userDataZHDto.getRole()));
publicAgencyUser.setLockStatus("UNLOCK"); publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUser.setLockTime(new Date()); publicAgencyUser.setLockTime(new Date());
publicAgencyUser.setHeight(userDataJBDto.getHeight()); publicAgencyUser.setHeight(userDataJBDto.getHeight());
publicAgencyUser.setWeight(userDataJBDto.getWeight()); publicAgencyUser.setWeight(userDataJBDto.getWeight());
publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone()); publicAgencyUser.setEmergencyTelephone(userDataJBDto.getEmergencyTelephone());
publicAgencyUser.setDomicileAddress(userDataJBDto.getDomicileAddress()); 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.setNowAddress(userDataJBDto.getNowAddress());
publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace()); publicAgencyUser.setNativePlace(userDataJBDto.getNativePlace());
publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook()); publicAgencyUser.setPoliticalOutlook(userDataJBDto.getPoliticalOutlook());
publicAgencyUserMapper.updateById(publicAgencyUser); publicAgencyUserMapper.updateById(publicAgencyUser);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUser.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUser.getSequenceNbr());
PersonnelBusiness re = personnelBusinessMapper.selectOne(qug); PersonnelBusiness re=personnelBusinessMapper.selectOne(qug);
FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq())); FeignClientResult<CompanyModel> companyResult1 = Privilege.companyClient.seleteOne(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
if (companyResult1 == null || companyResult1.getStatus() != 200) { if (companyResult1 == null || companyResult1.getStatus()!=200) {
throw new BadRequest("修改人员失败！" + companyResult1.getDevMessage()); throw new BadRequest("修改人员失败！"+companyResult1.getDevMessage());
} }
re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq())); re.setRegionalCompaniesSeq(Long.valueOf(userDataJBDto.getRegionalCompaniesSeq()));
re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName()); re.setRegionalCompaniesName(companyResult1.getResult().getCompanyName());
re.setRegionalCompaniesCode(companyResult1.getResult().getOrgCode()); 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.setAmosUnitId(companyResult.getResult().getSequenceNbr());
re.setAmosUnitName(companyResult.getResult().getCompanyName()); re.setAmosUnitName(companyResult.getResult().getCompanyName());
re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode()); re.setAmosUnitOrgCode(companyResult.getResult().getOrgCode());
personnelBusinessMapper.updateById(re); personnelBusinessMapper.updateById(re);
//增加人员权限 //增加人员权限
List<String> lisk = new ArrayList<>(); List<String> lisk=new ArrayList<>();
LambdaQueryWrapper<StdUserEmpower> uo = new LambdaQueryWrapper(); LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
uo.eq(StdUserEmpower::getAmosUserId, publicAgencyUser.getAmosUserId()); uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUser.getAmosUserId());
StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(uo); StdUserEmpower stdUserEmpower= userEmpowerMapper.selectOne(uo);
// lisk.add(publicAgencyUser.getAmosOrgCode()); // lisk.add(publicAgencyUser.getAmosOrgCode());
lisk.add(re.getRegionalCompaniesCode()); lisk.add(re.getRegionalCompaniesCode());
if (stdUserEmpower != null) { if(stdUserEmpower!=null){
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId()); stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk); stdUserEmpower.setAmosOrgCode(lisk);
userEmpowerMapper.updateById(stdUserEmpower); userEmpowerMapper.updateById(stdUserEmpower);
} else { }else{
stdUserEmpower = new StdUserEmpower(); stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId()); stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
stdUserEmpower.setAmosOrgCode(lisk); stdUserEmpower.setAmosOrgCode(lisk);
stdUserEmpower.setPermissionType("HYGF"); stdUserEmpower.setPermissionType("HYGF");
...@@ -303,7 +307,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -303,7 +307,11 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
} }
} catch (Exception e) {
}catch (Exception e){
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
throw new BadRequest(e.getMessage()); throw new BadRequest(e.getMessage());
...@@ -312,40 +320,48 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -312,40 +320,48 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
} }
@Transactional @Transactional
public void replace(String id) { public void replace(String id){
try { try {
//获取当前用户 //获取当前用户
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id); qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud); PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug); PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
personnelBusines.setUserType("2"); personnelBusines.setUserType("2");
personnelBusinessMapper.updateById(personnelBusines); personnelBusinessMapper.updateById(personnelBusines);
//获取经销商管理员 //获取经销商管理员
LambdaQueryWrapper<UnitInfo> qudg = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UnitInfo> qudg=new LambdaQueryWrapper<>();
qudg.eq(UnitInfo::getAmosCompanySeq, personnelBusines.getAmosDealerId()); qudg.eq(UnitInfo::getAmosCompanySeq,personnelBusines.getAmosDealerId());
UnitInfo unitInfo = unitInfoMapper.selectOne(qudg); UnitInfo unitInfo= unitInfoMapper.selectOne(qudg);
LambdaQueryWrapper<PublicAgencyUser> qudx = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qudx=new LambdaQueryWrapper<>();
qudx.eq(PublicAgencyUser::getAmosUserId, unitInfo.getAdminUserId()); qudx.eq(PublicAgencyUser::getAmosUserId,unitInfo.getAdminUserId());
PublicAgencyUser publicAgencyUsex = publicAgencyUserMapper.selectOne(qudx); PublicAgencyUser publicAgencyUsex= publicAgencyUserMapper.selectOne(qudx);
LambdaQueryWrapper<PersonnelBusiness> qugf = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qugf=new LambdaQueryWrapper<>();
qugf.eq(PersonnelBusiness::getFoundationId, publicAgencyUsex.getSequenceNbr()); qugf.eq(PersonnelBusiness::getFoundationId,publicAgencyUsex.getSequenceNbr());
PersonnelBusiness personnelBusinesx = personnelBusinessMapper.selectOne(qugf); PersonnelBusiness personnelBusinesx=personnelBusinessMapper.selectOne(qugf);
personnelBusinesx.setUserType("1"); personnelBusinesx.setUserType("1");
personnelBusinessMapper.updateById(personnelBusinesx); personnelBusinessMapper.updateById(personnelBusinesx);
unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName()); unitInfo.setAdminLoginName(publicAgencyUse.getAmosUserName());
unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone()); unitInfo.setAdminPhone(publicAgencyUse.getEmergencyTelephone());
unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId()); unitInfo.setAdminUserId(publicAgencyUse.getAmosUserId());
unitInfo.setAdminUserName(publicAgencyUse.getRealName()); unitInfo.setAdminUserName(publicAgencyUse.getRealName());
unitInfoMapper.updateById(unitInfo); unitInfoMapper.updateById(unitInfo);
//修改管理员 //修改管理员
List<Long> roidx = JSONArray.parseArray(publicAgencyUsex.getRole(), Long.class); List<Long> roidx= JSONArray.parseArray(publicAgencyUsex.getRole(),Long.class);
//修改平台用户 //修改平台用户
...@@ -353,90 +369,102 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -353,90 +369,102 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
userId.add(publicAgencyUse.getAmosUserId()); userId.add(publicAgencyUse.getAmosUserId());
System.out.println("删除旧管理员===================================:" + publicAgencyUsex.getAmosUserId()); System.out.println("删除旧管理员===================================:"+publicAgencyUsex.getAmosUserId());
List<String> userId1 = new ArrayList<>();
if(roidx!=null&&!roidx.isEmpty()&&roidx.size()==1&&roidx.get(0).longValue()==userGroupId){
//新增空角色防止单位丢失
if (roidx != null && !roidx.isEmpty() && roidx.size() == 1 && roidx.get(0).longValue() == userGroupId) { userId1.add(publicAgencyUsex.getAmosUserId());
//新增空角色防止单位丢失 Privilege.groupUserClient.create(userGroupempty, userId1);
List<String> userId1 = new ArrayList<>(); }
userId1.add(publicAgencyUsex.getAmosUserId());
Privilege.groupUserClient.create(userGroupempty, userId1);
}
//删除旧管理员 //删除旧管理员
Privilege.groupUserClient.deleteGroupUser(userGroupId, publicAgencyUsex.getAmosUserId()); Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
// 1 修改平台用户 // 1 修改平台用户
Privilege.groupUserClient.create(userGroupId, userId); Privilege.groupUserClient.create(userGroupId, userId);
System.out.println("新增角色用户===================================:" + userId); System.out.println("新增角色用户===================================:"+userId);
//修改权限 //修改权限
if (roidx == null) { if(roidx==null){
publicAgencyUsex.setRole(null); publicAgencyUsex.setRole(null);
} else { }else{
roidx.remove(userGroupId); 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); List<Long> roid= JSONArray.parseArray(publicAgencyUse.getRole(),Long.class);
if (roid == null) { if(roid==null){
roid = new ArrayList<>(); roid=new ArrayList<>();
} }
roid.add(userGroupId); roid.add(userGroupId);
if (roid.contains(userGroupempty)){
roid.remove(userGroupempty);
Privilege.groupUserClient.deleteGroupUser(userGroupempty,publicAgencyUsex.getAmosUserId());
}
publicAgencyUse.setRole(JSON.toJSONString(roid)); publicAgencyUse.setRole(JSON.toJSONString(roid));
publicAgencyUserMapper.updateById(publicAgencyUsex); publicAgencyUserMapper.updateById(publicAgencyUsex);
publicAgencyUserMapper.updateById(publicAgencyUse); 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();
if (stdUserEmpower != null) {
stdUserEmpower.setAmosOrgCode(null);
userEmpowerMapper.updateById(stdUserEmpower);
} else {
stdUserEmpower = new StdUserEmpower();
stdUserEmpower.setAmosOrgCode(null);
stdUserEmpower.setPermissionType("HYGF");
stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower);
}
//旧管理员去除
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){
LambdaQueryWrapper<StdUserEmpower> uo1 = new LambdaQueryWrapper(); stdUserEmpower.setAmosOrgCode(null);
uo1.eq(StdUserEmpower::getAmosUserId, publicAgencyUse.getAmosUserId()); userEmpowerMapper.updateById(stdUserEmpower);
StdUserEmpower stdUserEmpower1 = userEmpowerMapper.selectOne(uo1);
}else{
stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosOrgCode(null);
stdUserEmpower.setPermissionType("HYGF");
stdUserEmpower.setAmosUserId(publicAgencyUsex.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower);
}
if (stdUserEmpower1 != null) {
stdUserEmpower1.setAmosOrgCode(li);
userEmpowerMapper.updateById(stdUserEmpower1);
} else {
stdUserEmpower1 = new StdUserEmpower();
stdUserEmpower1.setAmosOrgCode(li);
stdUserEmpower1.setPermissionType("HYGF");
stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower1);
}
UserMessage userMessage = new UserMessage(TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr(), publicAgencyUse.getAmosUserId(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode()); //新管理员新增
LambdaQueryWrapper<StdUserEmpower> uo1=new LambdaQueryWrapper();
uo1.eq(StdUserEmpower::getAmosUserId,publicAgencyUse.getAmosUserId());
StdUserEmpower stdUserEmpower1= userEmpowerMapper.selectOne(uo1);
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} catch (Exception e) { if(stdUserEmpower1!=null){
stdUserEmpower1.setAmosOrgCode(li);
userEmpowerMapper.updateById(stdUserEmpower1);
}else{
stdUserEmpower1=new StdUserEmpower();
stdUserEmpower1.setAmosOrgCode(li);
stdUserEmpower1.setPermissionType("HYGF");
stdUserEmpower1.setAmosUserId(publicAgencyUse.getAmosUserId());
userEmpowerMapper.insert(stdUserEmpower1);
}
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);
}catch (Exception e){
e.printStackTrace(); e.printStackTrace();
throw new BadRequest("设置失败！"); throw new BadRequest("设置失败！");
} }
...@@ -444,29 +472,29 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -444,29 +472,29 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
@Override @Override
public UserDataDto getPersonnelBusinessById(String id) { public UserDataDto getPersonnelBusinessById(String id){
LambdaQueryWrapper<PublicAgencyUser> qud = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PublicAgencyUser> qud=new LambdaQueryWrapper<>();
qud.eq(PublicAgencyUser::getSequenceNbr, id); qud.eq(PublicAgencyUser::getSequenceNbr,id);
PublicAgencyUser publicAgencyUse = publicAgencyUserMapper.selectOne(qud); PublicAgencyUser publicAgencyUse= publicAgencyUserMapper.selectOne(qud);
LambdaQueryWrapper<PersonnelBusiness> qug = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PersonnelBusiness> qug=new LambdaQueryWrapper<>();
qug.eq(PersonnelBusiness::getFoundationId, publicAgencyUse.getSequenceNbr()); qug.eq(PersonnelBusiness::getFoundationId,publicAgencyUse.getSequenceNbr());
PersonnelBusiness personnelBusines = personnelBusinessMapper.selectOne(qug); PersonnelBusiness personnelBusines=personnelBusinessMapper.selectOne(qug);
UserDataZHDto userDataZHDto = new UserDataZHDto(); UserDataZHDto userDataZHDto=new UserDataZHDto();
UserDataJBDto userDataJBDto = new UserDataJBDto(); UserDataJBDto userDataJBDto=new UserDataJBDto();
UserDataZZDto userDataZZDto = new UserDataZZDto(); UserDataZZDto userDataZZDto=new UserDataZZDto();
userDataZZDto.setCertificate(personnelBusines.getCertificate() != null ? JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class) : null); userDataZZDto.setCertificate(personnelBusines.getCertificate()!=null?JSONArray.parseArray(personnelBusines.getCertificate(), JSONObject.class):null);
userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(), long.class)); userDataZHDto.setRole(JSONArray.parseArray(publicAgencyUse.getRole(),long.class));
userDataZHDto.setUserName(publicAgencyUse.getAmosUserName()); userDataZHDto.setUserName(publicAgencyUse.getAmosUserName());
BeanUtils.copyProperties(publicAgencyUse, userDataJBDto); BeanUtils.copyProperties(publicAgencyUse,userDataJBDto);
userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(), String.class)); userDataJBDto.setPosition(JSONArray.parseArray(publicAgencyUse.getPosition(),String.class));
userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq() != null ? personnelBusines.getRegionalCompaniesSeq().toString() : null); userDataJBDto.setRegionalCompaniesSeq(personnelBusines.getRegionalCompaniesSeq()!=null?personnelBusines.getRegionalCompaniesSeq().toString():null);
userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId()); userDataJBDto.setAmosUnitId(personnelBusines.getAmosUnitId());
return new UserDataDto(userDataZHDto, userDataJBDto, userDataZZDto); return new UserDataDto( userDataZHDto, userDataJBDto , userDataZZDto);
} }
@Override @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 ...@@ -152,7 +152,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override @Override
@Transactional @Transactional
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) { public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
try{ try {
//流程节点code //流程节点code
// if (flag) { // if (flag) {
// String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId()); // String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
...@@ -220,8 +220,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -220,8 +220,8 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
return fl; return fl;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
} }
return false;
} }
@Override @Override
...@@ -353,7 +353,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -353,7 +353,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// } // }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
} }
return code; return code;
...@@ -438,7 +438,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -438,7 +438,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
public WorkDto getNodeInfoCode(String flowTaskId) { public WorkDto getNodeInfoCode(String flowTaskId) {
WorkDto workDto = null; WorkDto workDto = null;
try {
FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId); FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) { if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
JSONObject js = jSONObject.getResult(); JSONObject js = jSONObject.getResult();
...@@ -463,16 +462,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -463,16 +462,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
} }
return workDto; return workDto;
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
} }
public String getTaskNoAuth(String processInstanceId) { public String getTaskNoAuth(String processInstanceId) {
String flowTaskId = null; String flowTaskId = null;
try {
JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId); JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) { if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null; LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
...@@ -482,11 +477,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -482,11 +477,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
} }
return flowTaskId; 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 ...@@ -282,7 +282,6 @@ public class SurveyInformationServiceImpl
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new BadRequest("系统异常");
} }
return surveyInfoAllDto; return surveyInfoAllDto;
...@@ -369,7 +368,6 @@ public class SurveyInformationServiceImpl ...@@ -369,7 +368,6 @@ public class SurveyInformationServiceImpl
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
} }
// PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode()); // 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 ...@@ -292,8 +292,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.登记中.getCode()); upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.登记中.getCode());
} }
workOrderMapper.update(null, upq); 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) { if (powerStationConstructionData.getSequenceNbr() != null) {
...@@ -830,7 +837,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -830,7 +837,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId()); powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
powerStationEngineeringInfo powerStationEngineeringInfo
.setWorkOrderPowerStationId(powerStationEngineeringInfoAllDto.getWorkOrderPowerStationId()); .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(), "完工登记", ConstructionRecords da = new ConstructionRecords(powerStationEngineeringInfo.getRecUserName(), "完工登记",
new Date(), "", workOrderPowerStation.getWorkOrderId(), workOrderPowerStation.getSequenceNbr(), new Date(), "", workOrderPowerStation.getWorkOrderId(), workOrderPowerStation.getSequenceNbr(),
...@@ -863,74 +876,73 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -863,74 +876,73 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
} }
@Transactional(isolation = Isolation.REPEATABLE_READ) @Transactional(isolation = Isolation.REPEATABLE_READ)
public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords){ public ConstructionRecords addConstructionRecords(ConstructionRecords constructionRecords) {
synchronized (constructionRecords) { synchronized (constructionRecords) {
LambdaQueryWrapper<WorkOrderPowerStation> qu=new LambdaQueryWrapper(); LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getSequenceNbr,constructionRecords.getWorkOrderPowerStationId()); qu.eq(WorkOrderPowerStation::getSequenceNbr, constructionRecords.getWorkOrderPowerStationId());
WorkOrderPowerStation workOrderPowerStation=workOrderPowerStationMapper.selectOne(qu); WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectOne(qu);
if(constructionRecords.getOperationResults().equals("通过")){ if (constructionRecords.getOperationResults().equals("通过")) {
//修改电站状态 // 修改电站状态
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode()); workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
//修改完工时间 // 修改完工时间
LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1=new LambdaUpdateWrapper(); LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,workOrderPowerStation.getSequenceNbr()); upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
upq1.set(PowerStationEngineeringInfo::getCompletionDate,new Date()); workOrderPowerStation.getSequenceNbr());
powerStationEngineeringInfoMapper.update(null,upq1); upq1.set(PowerStationEngineeringInfo::getCompletionDate, new Date());
powerStationEngineeringInfoMapper.update(null, upq1);
BasicGridAcceptance dat=new BasicGridAcceptance();
dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId()); BasicGridAcceptance dat = new BasicGridAcceptance();
dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr()); dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId()); dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
dat.setGridStatus("1"); dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
dat.setGridStatus("1");
//新增并网记录
LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>(); // 新增并网记录
bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId()); LambdaQueryWrapper<BasicGridAcceptance> bga = new LambdaQueryWrapper<>();
BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga); bga.eq(BasicGridAcceptance::getPeasantHouseholdId, workOrderPowerStation.getPeasantHouseholdId());
//防止重复增加 BasicGridAcceptance b = basicGridAcceptanceMapper.selectOne(bga);
if(b==null) // 防止重复增加
{ if (b == null) {
basicGridAcceptanceMapper.insert(dat); basicGridAcceptanceMapper.insert(dat);
} }
workOrderPowerStationMapper.updateById(workOrderPowerStation); workOrderPowerStationMapper.updateById(workOrderPowerStation);
//修改派工单状态 // 修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu1=new LambdaQueryWrapper(); LambdaQueryWrapper<WorkOrderPowerStation> qu1 = new LambdaQueryWrapper();
qu1.eq(WorkOrderPowerStation::getWorkOrderId,workOrderPowerStation.getWorkOrderId()); qu1.eq(WorkOrderPowerStation::getWorkOrderId, workOrderPowerStation.getWorkOrderId());
List<String> d=new ArrayList<>(); List<String> d = new ArrayList<>();
d.add(WorkOrderEnum.施工中.getCode()); d.add(WorkOrderEnum.施工中.getCode());
d.add(WorkOrderEnum.待施工.getCode()); d.add(WorkOrderEnum.待施工.getCode());
d.add(WorkOrderEnum.待登记.getCode()); d.add(WorkOrderEnum.待登记.getCode());
d.add(WorkOrderEnum.待审核.getCode()); d.add(WorkOrderEnum.待审核.getCode());
qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus,d); qu1.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
List<WorkOrderPowerStation> list=workOrderPowerStationMapper.selectList(qu1); List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu1);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper(); LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId()); upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
if(list==null||list.isEmpty()){ if (list == null || list.isEmpty()) {
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.已完工.getCode()); upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
workOrderMapper.update(null,upq); workOrderMapper.update(null, upq);
} }
}else{ } else {
//修改电站状态 // 修改电站状态
workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode()); workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());
workOrderPowerStationMapper.updateById(workOrderPowerStation); workOrderPowerStationMapper.updateById(workOrderPowerStation);
LambdaUpdateWrapper<WorkOrder> upq=new LambdaUpdateWrapper(); LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr,workOrderPowerStation.getWorkOrderId()); upq.eq(WorkOrder::getSequenceNbr, workOrderPowerStation.getWorkOrderId());
upq.set(WorkOrder::getWorkOrderStatus,WorkOrderEnum.未通过 upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
.getCode()); workOrderMapper.update(null, upq);
workOrderMapper.update(null,upq);
}
}
// 增加操作日志
//增加操作日志 constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
constructionRecords.setWorkOrderId(workOrderPowerStation.getWorkOrderId()); constructionRecords.setOperationContent("完工自审-" + constructionRecords.getOperationResults());
constructionRecords.setOperationContent("完工自审-"+constructionRecords.getOperationResults()); constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
constructionRecords.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr()); constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
constructionRecords.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId()); constructionRecordsServiceImpl.save(constructionRecords);
constructionRecordsServiceImpl.save(constructionRecords); }
} return constructionRecords;
return constructionRecords; }
}
} }
\ No newline at end of file
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