java110-db/src/main/resources/mapper/store/StoreAttrServiceDaoImplMapper.xml
@@ -76,6 +76,12 @@ </insert> <!-- 保存商户属性信息 add by wuxw 2018-07-03 --> <insert id="saveStoreAttrInfo" parameterType="Map"> insert into s_store_attr(attr_id,spec_cd,store_id,b_id,value) values (#{attrId},#{specCd},#{storeId},'-1',#{value}) </insert> <!-- 查询商户属性信息 add by wuxw 2018-07-03 --> <select id="getStoreAttrInfo" parameterType="Map" resultType="Map"> java110-interface/src/main/java/com/java110/intf/store/IStoreAttrInnerServiceSMO.java
@@ -2,6 +2,7 @@ import com.java110.config.feign.FeignConfiguration; import com.java110.dto.store.StoreAttrDto; import com.java110.po.store.StoreAttrPo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,6 +31,33 @@ */ @RequestMapping(value = "/queryStoreAttrs", method = RequestMethod.POST) List<StoreAttrDto> queryStoreAttrs(@RequestBody StoreAttrDto storeAttrDto); /** * <p>查询小区楼信息</p> * * * @param storeAttrPo 数据对象分享 * @return StoreAttrDto 对象数据 */ @RequestMapping(value = "/saveStoreAttrInfoInstance", method = RequestMethod.POST) int saveStoreAttrInfoInstance(@RequestBody StoreAttrPo storeAttrPo); /** * <p>查询小区楼信息</p> * * * @param storeAttrPo 数据对象分享 * @return StoreAttrDto 对象数据 */ @RequestMapping(value = "/saveStoreAttrInfo", method = RequestMethod.POST) int saveStoreAttrInfo(@RequestBody StoreAttrPo storeAttrPo); /** * <p>查询小区楼信息</p> * * * @param storeAttrPo 数据对象分享 * @return StoreAttrDto 对象数据 */ @RequestMapping(value = "/updateStoreAttrInfoInstance", method = RequestMethod.POST) int updateStoreAttrInfoInstance(@RequestBody StoreAttrPo storeAttrPo); /** * 查询<p>小区楼</p>总记录数 java110-interface/src/main/java/com/java110/intf/user/IUserAttrInnerServiceSMO.java
@@ -48,4 +48,12 @@ */ @RequestMapping(value = "/saveUserAttr", method = RequestMethod.POST) int saveUserAttr(@RequestBody UserAttrPo userAttrPo); /** * 查询<p>小区楼</p>总记录数 * * @param userAttrPo 数据对象分享 * @return 小区下的小区楼记录数 */ @RequestMapping(value = "/updateUserAttrInfoInstance", method = RequestMethod.POST) int updateUserAttrInfoInstance(@RequestBody UserAttrPo userAttrPo); } service-job/src/main/java/com/java110/job/adapt/hcGov/staff/AddStaffCompanyToHcGovReturnAdapt.java
New file @@ -0,0 +1,128 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.job.adapt.hcGov.staff; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.RoomAttrDto; import com.java110.dto.hcGovTranslate.HcGovTranslateDto; import com.java110.dto.reportData.ReportDataDto; import com.java110.dto.store.StoreAttrDto; import com.java110.dto.store.StoreUserDto; import com.java110.dto.user.UserAttrDto; import com.java110.intf.common.IHcGovTranslateInnerServiceSMO; import com.java110.intf.community.IRoomAttrInnerServiceSMO; import com.java110.intf.store.IStoreAttrInnerServiceSMO; import com.java110.intf.store.IStoreInnerServiceSMO; import com.java110.intf.user.IUserAttrInnerServiceSMO; import com.java110.job.adapt.hcGov.HcGovConstant; import com.java110.job.adapt.hcGov.IReportReturnDataAdapt; import com.java110.po.room.RoomAttrPo; import com.java110.po.store.StoreAttrPo; import com.java110.po.userAttr.UserAttrPo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; /** * 新增房屋同步HC政务接口 返回 * <p> * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0 * * @desc add by 吴学文 16:20 */ @Component(value = "ADD_COMPANY_RETURN") public class AddStaffCompanyToHcGovReturnAdapt implements IReportReturnDataAdapt { @Autowired private IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl; @Autowired private IUserAttrInnerServiceSMO userAttrInnerServiceSMOImpl; @Autowired private IHcGovTranslateInnerServiceSMO hcGovTranslateInnerServiceSMOImpl; @Autowired private IStoreInnerServiceSMO storeInnerServiceSMOImpl; @Override public void reportReturn(ReportDataDto reportDataDto, String extCommunityId) { HcGovTranslateDto hcGovTranslateDto = new HcGovTranslateDto(); hcGovTranslateDto.setTranId(reportDataDto.getReportDataHeaderDto().getTranId()); hcGovTranslateDto.setServiceCode(reportDataDto.getReportDataHeaderDto().getServiceCode()); List<HcGovTranslateDto> hcGovTranslateDtos = hcGovTranslateInnerServiceSMOImpl.queryHcGovTranslates(hcGovTranslateDto); if (hcGovTranslateDtos == null || hcGovTranslateDtos.size() < 1) { throw new IllegalArgumentException("查询推送报文失败。不是同一订单信息"); } //根据用户ID查询商户信息 StoreUserDto storeUserDto = new StoreUserDto(); storeUserDto.setUserId(hcGovTranslateDtos.get(0).getObjId()); List<StoreUserDto> storeUserDtos = storeInnerServiceSMOImpl.getStoreUserInfo(storeUserDto); if (storeUserDtos == null || storeUserDtos.size() < 1) { throw new IllegalArgumentException("查询员工所属的企业信息失败！"); } StoreAttrDto storeAttrDto = new StoreAttrDto(); storeAttrDto.setStoreId(storeUserDtos.get(0).getStoreId()); storeAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID); List<StoreAttrDto> storeAttrDtos = storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto); StoreAttrPo storeAttrPo = new StoreAttrPo(); storeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_storeId)); storeAttrPo.setStoreId(storeAttrDto.getStoreId()); storeAttrPo.setSpecCd(storeAttrDto.getSpecCd()); storeAttrPo.setValue(reportDataDto.getReportDataBodyDto().getString("extCompanyId")); if (storeAttrDtos == null || storeAttrDtos.size() < 1) { int flag = storeAttrInnerServiceSMOImpl.saveStoreAttrInfo(storeAttrPo); if (flag < 1) { throw new IllegalArgumentException("保存商户属性失败"); } } else { storeAttrPo.setAttrId(storeAttrDtos.get(0).getAttrId()); int flag = storeAttrInnerServiceSMOImpl.updateStoreAttrInfoInstance(storeAttrPo); if (flag < 1) { throw new IllegalArgumentException("修改商户属性失败"); } } UserAttrDto userAttrDto = new UserAttrDto(); userAttrDto.setUserId(hcGovTranslateDtos.get(0).getObjId()); userAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID); List<UserAttrDto> userAttrDtos = userAttrInnerServiceSMOImpl.queryUserAttrs(userAttrDto); UserAttrPo userAttrPo = new UserAttrPo(); userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId)); userAttrPo.setUserId(userAttrDto.getUserId()); userAttrPo.setSpecCd(userAttrDto.getSpecCd()); userAttrDto.setValue(reportDataDto.getReportDataBodyDto().getString("extPersonId")); if (userAttrDtos == null || userAttrDtos.size() < 1) { int flag = userAttrInnerServiceSMOImpl.saveUserAttr(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("保存员工属性失败"); } } else { userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId()); int flag = userAttrInnerServiceSMOImpl.updateUserAttrInfoInstance(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("修改员工属性失败"); } } } } service-job/src/main/java/com/java110/job/adapt/hcGov/staff/AddStaffToHcGovAdapt.java
@@ -131,10 +131,10 @@ ACTION_TYPE=HcGovConstant.ADD_COMPANY_ACTION; } body.put("staffInfo", getCarateStaffInfo(userPo)); body.put("staffInfo", getCarateStaffInfo(userPo,extCompanyId)); JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, "622021090866160001", ACTION_TYPE, HcGovConstant.COMMUNITY_SECURE); baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, "622021090866160001", SoreId, HcGovConstant.COMMUNITY_SECURE); baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, "622021090866160001", userPo.getUserId(), HcGovConstant.COMMUNITY_SECURE); } public void getCommunityExtId(List<CommunityMemberDto> communityMemberDtos, JSONArray extCommunityId) { @@ -162,15 +162,15 @@ } } private JSONObject getCarateStaffInfo(UserPo userPo) { private JSONObject getCarateStaffInfo(UserPo userPo,String extCompanyId) { String orgName = ""; String relCd = ""; JSONObject staffInfo = new JSONObject(); staffInfo.put("PersonName", userPo.getName()); staffInfo.put("PersonTel", userPo.getTel()); staffInfo.put("PersonSex", userPo.getSex()); staffInfo.put("personName", userPo.getName()); staffInfo.put("personTel", userPo.getTel()); staffInfo.put("personSex", userPo.getSex()); staffInfo.put("prePersonName", userPo.getName()); OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto(); @@ -187,6 +187,9 @@ } staffInfo.put("govOrgName", orgName); staffInfo.put("relCd", relCd); if(!StringUtil.isEmpty(extCompanyId)){ staffInfo.put("extCompanyId",extCompanyId); } return staffInfo; } service-job/src/main/java/com/java110/job/adapt/hcGov/staff/AddStaffToHcGovReturnAdapt.java
New file @@ -0,0 +1,94 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.job.adapt.hcGov.staff; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.hcGovTranslate.HcGovTranslateDto; import com.java110.dto.reportData.ReportDataDto; import com.java110.dto.store.StoreAttrDto; import com.java110.dto.store.StoreUserDto; import com.java110.dto.user.UserAttrDto; import com.java110.intf.common.IHcGovTranslateInnerServiceSMO; import com.java110.intf.store.IStoreAttrInnerServiceSMO; import com.java110.intf.store.IStoreInnerServiceSMO; import com.java110.intf.user.IUserAttrInnerServiceSMO; import com.java110.job.adapt.hcGov.HcGovConstant; import com.java110.job.adapt.hcGov.IReportReturnDataAdapt; import com.java110.po.store.StoreAttrPo; import com.java110.po.userAttr.UserAttrPo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; /** * 新增房屋同步HC政务接口 返回 * <p> * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0 * * @desc add by 吴学文 16:20 */ @Component(value = "ADD_STAFF_RETURN") public class AddStaffToHcGovReturnAdapt implements IReportReturnDataAdapt { @Autowired private IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl; @Autowired private IUserAttrInnerServiceSMO userAttrInnerServiceSMOImpl; @Autowired private IHcGovTranslateInnerServiceSMO hcGovTranslateInnerServiceSMOImpl; @Autowired private IStoreInnerServiceSMO storeInnerServiceSMOImpl; @Override public void reportReturn(ReportDataDto reportDataDto, String extCommunityId) { HcGovTranslateDto hcGovTranslateDto = new HcGovTranslateDto(); hcGovTranslateDto.setTranId(reportDataDto.getReportDataHeaderDto().getTranId()); hcGovTranslateDto.setServiceCode(reportDataDto.getReportDataHeaderDto().getServiceCode()); List<HcGovTranslateDto> hcGovTranslateDtos = hcGovTranslateInnerServiceSMOImpl.queryHcGovTranslates(hcGovTranslateDto); if (hcGovTranslateDtos == null || hcGovTranslateDtos.size() < 1) { throw new IllegalArgumentException("查询推送报文失败。不是同一订单信息"); } UserAttrDto userAttrDto = new UserAttrDto(); userAttrDto.setUserId(hcGovTranslateDtos.get(0).getObjId()); userAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID); List<UserAttrDto> userAttrDtos = userAttrInnerServiceSMOImpl.queryUserAttrs(userAttrDto); UserAttrPo userAttrPo = new UserAttrPo(); userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId)); userAttrPo.setUserId(userAttrDto.getUserId()); userAttrPo.setSpecCd(userAttrDto.getSpecCd()); userAttrDto.setValue(reportDataDto.getReportDataBodyDto().getString("extPersonId")); if (userAttrDtos == null || userAttrDtos.size() < 1) { int flag = userAttrInnerServiceSMOImpl.saveUserAttr(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("保存员工属性失败"); } } else { userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId()); int flag = userAttrInnerServiceSMOImpl.updateUserAttrInfoInstance(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("修改员工属性失败"); } } } } service-job/src/main/java/com/java110/job/adapt/hcGov/staff/EditStaffToHcGovAdapt.java
New file @@ -0,0 +1,237 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.job.adapt.hcGov.staff; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.java110.dto.CommunityMemberDto; import com.java110.dto.community.CommunityAttrDto; import com.java110.dto.community.CommunityDto; import com.java110.dto.org.OrgDto; import com.java110.dto.org.OrgStaffRelDto; import com.java110.dto.store.StoreAttrDto; import com.java110.dto.store.StoreUserDto; import com.java110.entity.order.Business; import com.java110.intf.community.ICommunityInnerServiceSMO; import com.java110.intf.store.IStoreAttrInnerServiceSMO; import com.java110.intf.store.IStoreInnerServiceSMO; import com.java110.intf.user.IOrgInnerServiceSMO; import com.java110.intf.user.IOrgStaffRelInnerServiceSMO; import com.java110.job.adapt.DatabusAdaptImpl; import com.java110.job.adapt.hcGov.HcGovConstant; import com.java110.job.adapt.hcGov.asyn.BaseHcGovSendAsyn; import com.java110.po.user.UserPo; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; /** * 新增业主信息同步HC政务接口 * <p> * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0 * * @desc add by 吴学文 16:20 */ @Component(value = "editStaffToHcGovAdapt") public class EditStaffToHcGovAdapt extends DatabusAdaptImpl { @Autowired private ICommunityInnerServiceSMO communityInnerServiceSMOImpl; @Autowired private BaseHcGovSendAsyn baseHcGovSendAsynImpl; @Autowired private IStoreInnerServiceSMO storeInnerServiceSMOImpl; @Autowired private IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl; @Autowired private IOrgStaffRelInnerServiceSMO orgStaffRelInnerServiceSMOImpl; @Autowired private IOrgInnerServiceSMO orgInnerServiceSMOImpl; /** * @param business 当前处理业务 * @param businesses 所有业务信息 */ @Override public void execute(Business business, List<Business> businesses) { JSONObject data = business.getData(); if (data.containsKey(UserPo.class.getSimpleName())) { Object bObj = data.get(UserPo.class.getSimpleName()); JSONArray businessUserPo = null; if (bObj instanceof JSONObject) { businessUserPo = new JSONArray(); businessUserPo.add(bObj); } else if (bObj instanceof List) { businessUserPo = JSONArray.parseArray(JSONObject.toJSONString(bObj)); } else { businessUserPo = (JSONArray) bObj; } //JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar"); for (int bUserIndex = 0; bUserIndex < businessUserPo.size(); bUserIndex++) { JSONObject businessUserCar = businessUserPo.getJSONObject(bUserIndex); doAddUser(business, businessUserCar); } } } private void doAddUser(Business business, JSONObject businessUserCar) { UserPo userPo = BeanConvertUtil.covertBean(businessUserCar, UserPo.class); StoreUserDto storeUserDto = new StoreUserDto(); storeUserDto.setUserId(userPo.getUserId()); List<StoreUserDto> storeUserDtos = storeInnerServiceSMOImpl.getStoreUserInfo(storeUserDto); if (storeUserDtos == null || storeUserDtos.size() < 1) { return; } storeUserDto = storeUserDtos.get(0); String extCompanyId = ""; String ACTION_TYPE = HcGovConstant.EDIT_STAFF_ACTION; String SoreId = storeUserDto.getStoreId(); //查询商户对应的小区外部编码 CommunityMemberDto communityMemberDto = new CommunityMemberDto(); communityMemberDto.setMemberId(SoreId); List<CommunityMemberDto> communityMemberDtos = communityInnerServiceSMOImpl.getCommunityMembers(communityMemberDto); JSONArray extCommunityId = new JSONArray(); //获取商户对应所有小区的外部编码 getCommunityExtId(communityMemberDtos, extCommunityId); if (extCommunityId == null || extCommunityId.size() < 1) { return; } StoreAttrDto storeAttrDto = new StoreAttrDto(); //查询商户属性 外部编码 storeAttrDto.setStoreId(SoreId); storeAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID); List<StoreAttrDto> storeAttrDtos = storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto); if (storeAttrDtos != null && storeAttrDtos.size() > 0) { extCompanyId = storeAttrDtos.get(0).getValue(); } if (StringUtil.isEmpty(extCompanyId)) { return; } JSONObject body = new JSONObject(); body.put("staffInfo", getCarateStaffInfo(userPo,extCompanyId)); JSONObject kafkaData = baseHcGovSendAsynImpl.createHeadersOrBody(body, "622021090866160001", ACTION_TYPE, HcGovConstant.COMMUNITY_SECURE); baseHcGovSendAsynImpl.sendKafka(HcGovConstant.GOV_TOPIC, kafkaData, "622021090866160001", userPo.getUserId(), HcGovConstant.COMMUNITY_SECURE); } public void getCommunityExtId(List<CommunityMemberDto> communityMemberDtos, JSONArray extCommunityId) { if (communityMemberDtos == null || communityMemberDtos.size() == 0) { return; } for (CommunityMemberDto communityMember : communityMemberDtos) { CommunityDto communityDto = new CommunityDto(); communityDto.setCommunityId(communityMember.getCommunityId()); List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto); if (communityDtos == null || communityDtos.size() == 0) { continue; } extracted(extCommunityId, communityDtos); } } private void extracted(JSONArray extCommunityId, List<CommunityDto> communityDtos) { for (CommunityDto community : communityDtos) { for (CommunityAttrDto communityAttrDto : community.getCommunityAttrDtos()) { if (HcGovConstant.EXT_COMMUNITY_ID.equals(communityAttrDto.getSpecCd())) { extCommunityId.add(communityAttrDto.getValue()); } } } } private JSONObject getCarateStaffInfo(UserPo userPo,String extCompanyId) { String orgName = ""; String relCd = ""; JSONObject staffInfo = new JSONObject(); staffInfo.put("personName", userPo.getName()); staffInfo.put("personTel", userPo.getTel()); staffInfo.put("personSex", userPo.getSex()); staffInfo.put("prePersonName", userPo.getName()); OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto(); orgStaffRelDto.setStaffId(userPo.getUserId()); List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelInnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto); if (orgStaffRelDtos != null || orgStaffRelDtos.size() > 0) { OrgDto orgDto = new OrgDto(); orgDto.setOrgId(orgStaffRelDtos.get(0).getOrgId()); List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto); if (orgDtos != null || orgDtos.size() > 0) { orgName = orgDtos.get(0).getOrgName(); } relCd = orgStaffRelDtos.get(0).getRelCd(); } staffInfo.put("govOrgName", orgName); staffInfo.put("relCd", relCd); staffInfo.put("extCompanyId",extCompanyId); return staffInfo; } private JSONObject getCarateStoreInfo(String SoreId, StoreUserDto storeUserDto) { String artificialPerson = ""; String registerTime = ""; String idCard = ""; JSONObject companyInfo = new JSONObject(); StoreAttrDto storeAttrDto = new StoreAttrDto(); //查询商户属性 企业法人 storeAttrDto.setStoreId(SoreId); storeAttrDto.setSpecCd(HcGovConstant.STORE_ATTR_ARTIFICIALPERSON); List<StoreAttrDto> storeAttrDtos = storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto); if (storeAttrDtos != null && storeAttrDtos.size() > 0) { artificialPerson = storeAttrDtos.get(0).getValue(); } //查询商户属性 成立日期 storeAttrDto.setStoreId(SoreId); storeAttrDto.setSpecCd(HcGovConstant.STORE_ATTR_REGISTERTIME); storeAttrDtos = storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto); if (storeAttrDtos != null && storeAttrDtos.size() > 0) { registerTime = storeAttrDtos.get(0).getValue(); } //查询商户属性 营业执照 storeAttrDto.setStoreId(SoreId); storeAttrDto.setSpecCd(HcGovConstant.STORE_ATTR_IDCARD); storeAttrDtos = storeAttrInnerServiceSMOImpl.queryStoreAttrs(storeAttrDto); if (storeAttrDtos != null && storeAttrDtos.size() > 0) { idCard = storeAttrDtos.get(0).getValue(); } companyInfo.put("companyName", storeUserDto.getName()); companyInfo.put("companyType", "2002"); companyInfo.put("idCard", idCard); companyInfo.put("artificialPerson", artificialPerson); companyInfo.put("companyAddress", storeUserDto.getAddress()); companyInfo.put("registerTime", registerTime); companyInfo.put("personName", artificialPerson); companyInfo.put("personTel", storeUserDto.getTel()); companyInfo.put("personIdCard", idCard); return companyInfo; } } service-job/src/main/java/com/java110/job/adapt/hcGov/staff/EditStaffToHcGovReturnAdapt.java
New file @@ -0,0 +1,91 @@ /* * Copyright 2017-2020 吴学文 and java110 team. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.java110.job.adapt.hcGov.staff; import com.java110.core.factory.GenerateCodeFactory; import com.java110.dto.hcGovTranslate.HcGovTranslateDto; import com.java110.dto.reportData.ReportDataDto; import com.java110.dto.user.UserAttrDto; import com.java110.intf.common.IHcGovTranslateInnerServiceSMO; import com.java110.intf.store.IStoreAttrInnerServiceSMO; import com.java110.intf.store.IStoreInnerServiceSMO; import com.java110.intf.user.IUserAttrInnerServiceSMO; import com.java110.job.adapt.hcGov.HcGovConstant; import com.java110.job.adapt.hcGov.IReportReturnDataAdapt; import com.java110.po.userAttr.UserAttrPo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; /** * 新增房屋同步HC政务接口 返回 * <p> * 接口协议地址： https://gitee.com/java110/microCommunityInformation/tree/master/info-doc#1%E6%A5%BC%E6%A0%8B%E4%B8%8A%E4%BC%A0 * * @desc add by 吴学文 16:20 */ @Component(value = "EDIT_STAFF_RETURN") public class EditStaffToHcGovReturnAdapt implements IReportReturnDataAdapt { @Autowired private IStoreAttrInnerServiceSMO storeAttrInnerServiceSMOImpl; @Autowired private IUserAttrInnerServiceSMO userAttrInnerServiceSMOImpl; @Autowired private IHcGovTranslateInnerServiceSMO hcGovTranslateInnerServiceSMOImpl; @Autowired private IStoreInnerServiceSMO storeInnerServiceSMOImpl; @Override public void reportReturn(ReportDataDto reportDataDto, String extCommunityId) { HcGovTranslateDto hcGovTranslateDto = new HcGovTranslateDto(); hcGovTranslateDto.setTranId(reportDataDto.getReportDataHeaderDto().getTranId()); hcGovTranslateDto.setServiceCode(reportDataDto.getReportDataHeaderDto().getServiceCode()); List<HcGovTranslateDto> hcGovTranslateDtos = hcGovTranslateInnerServiceSMOImpl.queryHcGovTranslates(hcGovTranslateDto); if (hcGovTranslateDtos == null || hcGovTranslateDtos.size() < 1) { throw new IllegalArgumentException("查询推送报文失败。不是同一订单信息"); } UserAttrDto userAttrDto = new UserAttrDto(); userAttrDto.setUserId(hcGovTranslateDtos.get(0).getObjId()); userAttrDto.setSpecCd(HcGovConstant.EXT_COMMUNITY_ID); List<UserAttrDto> userAttrDtos = userAttrInnerServiceSMOImpl.queryUserAttrs(userAttrDto); UserAttrPo userAttrPo = new UserAttrPo(); userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userAnId)); userAttrPo.setUserId(userAttrDto.getUserId()); userAttrPo.setSpecCd(userAttrDto.getSpecCd()); userAttrDto.setValue(reportDataDto.getReportDataBodyDto().getString("extPersonId")); if (userAttrDtos == null || userAttrDtos.size() < 1) { int flag = userAttrInnerServiceSMOImpl.saveUserAttr(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("保存员工属性失败"); } } else { userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId()); int flag = userAttrInnerServiceSMOImpl.updateUserAttrInfoInstance(userAttrPo); if (flag < 1) { throw new IllegalArgumentException("修改员工属性失败"); } } } } service-store/src/main/java/com/java110/store/dao/IStoreAttrServiceDao.java
@@ -46,7 +46,13 @@ * @param info * @throws DAOException DAO异常 */ void saveStoreAttrInfoInstance(Map info) throws DAOException; int saveStoreAttrInfoInstance(Map info) throws DAOException; /** * 保存 商户属性信息 Business数据到 Instance中 * @param info * @throws DAOException DAO异常 */ int saveStoreAttrInfo(Map info) throws DAOException; @@ -67,7 +73,7 @@ * @param info 修改信息 * @throws DAOException DAO异常 */ void updateStoreAttrInfoInstance(Map info) throws DAOException; int updateStoreAttrInfoInstance(Map info) throws DAOException; /** service-store/src/main/java/com/java110/store/dao/impl/StoreAttrServiceDaoImpl.java
@@ -65,7 +65,7 @@ * @throws DAOException DAO异常 */ @Override public void saveStoreAttrInfoInstance(Map info) throws DAOException { public int saveStoreAttrInfoInstance(Map info) throws DAOException { logger.debug("保存商户属性信息Instance 入参 info : {}",info); int saveFlag = sqlSessionTemplate.insert("storeAttrServiceDaoImpl.saveStoreAttrInfoInstance",info); @@ -73,6 +73,24 @@ if(saveFlag < 1){ throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存商户属性信息Instance数据失败："+ JSONObject.toJSONString(info)); } return saveFlag; } /** * 保存商户属性信息 到 instance * @param info bId 信息 * @throws DAOException DAO异常 */ @Override public int saveStoreAttrInfo(Map info) throws DAOException { logger.debug("保存商户属性信息Instance 入参 info : {}",info); int saveFlag = sqlSessionTemplate.insert("storeAttrServiceDaoImpl.saveStoreAttrInfo",info); if(saveFlag < 1){ throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存商户属性信息Instance数据失败："+ JSONObject.toJSONString(info)); } return saveFlag; } @@ -98,7 +116,7 @@ * @throws DAOException DAO异常 */ @Override public void updateStoreAttrInfoInstance(Map info) throws DAOException { public int updateStoreAttrInfoInstance(Map info) throws DAOException { logger.debug("修改商户属性信息Instance 入参 info : {}",info); int saveFlag = sqlSessionTemplate.update("storeAttrServiceDaoImpl.updateStoreAttrInfoInstance",info); @@ -106,6 +124,7 @@ if(saveFlag < 1){ throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改商户属性信息Instance数据失败："+ JSONObject.toJSONString(info)); } return saveFlag; } /** service-store/src/main/java/com/java110/store/smo/impl/StoreAttrInnerServiceSMOImpl.java
@@ -2,6 +2,8 @@ import com.java110.dto.store.StoreAttrDto; import com.java110.po.contractAttr.ContractAttrPo; import com.java110.po.store.StoreAttrPo; import com.java110.store.dao.IStoreAttrServiceDao; import com.java110.utils.util.BeanConvertUtil; import com.java110.core.base.smo.BaseServiceSMO; @@ -51,6 +53,27 @@ return storeAttrs; } @Override public int saveStoreAttrInfoInstance(@RequestBody StoreAttrPo storeAttrPo) { int saveFlag = storeAttrServiceDaoImpl.saveStoreAttrInfoInstance(BeanConvertUtil.beanCovertMap(storeAttrPo)); return saveFlag; } @Override public int saveStoreAttrInfo(@RequestBody StoreAttrPo storeAttrPo) { int saveFlag = storeAttrServiceDaoImpl.saveStoreAttrInfo(BeanConvertUtil.beanCovertMap(storeAttrPo)); return saveFlag; } @Override public int updateStoreAttrInfoInstance(@RequestBody StoreAttrPo storeAttrPo) { int saveFlag = storeAttrServiceDaoImpl.updateStoreAttrInfoInstance(BeanConvertUtil.beanCovertMap(storeAttrPo)); return saveFlag; } @Override public int queryStoreAttrsCount(@RequestBody StoreAttrDto storeAttrDto) { service-user/src/main/java/com/java110/user/dao/IUserAttrServiceDao.java
@@ -67,7 +67,7 @@ * @param info 修改信息 * @throws DAOException DAO异常 */ void updateUserAttrInfoInstance(Map info) throws DAOException; int updateUserAttrInfoInstance(Map info) throws DAOException; /** service-user/src/main/java/com/java110/user/dao/impl/UserAttrServiceDaoImpl.java
@@ -99,7 +99,7 @@ * @throws DAOException DAO异常 */ @Override public void updateUserAttrInfoInstance(Map info) throws DAOException { public int updateUserAttrInfoInstance(Map info) throws DAOException { logger.debug("修改用户属性信息Instance 入参 info : {}",info); int saveFlag = sqlSessionTemplate.update("userAttrServiceDaoImpl.updateUserAttrInfoInstance",info); @@ -107,6 +107,7 @@ if(saveFlag < 1){ throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改用户属性信息Instance数据失败："+ JSONObject.toJSONString(info)); } return saveFlag; } /** service-user/src/main/java/com/java110/user/smo/impl/UserAttrInnerServiceSMOImpl.java
@@ -99,6 +99,10 @@ public int saveUserAttr(@RequestBody UserAttrPo userAttrPo) { return userAttrServiceDaoImpl.saveUserAttr(BeanConvertUtil.beanCovertMap(userAttrPo)); } @Override public int updateUserAttrInfoInstance(@RequestBody UserAttrPo userAttrPo) { return userAttrServiceDaoImpl.updateUserAttrInfoInstance(BeanConvertUtil.beanCovertMap(userAttrPo)); } public IUserAttrServiceDao getUserAttrServiceDaoImpl() { return userAttrServiceDaoImpl;
