提交单位信息后台代码

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireCompanyInfoDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoDto
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FireCompanyInfoDto", description = "公司信息表")
+public class FireCompanyInfoDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人员部门公司表主键")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "占地面积")
+    private String floorSpace;
+
+    @ApiModelProperty(value = "负荷等级")
+    private String loadLevel;
+
+    @ApiModelProperty(value = "室内管网形式")
+    private String indoorPipeNetworkType;
+
+    @ApiModelProperty(value = "室外管网形式")
+    private String outdoorPipeNetworkType;
+
+    @ApiModelProperty(value = "安全出口总数")
+    private String exitNum;
+
+    @ApiModelProperty(value = "疏散楼梯数")
+    private String stairsNum;
+
+    @ApiModelProperty(value = "毗邻单位东")
+    private String positionInfoEast;
+
+    @ApiModelProperty(value = "毗邻单位西")
+    private String positionInfoWest;
+
+    @ApiModelProperty(value = "毗邻单位南")
+    private String positionInfoSouth;
+
+    @ApiModelProperty(value = "毗邻单位北")
+    private String positionInfoNorth;
+
+    @ApiModelProperty(value = "消防设施平面图")
+    private String fireEquipFile;
+
+    @ApiModelProperty(value = "消防设计审核文件")
+    private String fireDesignCheckFile;
+
+    @ApiModelProperty(value = "消防设计验收文件")
+    private String fireDesignAcceptanceFile;
+
+    @ApiModelProperty(value = "消防安全检查文件")
+    private String fireSafeCheckFile;
+
+    @ApiModelProperty(value = "其他文件")
+    private String othersFile;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

@@ -89,4 +89,7 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "合同编号")
     private Long contractId;
+
+    @ApiModelProperty(value = "消防信息")
+    private FireCompanyInfoDto fireCompanyInfoDto;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/CompanyInfo.java

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: CompanyInfo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_fire_company_info")
+@ApiModel(value="CompanyInfo对象", description="公司信息")
+public class CompanyInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "人员部门公司表主键")
+    @TableField("instance_id")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "占地面积")
+    @TableField("floor_space")
+    private String floorSpace;
+
+    @ApiModelProperty(value = "负荷等级")
+    @TableField("load_level")
+    private String loadLevel;
+
+    @ApiModelProperty(value = "室内管网形式")
+    @TableField("indoor_pipe_network_type")
+    private String indoorPipeNetworkType;
+
+    @ApiModelProperty(value = "室外管网形式")
+    @TableField("outdoor_pipe_network_type")
+    private String outdoorPipeNetworkType;
+
+    @ApiModelProperty(value = "安全出口总数")
+    @TableField("exit_num")
+    private String exitNum;
+
+    @ApiModelProperty(value = "疏散楼梯数")
+    @TableField("stairs_num")
+    private String stairsNum;
+
+    @ApiModelProperty(value = "毗邻单位东")
+    @TableField("position_info_direction_east")
+    private String positionInfoEast;
+
+    @ApiModelProperty(value = "毗邻单位西")
+    @TableField("position_info_direction_west")
+    private String positionInfoWest;
+
+    @ApiModelProperty(value = "毗邻单位南")
+    @TableField("position_info_direction_south")
+    private String positionInfoSouth;
+
+    @ApiModelProperty(value = "毗邻单位北")
+    @TableField("position_info_direction_north")
+    private String positionInfoNorth;
+
+    @ApiModelProperty(value = "消防设施平面图")
+    @TableField("fire_equip_file")
+    private String fireEquipFile;
+
+    @ApiModelProperty(value = "消防设计审核文件")
+    @TableField("fire_design_check_file")
+    private String fireDesignCheckFile;
+
+    @ApiModelProperty(value = "消防设计验收文件")
+    @TableField("fire_design_acceptance_file")
+    private String fireDesignAcceptanceFile;
+
+    @ApiModelProperty(value = "消防安全检查文件")
+    @TableField("fire_safe_check_file")
+    private String fireSafeCheckFile;
+
+    @ApiModelProperty(value = "其他文件")
+    @TableField("others_file")
+    private String othersFile;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("rec_date")
+    private Date createDate;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FireCompanyInfoMapper.java

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoMapper
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:22
+ */
+public interface FireCompanyInfoMapper extends BaseMapper<CompanyInfo> {
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IFireCompanyInfoService.java

+package com.yeejoin.amos.boot.module.common.api.service;
+
+/**
+ * @author keyong
+ * @title: IFireCompanyInfoService
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:13
+ */
+public interface IFireCompanyInfoService {
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -10,7 +10,9 @@ import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,15 +44,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
@@ -114,11 +107,10 @@ public class OrgUsrController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增单位信息", notes = "新增单位信息")
-	public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo)
+	public ResponseModel<Object> saveOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto orgUsrDto)
 			throws Exception {
-		OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-
-		return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(OrgUsrVo));
+		orgUsrDto.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+		return ResponseHelper.buildResponse(iOrgUsrService.saveOrgUsr(orgUsrDto));
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireCompanyInfoServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.dto.FireCompanyInfoDto;
+import com.yeejoin.amos.boot.module.common.api.entity.CompanyInfo;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireCompanyInfoMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireCompanyInfoService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+/**
+ * @author keyong
+ * @title: FireCompanyInfoServiceImpl
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2022/4/28 15:15
+ */
+@Service
+public class FireCompanyInfoServiceImpl extends BaseService<FireCompanyInfoDto, CompanyInfo, FireCompanyInfoMapper> implements IFireCompanyInfoService {
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -16,8 +16,13 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
+import com.yeejoin.amos.boot.module.common.api.mapper.FireCompanyInfoMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IFireCompanyInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.C;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -46,29 +51,6 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
-import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
-import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
-import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserRolesEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserUnitTypeEnum;
@@ -119,6 +101,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	IMaintenanceCompanyService maintenanceCompanyService;
 	@Autowired
 	FireStationServiceImpl fireStationServiceImpl;
+	@Autowired
+	FireCompanyInfoMapper fireCompanyInfoMapper;
 	@Value("${jcs.company.topic.add:jcs/company/topic/add}")
 	private String airportAddTopic;
 
@@ -713,6 +697,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 		OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
 		orgUsr.setSequenceNbr(orgUsrDto.getSequenceNbr());
+		// 储存公司消防信息
+		saveFireCompanyInfo(orgUsr.getSequenceNbr(), orgUsrDto.getFireCompanyInfoDto());
 		/**
 		 * 同步保存ES
 		 */
@@ -722,6 +708,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrDto;
 	}
 
+	public void saveFireCompanyInfo(Long id, FireCompanyInfoDto fireCompanyInfoDto) {
+		if(ValidationUtil.isEmpty(fireCompanyInfoDto)) {
+			return;
+		}
+		CompanyInfo companyInfo = new CompanyInfo();
+		BeanUtils.copyProperties(fireCompanyInfoDto, companyInfo);
+		companyInfo.setInstanceId(id);
+		fireCompanyInfoMapper.insert(companyInfo);
+	}
+
 	@Override
 	public OrgUsrDto saveOrgPerson(OrgPersonDto OrgPersonVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();
@@ -789,8 +785,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsrMapper.updatelistByParentId(orgUsr.getBizOrgCode(), oriOrgUsr.getBizOrgCode());
 		}
 		updateById(orgUsr);
-
-		// saveOrgUsr(orgUsr, oriOrgUsr);
+		// 更新公司消防信息
+		updateFireCompanyInfo(orgUsr.getSequenceNbr(), orgUsrVo.getFireCompanyInfoDto());
 
 		// 保存动态表单数据
 		updateDynamicFormInstance(orgUsr.getSequenceNbr(), orgUsrVo.getDynamicFormValue());
@@ -804,6 +800,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrVo;
 	}
 
+	public void updateFireCompanyInfo(Long id, FireCompanyInfoDto fireCompanyInfoDto) {
+		if (ValidationUtil.isEmpty(fireCompanyInfoDto)) {
+			return;
+		}
+		CompanyInfo companyInfo = new CompanyInfo();
+		BeanUtils.copyProperties(fireCompanyInfoDto, companyInfo);
+		companyInfo.setInstanceId(id);
+		fireCompanyInfoMapper.updateById(companyInfo);
+	}
+
 	@Override
 	public OrgPersonDto updateByIdOrgPerson(OrgPersonDto OrgPersonVo, Long id) throws Exception {
 		try {