Skip to content

A
amos-boot-biz
Commit aea4b4e7 authored by caotao's avatar caotao
Browse files
Options

移装变更登记字段及页面字段调整

parent be739e04
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 96 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationTransferService.java
View file @ aea4b4e7
......@@ -36,4 +36,5 @@ public interface IJgChangeRegistrationTransferService extends IService<JgChangeR
void revocation(String instanceId);
void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
Map<String, Object> getDetailFieldCamelCase(String record);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java
View file @ aea4b4e7
......@@ -5,6 +5,7 @@ import com.netflix.ribbon.proxy.annotation.Http;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -162,5 +163,10 @@ public class JgChangeRegistrationTransferController extends BaseController {
public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr){
jgChangeRegistrationTransferService.exportUseRegistrationCertificate(sequenceNbr, response);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping (value = "/detailFieldCamelCase")
@ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情，返回字段驼峰命名", notes = "根据record查询设备注册信息详情，返回字段驼峰命名")
public ResponseModel<Map<String, Object>> getDetailFieldCamelCase(@RequestParam String record) {
return ResponseHelper.buildResponse(jgChangeRegistrationTransferService.getDetailFieldCamelCase(record));
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java
View file @ aea4b4e7
......@@ -31,14 +31,12 @@ import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
import com.yeejoin.amos.boot.module.ymt.api.entity.*;
import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgSupervisionInfoMapper;
import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
import com.yeejoin.amos.feign.workflow.model.*;
import org.apache.commons.collections.CollectionUtils;
......@@ -52,6 +50,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
......@@ -77,10 +76,22 @@ import java.util.stream.Collectors;
public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChangeRegistrationTransferDto, JgChangeRegistrationTransfer, JgChangeRegistrationTransferMapper> implements IJgChangeRegistrationTransferService {
private static final String PROCESS_DEFINITION_KEY = "changeRegistrationTransfer";
private static final String TABLE_PAGE_ID = "changeRegistrationTransfer";
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
WorkFlowFeignService workFlowFeginService;
@Autowired
RedisUtils redisUtils;
@Autowired
ICommonService iCommonService;
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
@Autowired
ICmWorkflowService icmWorkflowService;
@Autowired
CommonServiceImpl commonService;
@Autowired
private IJgChangeRegistrationTransferEqService jgChangeRegistrationTransferEqService;
@Autowired
private IJgRegistrationHistoryService jgRegistrationHistoryService;
@Autowired
......@@ -91,17 +102,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
@Autowired
private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
@Autowired
RestHighLevelClient restHighLevelClient;
@Autowired
WorkFlowFeignService workFlowFeginService;
@Autowired
RedisUtils redisUtils;
//改造登记关系表mapper
@Autowired
private JgChangeRegistrationReformEqMapper jgChangeRegistrationReformEqMapper;
......@@ -117,22 +117,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//更名变更登记关系表mapper
@Autowired
private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
@Autowired
private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
@Autowired
private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
@Autowired
ICommonService iCommonService;
@Autowired
TzsServiceFeignClient tzsServiceFeignClient;
IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
@Autowired
ICmWorkflowService icmWorkflowService;
@Autowired
CommonServiceImpl commonService;
/**
* 新增移装变更登记
......@@ -236,29 +227,29 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (!ObjectUtils.isEmpty(province)) {
String[] provinceList = province.split("_");
if (provinceList.length > 1) {
fullAddress+=provinceList[1];
fullAddress += provinceList[1];
}
}
if (!ObjectUtils.isEmpty(city)) {
String[] cityList = city.split("_");
if (cityList.length > 1) {
fullAddress+=cityList[1];
fullAddress += cityList[1];
}
}
if (!ObjectUtils.isEmpty(county)) {
String[] countyList = county.split("_");
if (countyList.length > 1) {
fullAddress+=countyList[1];
fullAddress += countyList[1];
}
}
if (!ObjectUtils.isEmpty(street)) {
String[] streetList = street.split("_");
if (streetList.length > 1) {
fullAddress+=streetList[1];
fullAddress += streetList[1];
}
}
if (!ObjectUtils.isEmpty(address)) {
fullAddress+=address;
fullAddress += address;
}
//设备移装详细地址
oldTransfer.setFullAddress(fullAddress);
......@@ -353,7 +344,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//生成代办
this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
}
}else {
} else {
List<TaskModelDto> modelDtos = new ArrayList<>();
TaskModelDto dto = new TaskModelDto();
dto.setModel(oldTransfer);
......@@ -366,14 +357,14 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
JgChangeRegistrationTransferDto resultDto = new JgChangeRegistrationTransferDto();
Bean.copyExistPropertis(oldTransfer,resultDto);
Bean.copyExistPropertis(oldTransfer, resultDto);
//组装返回信息，添加设备信息的展示
resultDto.setEquCategory((String) tableData.get("equCategoryDesc"));
resultDto.setProductName((String) tableData.get("productName"));
resultDto.setAllAddress(oldTransfer.getFullAddress());
resultDto.setEquCode((String) tableData.get("equCode"));
resultDto.setInnerCode((String) tableData.get("useInnerCode"));
return Collections.singletonList(resultDto);
return Collections.singletonList(resultDto);
}
/**
......@@ -458,7 +449,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
jsonObject.put("taskType", BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
// 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
jsonObject.put("pageType",this.getPageTypeByCurrentNode(jgTransfer.getAuditStatus()));
jsonObject.put("pageType", this.getPageTypeByCurrentNode(jgTransfer.getAuditStatus()));
commonService.rollbackTask(instanceId, jsonObject);
}
......@@ -510,7 +501,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
// 删除待办
private void deleteTaskBatch(List<Long> ids) {
ids.forEach(id-> commonService.deleteTaskModel(id + ""));
ids.forEach(id -> commonService.deleteTaskModel(id + ""));
}
/**
......@@ -543,47 +534,52 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (!ValidationUtil.equals(FlowStatusEnum.TO_BE_FINISHED.getName(), transferById.getStatus())) {
JgRegistrationHistory historyData = jgRegistrationHistoryService.getDteailByRecord(equipId, transferById.getApplyNo());
if (!ValidationUtil.isEmpty(historyData)) {
JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
String record = newPosition.getString("record");
String receiveOrgCode = newPosition.getString("receiveOrgCode");
String equCode = newPosition.getString("equCode");
String province = newPosition.getString("province");
String city = newPosition.getString("city");
String county = newPosition.getString("county");
String street = newPosition.getString("street");
String address = newPosition.getString("address");
String longitudeLatitude = newPosition.getString("longitudeLatitude");
if (!ObjectUtils.isEmpty(record)) {
resultDataMap.put("record", record);
}
if (!ObjectUtils.isEmpty(equCode)) {
resultDataMap.put("equCode", equCode);
}
if (!ObjectUtils.isEmpty(receiveOrgCode)) {
resultDataMap.put("receiveOrgCode", receiveOrgCode);
}
// 分割省市区街道字段
if (!ObjectUtils.isEmpty(province)) {
resultDataMap.put("province", province);
}
if (!ObjectUtils.isEmpty(city)) {
resultDataMap.put("city", city);
}
if (!ObjectUtils.isEmpty(county)) {
resultDataMap.put("county", county);
}
if (!ObjectUtils.isEmpty(street)) {
resultDataMap.put("street", street);
}
if (!ObjectUtils.isEmpty(address)) {
resultDataMap.put("address", address);
}
if (!ObjectUtils.isEmpty(longitudeLatitude)) {
resultDataMap.put("longitudeLatitude", JSON.parseObject(longitudeLatitude));
}
Map<String,Object> newPosition = JSON.parseObject(historyData.getChangeData(),Map.class);
resultDataMap.putAll(newPosition);
// String record = newPosition.getString("record");
// String receiveOrgCode = newPosition.getString("receiveOrgCode");
// String equCode = newPosition.getString("equCode");
// String province = newPosition.getString("province");
// String city = newPosition.getString("city");
// String county = newPosition.getString("county");
// String street = newPosition.getString("street");
// String address = newPosition.getString("address");
// String longitudeLatitude = newPosition.getString("longitudeLatitude");
// if (!ObjectUtils.isEmpty(record)) {
// resultDataMap.put("record", record);
// }
// if (!ObjectUtils.isEmpty(equCode)) {
// resultDataMap.put("equCode", equCode);
// }
// if (!ObjectUtils.isEmpty(receiveOrgCode)) {
// resultDataMap.put("receiveOrgCode", receiveOrgCode);
// }
//
// // 分割省市区街道字段
// if (!ObjectUtils.isEmpty(province)) {
// resultDataMap.put("province", province);
// }
// if (!ObjectUtils.isEmpty(city)) {
// resultDataMap.put("city", city);
// }
// if (!ObjectUtils.isEmpty(county)) {
// resultDataMap.put("county", county);
// }
// if (!ObjectUtils.isEmpty(street)) {
// resultDataMap.put("street", street);
// }
// if (!ObjectUtils.isEmpty(address)) {
// resultDataMap.put("address", address);
// }
// if (!ObjectUtils.isEmpty(longitudeLatitude)) {
// resultDataMap.put("longitudeLatitude", JSON.parseObject(longitudeLatitude));
// }
}
} else {
JgRegistrationHistory historyData = jgRegistrationHistoryService.getDteailByRecord(equipId, transferById.getApplyNo());
Map<String,Object> newPosition = JSON.parseObject(historyData.getChangeData(),Map.class);
resultDataMap.putAll(newPosition);
//设备注册信息
IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", equipId));
//使用信息详情
......@@ -792,12 +788,31 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
// 更新设备移装位置使用信息
if (!ValidationUtil.isEmpty(newData)) {
JSONObject newPosition = JSON.parseObject(newData.getChangeData());
String province = newPosition.getString("province");
String city = newPosition.getString("city");
String county = newPosition.getString("county");
String street = newPosition.getString("street");
String address = newPosition.getString("address");
String longitudeLatitude = newPosition.getString("longitudeLatitude");
//省
String province = newPosition.getString("tansferProvince");
//市
String city = newPosition.getString("transferCity");
//区县
String county = newPosition.getString("transferCounty");
//街道
String street = newPosition.getString("transferStreet");
//地址
String address = newPosition.getString("transferAddress");
//经纬度
String longitudeLatitude = newPosition.getString("transferLongitudeLatitude");
//使用场所
String usePlace = newPosition.getString("transferUsePlace");
//所属监管单位
String supervisionUnit = newPosition.getString("transferSupervisionUnit");
//是否西咸
String isXixian = newPosition.getString("transferIsXixian");
//安全管理员
String safetyManager = newPosition.getString("transferSafetyManager");
//产权单位
String transferUseInfo = newPosition.getString("transferUseInfo");
//安全管理员电话
String phone = newPosition.getString("transferPhone");
// 分割省市区街道字段
if (!ObjectUtils.isEmpty(province)) {
String[] provinceList = province.split("_");
......@@ -833,6 +848,41 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (!ObjectUtils.isEmpty(longitudeLatitude)) {
useInfo.setLongitudeLatitude(longitudeLatitude);
}
if(!ObjectUtils.isEmpty(usePlace)){
useInfo.setUsePlace(usePlace);
}
if(!ObjectUtils.isEmpty(isXixian)){
useInfo.setIsNotXiXian(isXixian);
}
if(!ObjectUtils.isEmpty(safetyManager)){
String[] safetyManagerList = safetyManager.split("_");
if (safetyManagerList.length>1){
useInfo.setSafetyManagerId(safetyManagerList[0]);
useInfo.setSafetyManager(safetyManagerList[1]);
}
}
if(!ObjectUtils.isEmpty(phone)){
useInfo.setPhone(phone);
}
if(!ObjectUtils.isEmpty(transferUseInfo)){
String[] useInfoList = transferUseInfo.split("_");
if(useInfoList.length>1){
useInfo.setEstateUnitCreditCode(useInfoList[0]);
useInfo.setEstateUnitName(useInfoList[1]);
}
}
IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
if(!ObjectUtils.isEmpty(supervisionUnit)){
String[] supervisionUnitList = supervisionUnit.split("_");
if(supervisionUnitList.length>1){
idxBizJgSupervisionInfo.setOrgBranchCode(supervisionUnitList[0]);
idxBizJgSupervisionInfo.setOrgBranchName(supervisionUnitList[1]);
LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda().eq(IdxBizJgSupervisionInfo::getRecord,record);
idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
}
}
useInfoService.saveOrUpdateData(useInfo);
}
}
......@@ -873,27 +923,34 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
String newLongitudeLatitude = "";
if (!ValidationUtil.isEmpty(newData)) {
JSONObject newPosition = JSON.parseObject(newData.getChangeData());
String province = newPosition.getString("province");
String city = newPosition.getString("city");
String county = newPosition.getString("county");
String address = newPosition.getString("address");
String province = newPosition.getString("transferProvince");
String city = newPosition.getString("transferCity");
String county = newPosition.getString("transferCounty");
String street = newPosition.getString("transferStreet");
String address = newPosition.getString("transferAddress");
String longitudeLatitude = newPosition.getString("longitudeLatitude");
// 分割省市区街道字段
if (!ObjectUtils.isEmpty(province)) {
String[] provinceList = province.split("_");
if (provinceList.length > 1) {
newUsePlace += provinceList[1]+"/";
newUsePlace += provinceList[1] + "/";
}
}
if (!ObjectUtils.isEmpty(city)) {
String[] cityList = city.split("_");
if (cityList.length > 1) {
newUsePlace += cityList[1]+"/";
newUsePlace += cityList[1] + "/";
}
}
if (!ObjectUtils.isEmpty(county)) {
String[] countyList = county.split("_");
if (countyList.length > 1) {
newUsePlace += countyList[1]+ "/";
}
}
if (!ObjectUtils.isEmpty(street)) {
String[] countyList = street.split("_");
if (countyList.length > 1) {
newUsePlace += countyList[1];
}
}
......@@ -984,11 +1041,11 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
if (!ValidationUtil.isEmpty(transferHistory)) {
String fullAddress = "";
JSONObject newPosition = JSON.parseObject(transferHistory.getChangeData());
String province = newPosition.getString("province");
String city = newPosition.getString("city");
String county = newPosition.getString("county");
String street = newPosition.getString("street");
String address = newPosition.getString("address");
String province = newPosition.getString("transferProvince");
String city = newPosition.getString("transferCity");
String county = newPosition.getString("transferCounty");
String street = newPosition.getString("transferStreet");
String address = newPosition.getString("transferAddress");
// 分割省市区街道字段
if (!ObjectUtils.isEmpty(province)) {
......@@ -1169,10 +1226,10 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
private String getPageTypeByCurrentNode(String auditStatus) {
if(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass().equals(auditStatus) ||
if (WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack().equals(auditStatus)
){
) {
// urlInfo.json 文件的 pageType
return "edit";
} else {
......@@ -1180,4 +1237,34 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
return "look";
}
}
public Map<String, Object> getDetailFieldCamelCase( String record) {
Map<String, Object> result = new HashMap<>();
result = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);
//移装变更-省份回显
result.put("transferProvince",result.get("province"));
//移装变更-市回显
result.put("transferCity",result.get("city"));
//移装变更-区回显
result.put("transferCounty",result.get("county"));
//移装变更-街道回显
result.put("transferStreet",result.get("factoryUseSiteStreet")+"_"+result.get("streetName"));
//移装变更-移装场所
result.put("transferUsePlace",result.get("usePlace"));
//移装变更-详细地址
result.put("transferAddress",result.get("useAddress"));
//移装变更-经纬度
result.put("transferLongitudeLatitude",result.get("longitudeLatitude"));
//移装变更-所属监管单位
result.put("transferSupervisionUnit",result.get("orgBranchCode")+"_"+result.get("orgBranchName"));
//移装变更-所属经营单位
result.put("transferIsXixian",result.get("isNotXiXian"));
//移装变更-安全管理员
result.put("transferSafetyManager",result.get("safetyManagerId")+"_"+result.get("safetyManager"));
//移装变更-电话
result.put("transferPhone",result.get("phone"));
//移装变更-产权单位
result.put("transferUseInfo",result.get("estateUnitCreditCode")+"_"+result.get("estateUnitName"));
return result;
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
View file @ aea4b4e7
......@@ -122,9 +122,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 安全管理员
if (map.containsKey("safetyManagerName")) {
map.put("safetyManager", map.get("safetyManagerName"));
map.put("safetyManagerId", map.get("safetyManagerId"));
}
IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
BeanUtil.copyProperties(map, useInfo);
if(map.containsKey("isXixian")){
useInfo.setIsNotXiXian(map.get("isXixian").toString());
}
// 城市
if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
city.forEach(item -> {
......@@ -231,6 +236,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 安全管理员
if (map.containsKey("safetyManager")) {
String[] data = String.valueOf(map.getString("safetyManager")).split("_");
map.put("safetyManagerId",data[0]);
map.put("safetyManagerName", data[1]);
}
// 使用单位提交
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java
View file @ aea4b4e7
......@@ -221,6 +221,14 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
@TableField("\"IS_NOT_XIXIAN\"")
private String isNotXiXian;
@TableField("\"STREET_NAME\"")
private String streetName;
/**
*
*/
@TableField("\"SAFETY_MANAGER_ID\"")
private String safetyManagerId;
}
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