feat():修改企业生成账号登录问题
parent
040f466b7f
commit
2914d640f2
|
|
@ -22,6 +22,11 @@
|
||||||
<groupId>com.muyu</groupId>
|
<groupId>com.muyu</groupId>
|
||||||
<artifactId>muyu-common-core</artifactId>
|
<artifactId>muyu-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.muyu</groupId>
|
||||||
|
<artifactId>muyu-common-security</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.muyu.common.security.utils.SecurityUtils;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
@ -29,168 +30,165 @@ import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@TableName("enterprise")
|
@TableName("enterprise")
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@ApiModel(value = "Enterprise", description = "企业信息")
|
@ApiModel(value = "Enterprise", description = "车辆运营平台")
|
||||||
public class Enterprise extends BaseEntity {
|
public class Enterprise extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 主键 */
|
/** 主键 */
|
||||||
@TableId(value = "id",type = IdType.AUTO)
|
@TableId(value = "id",type = IdType.AUTO)
|
||||||
@ApiModelProperty(name = "主键", value = "主键")
|
@ApiModelProperty(name = "主键", value = "主键")
|
||||||
private String id;
|
private Integer id;
|
||||||
|
|
||||||
/** 企业名称 */
|
/** 企业名称 */
|
||||||
@Excel(name = "企业名称")
|
@Excel(name = "企业名称")
|
||||||
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
||||||
private String ebterpriseName;
|
private String ebterpriseName;
|
||||||
|
|
||||||
/** 法定代表人 */
|
/** 法定代表人 */
|
||||||
@Excel(name = "法定代表人")
|
@Excel(name = "法定代表人")
|
||||||
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
||||||
private String legalPerson;
|
private String legalPerson;
|
||||||
|
|
||||||
/** 经营执照凭证号码 */
|
/** 经营执照凭证号码 */
|
||||||
@Excel(name = "经营执照凭证号码")
|
@Excel(name = "经营执照凭证号码")
|
||||||
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
||||||
private String businessLincenseNumber;
|
private String businessLincenseNumber;
|
||||||
|
|
||||||
/** 企业成立时间 */
|
/** 企业成立时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "企业成立时间", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "企业成立时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
||||||
private Date estabinessDate;
|
private Date estabinessDate;
|
||||||
|
|
||||||
/** 经营范围 */
|
/** 经营范围 */
|
||||||
@Excel(name = "经营范围")
|
@Excel(name = "经营范围")
|
||||||
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
||||||
private String businessScope;
|
private String businessScope;
|
||||||
|
|
||||||
/** 注册地址 */
|
/** 注册地址 */
|
||||||
@Excel(name = "注册地址")
|
@Excel(name = "注册地址")
|
||||||
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
/** 企业联系方式 */
|
/** 企业联系方式 */
|
||||||
@Excel(name = "企业联系方式")
|
@Excel(name = "企业联系方式")
|
||||||
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
||||||
private String contactPhone;
|
private String contactPhone;
|
||||||
|
|
||||||
/** 公司邮箱 */
|
/** 公司邮箱 */
|
||||||
@Excel(name = "公司邮箱")
|
@Excel(name = "公司邮箱")
|
||||||
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@Excel(name = "企业当前状态")
|
@Excel(name = "企业当前状态")
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "企业入驻平台时期", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "企业入驻平台时期", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
||||||
private Date registrationDate;
|
private Date registrationDate;
|
||||||
|
|
||||||
/** 企业认证id */
|
/** 企业认证id */
|
||||||
@Excel(name = "企业认证id")
|
@Excel(name = "企业认证id")
|
||||||
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
||||||
private Long certificationId;
|
private Long certificationId;
|
||||||
|
|
||||||
/** 认证时间 */
|
/** 认证时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@Excel(name = "认证时间", width = 30, dateFormat = "yyyy-MM-dd")
|
@Excel(name = "认证时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
||||||
private Date authenticationDate;
|
private Date authenticationDate;
|
||||||
|
|
||||||
/** 服务级别 */
|
/** 服务级别 */
|
||||||
@Excel(name = "服务级别")
|
@Excel(name = "服务级别")
|
||||||
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
||||||
private Long serviceLevel;
|
private Long serviceLevel;
|
||||||
|
|
||||||
/** 开通服务id */
|
/** 开通服务id */
|
||||||
@Excel(name = "开通服务id")
|
@Excel(name = "开通服务id")
|
||||||
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
||||||
private Long openServerId;
|
private Long openServerId;
|
||||||
|
|
||||||
/** 增值服务id */
|
/** 增值服务id */
|
||||||
@Excel(name = "增值服务id")
|
@Excel(name = "增值服务id")
|
||||||
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
||||||
private Long addServerId;
|
private Long addServerId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询构造器
|
* 查询构造器
|
||||||
*/
|
*/
|
||||||
public static Enterprise queryBuild( EnterpriseQueryReq enterpriseQueryReq){
|
public static Enterprise queryBuild( EnterpriseQueryReq enterpriseQueryReq){
|
||||||
return Enterprise.builder()
|
return Enterprise.builder()
|
||||||
.ebterpriseName(enterpriseQueryReq.getEbterpriseName())
|
.ebterpriseName(enterpriseQueryReq.getEbterpriseName())
|
||||||
.legalPerson(enterpriseQueryReq.getLegalPerson())
|
.legalPerson(enterpriseQueryReq.getLegalPerson())
|
||||||
.businessLincenseNumber(enterpriseQueryReq.getBusinessLincenseNumber())
|
.businessLincenseNumber(enterpriseQueryReq.getBusinessLincenseNumber())
|
||||||
.estabinessDate(enterpriseQueryReq.getEstabinessDate())
|
.estabinessDate(enterpriseQueryReq.getEstabinessDate())
|
||||||
.businessScope(enterpriseQueryReq.getBusinessScope())
|
.businessScope(enterpriseQueryReq.getBusinessScope())
|
||||||
.address(enterpriseQueryReq.getAddress())
|
.address(enterpriseQueryReq.getAddress())
|
||||||
.contactPhone(enterpriseQueryReq.getContactPhone())
|
.contactPhone(enterpriseQueryReq.getContactPhone())
|
||||||
.email(enterpriseQueryReq.getEmail())
|
.email(enterpriseQueryReq.getEmail())
|
||||||
.status(enterpriseQueryReq.getStatus())
|
.enterpriseStatus(enterpriseQueryReq.getEnterpriseStatus())
|
||||||
.registrationDate(enterpriseQueryReq.getRegistrationDate())
|
.registrationDate(enterpriseQueryReq.getRegistrationDate())
|
||||||
.certificationId(enterpriseQueryReq.getCertificationId())
|
.certificationId(enterpriseQueryReq.getCertificationId())
|
||||||
.authenticationDate(enterpriseQueryReq.getAuthenticationDate())
|
.authenticationDate(enterpriseQueryReq.getAuthenticationDate())
|
||||||
.serviceLevel(enterpriseQueryReq.getServiceLevel())
|
.serviceLevel(enterpriseQueryReq.getServiceLevel())
|
||||||
.openServerId(enterpriseQueryReq.getOpenServerId())
|
.openServerId(enterpriseQueryReq.getOpenServerId())
|
||||||
.addServerId(enterpriseQueryReq.getAddServerId())
|
.addServerId(enterpriseQueryReq.getAddServerId())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加构造器
|
* 添加构造器
|
||||||
*/
|
*/
|
||||||
public static Enterprise saveBuild(EnterpriseSaveReq enterpriseSaveReq){
|
public static Enterprise saveBuild(EnterpriseSaveReq enterpriseSaveReq){
|
||||||
return Enterprise.builder()
|
return Enterprise.builder()
|
||||||
.ebterpriseName(enterpriseSaveReq.getEbterpriseName())
|
.ebterpriseName(enterpriseSaveReq.getEbterpriseName())
|
||||||
.legalPerson(enterpriseSaveReq.getLegalPerson())
|
.legalPerson(enterpriseSaveReq.getLegalPerson())
|
||||||
.businessLincenseNumber(enterpriseSaveReq.getBusinessLincenseNumber())
|
.businessLincenseNumber(enterpriseSaveReq.getBusinessLincenseNumber())
|
||||||
.estabinessDate(enterpriseSaveReq.getEstabinessDate())
|
.estabinessDate(enterpriseSaveReq.getEstabinessDate())
|
||||||
.businessScope(enterpriseSaveReq.getBusinessScope())
|
.businessScope(enterpriseSaveReq.getBusinessScope())
|
||||||
.address(enterpriseSaveReq.getAddress())
|
.address(enterpriseSaveReq.getAddress())
|
||||||
.contactPhone(enterpriseSaveReq.getContactPhone())
|
.contactPhone(enterpriseSaveReq.getContactPhone())
|
||||||
.email(enterpriseSaveReq.getEmail())
|
.email(enterpriseSaveReq.getEmail())
|
||||||
.status(enterpriseSaveReq.getStatus())
|
.enterpriseStatus(enterpriseSaveReq.getEnterpriseStatus())
|
||||||
.registrationDate(enterpriseSaveReq.getRegistrationDate())
|
.registrationDate(enterpriseSaveReq.getRegistrationDate())
|
||||||
.certificationId(enterpriseSaveReq.getCertificationId())
|
.certificationId(enterpriseSaveReq.getCertificationId())
|
||||||
.authenticationDate(enterpriseSaveReq.getAuthenticationDate())
|
.authenticationDate(enterpriseSaveReq.getAuthenticationDate())
|
||||||
.serviceLevel(enterpriseSaveReq.getServiceLevel())
|
.serviceLevel(enterpriseSaveReq.getServiceLevel())
|
||||||
.openServerId(enterpriseSaveReq.getOpenServerId())
|
.openServerId(enterpriseSaveReq.getOpenServerId())
|
||||||
.addServerId(enterpriseSaveReq.getAddServerId())
|
.addServerId(enterpriseSaveReq.getAddServerId())
|
||||||
.createBy(enterpriseSaveReq.getCreateBy())
|
.createBy(SecurityUtils.getUsername())
|
||||||
.createTime(new Date())
|
.createTime(new Date())
|
||||||
.remark(enterpriseSaveReq.getRemark())
|
.build();
|
||||||
.build();
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改构造器
|
* 修改构造器
|
||||||
*/
|
*/
|
||||||
public static Enterprise editBuild(String id, EnterpriseEditReq enterpriseEditReq){
|
public static Enterprise editBuild(Integer id, EnterpriseEditReq enterpriseEditReq){
|
||||||
return Enterprise.builder()
|
return Enterprise.builder()
|
||||||
.id(id)
|
.id(id)
|
||||||
.ebterpriseName(enterpriseEditReq.getEbterpriseName())
|
.ebterpriseName(enterpriseEditReq.getEbterpriseName()) .legalPerson(enterpriseEditReq.getLegalPerson())
|
||||||
.legalPerson(enterpriseEditReq.getLegalPerson())
|
.businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber())
|
||||||
.businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber())
|
.estabinessDate(enterpriseEditReq.getEstabinessDate())
|
||||||
.estabinessDate(enterpriseEditReq.getEstabinessDate())
|
.businessScope(enterpriseEditReq.getBusinessScope())
|
||||||
.businessScope(enterpriseEditReq.getBusinessScope())
|
.address(enterpriseEditReq.getAddress())
|
||||||
.address(enterpriseEditReq.getAddress())
|
.contactPhone(enterpriseEditReq.getContactPhone())
|
||||||
.contactPhone(enterpriseEditReq.getContactPhone())
|
.email(enterpriseEditReq.getEmail())
|
||||||
.email(enterpriseEditReq.getEmail())
|
.enterpriseStatus(enterpriseEditReq.getEnterpriseStatus())
|
||||||
.status(enterpriseEditReq.getStatus())
|
.registrationDate(enterpriseEditReq.getRegistrationDate())
|
||||||
.registrationDate(enterpriseEditReq.getRegistrationDate())
|
.certificationId(enterpriseEditReq.getCertificationId())
|
||||||
.certificationId(enterpriseEditReq.getCertificationId())
|
.authenticationDate(enterpriseEditReq.getAuthenticationDate())
|
||||||
.authenticationDate(enterpriseEditReq.getAuthenticationDate())
|
.serviceLevel(enterpriseEditReq.getServiceLevel())
|
||||||
.serviceLevel(enterpriseEditReq.getServiceLevel())
|
.openServerId(enterpriseEditReq.getOpenServerId())
|
||||||
.openServerId(enterpriseEditReq.getOpenServerId())
|
.addServerId(enterpriseEditReq.getAddServerId())
|
||||||
.addServerId(enterpriseEditReq.getAddServerId())
|
.updateBy(SecurityUtils.getUsername())
|
||||||
.updateBy(enterpriseEditReq.getUpdateBy())
|
.updateTime(new Date())
|
||||||
.updateTime(new Date())
|
.build();
|
||||||
.remark(enterpriseEditReq.getRemark())
|
}
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,83 +9,84 @@ import lombok.AllArgsConstructor;
|
||||||
import lombok.experimental.SuperBuilder;
|
import lombok.experimental.SuperBuilder;
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseEditReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseEditReq", description = "车辆运营平台")
|
||||||
public class EnterpriseEditReq extends BaseEntity {
|
public class EnterpriseEditReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 企业名称 */
|
/** 企业名称 */
|
||||||
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
||||||
private String ebterpriseName;
|
private String ebterpriseName;
|
||||||
|
|
||||||
/** 法定代表人 */
|
/** 法定代表人 */
|
||||||
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
||||||
private String legalPerson;
|
private String legalPerson;
|
||||||
|
|
||||||
/** 经营执照凭证号码 */
|
/** 经营执照凭证号码 */
|
||||||
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
||||||
private String businessLincenseNumber;
|
private String businessLincenseNumber;
|
||||||
|
|
||||||
/** 企业成立时间 */
|
/** 企业成立时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
||||||
private Date estabinessDate;
|
private Date estabinessDate;
|
||||||
|
|
||||||
/** 经营范围 */
|
/** 经营范围 */
|
||||||
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
||||||
private String businessScope;
|
private String businessScope;
|
||||||
|
|
||||||
/** 注册地址 */
|
/** 注册地址 */
|
||||||
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
/** 企业联系方式 */
|
/** 企业联系方式 */
|
||||||
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
||||||
private String contactPhone;
|
private String contactPhone;
|
||||||
|
|
||||||
/** 公司邮箱 */
|
/** 公司邮箱 */
|
||||||
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
||||||
private Date registrationDate;
|
private Date registrationDate;
|
||||||
|
|
||||||
/** 企业认证id */
|
/** 企业认证id */
|
||||||
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
||||||
private Long certificationId;
|
private Long certificationId;
|
||||||
|
|
||||||
/** 认证时间 */
|
/** 认证时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
||||||
private Date authenticationDate;
|
private Date authenticationDate;
|
||||||
|
|
||||||
/** 服务级别 */
|
/** 服务级别 */
|
||||||
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
||||||
private Long serviceLevel;
|
private Long serviceLevel;
|
||||||
|
|
||||||
/** 开通服务id */
|
/** 开通服务id */
|
||||||
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
||||||
private Long openServerId;
|
private Long openServerId;
|
||||||
|
|
||||||
/** 增值服务id */
|
/** 增值服务id */
|
||||||
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
||||||
private Long addServerId;
|
private Long addServerId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,81 +11,81 @@ import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseQueryReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseQueryReq", description = "车辆运营平台")
|
||||||
public class EnterpriseQueryReq extends BaseEntity {
|
public class EnterpriseQueryReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 企业名称 */
|
/** 企业名称 */
|
||||||
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
||||||
private String ebterpriseName;
|
private String ebterpriseName;
|
||||||
|
|
||||||
/** 法定代表人 */
|
/** 法定代表人 */
|
||||||
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
||||||
private String legalPerson;
|
private String legalPerson;
|
||||||
|
|
||||||
/** 经营执照凭证号码 */
|
/** 经营执照凭证号码 */
|
||||||
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
||||||
private String businessLincenseNumber;
|
private String businessLincenseNumber;
|
||||||
|
|
||||||
/** 企业成立时间 */
|
/** 企业成立时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
||||||
private Date estabinessDate;
|
private Date estabinessDate;
|
||||||
|
|
||||||
/** 经营范围 */
|
/** 经营范围 */
|
||||||
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
||||||
private String businessScope;
|
private String businessScope;
|
||||||
|
|
||||||
/** 注册地址 */
|
/** 注册地址 */
|
||||||
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
/** 企业联系方式 */
|
/** 企业联系方式 */
|
||||||
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
||||||
private String contactPhone;
|
private String contactPhone;
|
||||||
|
|
||||||
/** 公司邮箱 */
|
/** 公司邮箱 */
|
||||||
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
||||||
private Date registrationDate;
|
private Date registrationDate;
|
||||||
|
|
||||||
/** 企业认证id */
|
/** 企业认证id */
|
||||||
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
||||||
private Long certificationId;
|
private Long certificationId;
|
||||||
|
|
||||||
/** 认证时间 */
|
/** 认证时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
||||||
private Date authenticationDate;
|
private Date authenticationDate;
|
||||||
|
|
||||||
/** 服务级别 */
|
/** 服务级别 */
|
||||||
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
||||||
private Long serviceLevel;
|
private Long serviceLevel;
|
||||||
|
|
||||||
/** 开通服务id */
|
/** 开通服务id */
|
||||||
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
||||||
private Long openServerId;
|
private Long openServerId;
|
||||||
|
|
||||||
/** 增值服务id */
|
/** 增值服务id */
|
||||||
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
||||||
private Long addServerId;
|
private Long addServerId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,101 +11,101 @@ import io.swagger.annotations.*;
|
||||||
import com.muyu.common.core.web.domain.BaseEntity;
|
import com.muyu.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息对象 enterprise
|
* 车辆运营平台对象 enterprise
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@SuperBuilder
|
@SuperBuilder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@ApiModel(value = "EnterpriseSaveReq", description = "企业信息")
|
@ApiModel(value = "EnterpriseSaveReq", description = "车辆运营平台")
|
||||||
public class EnterpriseSaveReq extends BaseEntity {
|
public class EnterpriseSaveReq extends BaseEntity {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/** 主键 */
|
/** 主键 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "主键", value = "主键")
|
@ApiModelProperty(name = "主键", value = "主键")
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
/** 企业名称 */
|
/** 企业名称 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
@ApiModelProperty(name = "企业名称", value = "企业名称")
|
||||||
private String ebterpriseName;
|
private String ebterpriseName;
|
||||||
|
|
||||||
/** 法定代表人 */
|
/** 法定代表人 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
@ApiModelProperty(name = "法定代表人", value = "法定代表人")
|
||||||
private String legalPerson;
|
private String legalPerson;
|
||||||
|
|
||||||
/** 经营执照凭证号码 */
|
/** 经营执照凭证号码 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
@ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码")
|
||||||
private String businessLincenseNumber;
|
private String businessLincenseNumber;
|
||||||
|
|
||||||
/** 企业成立时间 */
|
/** 企业成立时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
@ApiModelProperty(name = "企业成立时间", value = "企业成立时间")
|
||||||
private Date estabinessDate;
|
private Date estabinessDate;
|
||||||
|
|
||||||
/** 经营范围 */
|
/** 经营范围 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
@ApiModelProperty(name = "经营范围", value = "经营范围")
|
||||||
private String businessScope;
|
private String businessScope;
|
||||||
|
|
||||||
/** 注册地址 */
|
/** 注册地址 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
@ApiModelProperty(name = "注册地址", value = "注册地址")
|
||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
/** 企业联系方式 */
|
/** 企业联系方式 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
@ApiModelProperty(name = "企业联系方式", value = "企业联系方式")
|
||||||
private String contactPhone;
|
private String contactPhone;
|
||||||
|
|
||||||
/** 公司邮箱 */
|
/** 公司邮箱 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
@ApiModelProperty(name = "公司邮箱", value = "公司邮箱")
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
/** 企业当前状态 */
|
/** 企业当前状态 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
@ApiModelProperty(name = "企业当前状态", value = "企业当前状态")
|
||||||
private String status;
|
private String enterpriseStatus;
|
||||||
|
|
||||||
/** 企业入驻平台时期 */
|
/** 企业入驻平台时期 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
@ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期")
|
||||||
private Date registrationDate;
|
private Date registrationDate;
|
||||||
|
|
||||||
/** 企业认证id */
|
/** 企业认证id */
|
||||||
|
|
||||||
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
@ApiModelProperty(name = "企业认证id", value = "企业认证id")
|
||||||
private Long certificationId;
|
private Long certificationId;
|
||||||
|
|
||||||
/** 认证时间 */
|
/** 认证时间 */
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||||
|
|
||||||
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
@ApiModelProperty(name = "认证时间", value = "认证时间")
|
||||||
private Date authenticationDate;
|
private Date authenticationDate;
|
||||||
|
|
||||||
/** 服务级别 */
|
/** 服务级别 */
|
||||||
|
|
||||||
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
@ApiModelProperty(name = "服务级别", value = "服务级别")
|
||||||
private Long serviceLevel;
|
private Long serviceLevel;
|
||||||
|
|
||||||
/** 开通服务id */
|
/** 开通服务id */
|
||||||
|
|
||||||
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
@ApiModelProperty(name = "开通服务id", value = "开通服务id")
|
||||||
private Long openServerId;
|
private Long openServerId;
|
||||||
|
|
||||||
/** 增值服务id */
|
/** 增值服务id */
|
||||||
|
|
||||||
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
@ApiModelProperty(name = "增值服务id", value = "增值服务id")
|
||||||
private Long addServerId;
|
private Long addServerId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,17 +10,12 @@ import com.muyu.common.system.domain.SysDept;
|
||||||
import com.muyu.common.system.domain.SysUser;
|
import com.muyu.common.system.domain.SysUser;
|
||||||
import com.muyu.system.remote.RemoteSysDeptService;
|
import com.muyu.system.remote.RemoteSysDeptService;
|
||||||
import com.muyu.system.remote.RemoteSysUserService;
|
import com.muyu.system.remote.RemoteSysUserService;
|
||||||
|
import com.muyu.system.remote.factory.RemoteSysDeptFactory;
|
||||||
import io.swagger.annotations.*;
|
import io.swagger.annotations.*;
|
||||||
|
import io.swagger.models.auth.In;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PutMapping;
|
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
import com.muyu.common.core.domain.Result;
|
import com.muyu.common.core.domain.Result;
|
||||||
import com.muyu.common.core.utils.poi.ExcelUtil;
|
import com.muyu.common.core.utils.poi.ExcelUtil;
|
||||||
import com.muyu.common.core.web.controller.BaseController;
|
import com.muyu.common.core.web.controller.BaseController;
|
||||||
|
|
@ -35,149 +30,177 @@ import com.muyu.net.working.service.EnterpriseService;
|
||||||
import com.muyu.common.core.web.page.TableDataInfo;
|
import com.muyu.common.core.web.page.TableDataInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Controller
|
* 车辆运营平台Controller
|
||||||
*
|
*
|
||||||
* @author muyu
|
* @author muyu
|
||||||
* @date 2024-05-27
|
* @date 2024-06-05
|
||||||
*/
|
*/
|
||||||
@Api(tags = "车辆运营平台")
|
@Api(tags = "车辆运营平台")
|
||||||
@Log4j2
|
@Log4j2
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/car")
|
@RequestMapping("/car")
|
||||||
public class EnterpriseController extends BaseController {
|
public class EnterpriseController extends BaseController {
|
||||||
|
@Autowired
|
||||||
|
private EnterpriseService enterpriseService;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private EnterpriseService enterpriseService;
|
private RemoteSysDeptService remoteSysDeptService;
|
||||||
|
@Autowired
|
||||||
|
private RemoteSysUserService remoteSysUserService;
|
||||||
|
|
||||||
@Autowired
|
/**
|
||||||
private RemoteSysDeptService remoteSysDeptService;
|
* 查询车辆运营平台列表
|
||||||
|
*/
|
||||||
|
@ApiOperation("获取车辆运营平台列表")
|
||||||
|
@RequiresPermissions("netWorking:car:list")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public Result<TableDataInfo<Enterprise>> list(EnterpriseQueryReq enterpriseQueryReq) {
|
||||||
|
startPage();
|
||||||
|
List<Enterprise> list = enterpriseService.list(Enterprise.queryBuild(enterpriseQueryReq));
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
@Autowired
|
/**
|
||||||
private RemoteSysUserService remoteSysUserService;
|
* 导出车辆运营平台列表
|
||||||
|
*/
|
||||||
|
@ApiOperation("导出车辆运营平台列表")
|
||||||
|
@RequiresPermissions("netWorking:car:export")
|
||||||
|
@Log(title = "车辆运营平台", businessType = BusinessType.EXPORT)
|
||||||
|
@PostMapping("/export")
|
||||||
|
public void export(HttpServletResponse response, Enterprise enterprise) {
|
||||||
|
List<Enterprise> list = enterpriseService.list(enterprise);
|
||||||
|
ExcelUtil<Enterprise> util = new ExcelUtil<Enterprise>(Enterprise.class);
|
||||||
|
util.exportExcel(response, list, "车辆运营平台数据");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询车辆运营平台列表
|
* 获取车辆运营平台详细信息
|
||||||
*/
|
*/
|
||||||
@ApiOperation("获取车辆运营平台列表")
|
@ApiOperation("获取车辆运营平台详细信息")
|
||||||
@RequiresPermissions("netWorking:car:list")
|
@RequiresPermissions("netWorking:car:query")
|
||||||
@GetMapping("/list")
|
@GetMapping(value = "/{id}")
|
||||||
public Result<TableDataInfo<Enterprise>> list(EnterpriseQueryReq enterpriseQueryReq) {
|
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
|
||||||
startPage();
|
public Result<Enterprise> getInfo(@PathVariable("id") String id) {
|
||||||
List<Enterprise> list = enterpriseService.list(Enterprise.queryBuild(enterpriseQueryReq));
|
return Result.success(enterpriseService.getById(id));
|
||||||
return getDataTable(list);
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新增车辆运营平台
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("netWorking:car:add")
|
||||||
|
@Log(title = "车辆运营平台", businessType = BusinessType.INSERT)
|
||||||
|
@PostMapping
|
||||||
|
@ApiOperation("新增车辆运营平台")
|
||||||
|
public Result<String> add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) {
|
||||||
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
||||||
|
SysUser sysUser = loginUser.getSysUser();
|
||||||
|
Result<SysDept> DeptList = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName());
|
||||||
|
SysDept sysDept = DeptList.getData();
|
||||||
|
if(sysDept!=null){
|
||||||
|
return Result.error("部门名称重复");
|
||||||
}
|
}
|
||||||
|
addDept(enterpriseSaveReq, sysUser);
|
||||||
|
addUser(enterpriseSaveReq,sysUser);
|
||||||
|
|
||||||
/**
|
return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq)));
|
||||||
* 导出车辆运营平台列表
|
}
|
||||||
*/
|
|
||||||
@ApiOperation("导出车辆运营平台列表")
|
|
||||||
@RequiresPermissions("netWorking:car:export")
|
|
||||||
@Log(title = "车辆运营平台", businessType = BusinessType.EXPORT)
|
|
||||||
@PostMapping("/export")
|
|
||||||
public void export(HttpServletResponse response, Enterprise enterprise) {
|
|
||||||
List<Enterprise> list = enterpriseService.list(enterprise);
|
|
||||||
ExcelUtil<Enterprise> util = new ExcelUtil<Enterprise>(Enterprise.class);
|
|
||||||
util.exportExcel(response, list, "车辆运营平台数据");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取车辆运营平台详细信息
|
* 添加部门表信息
|
||||||
*/
|
* @param enterpriseSaveReq
|
||||||
@ApiOperation("获取车辆运营平台详细信息")
|
* @param sysUser
|
||||||
@RequiresPermissions("netWorking:car:query")
|
* @return
|
||||||
@GetMapping(value = "/{id}")
|
*/
|
||||||
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class)
|
public void addDept(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){
|
||||||
public Result<Enterprise> getInfo(@PathVariable("id") String id) {
|
|
||||||
return Result.success(enterpriseService.getById(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
SysDept DeptBuild = SysDept.builder()
|
||||||
* 新增车辆运营平台
|
.deptName(enterpriseSaveReq.getEbterpriseName())
|
||||||
*/
|
.parentId(100L)
|
||||||
@RequiresPermissions("netWorking:car:add")
|
.ancestors("0,100")
|
||||||
@Log(title = "车辆运营平台", businessType = BusinessType.INSERT)
|
.orderNum(2)
|
||||||
@PostMapping
|
.status("0")
|
||||||
@ApiOperation("新增车辆运营平台")
|
.createBy(sysUser.getUserName())
|
||||||
public Result<String> add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) {
|
.createTime(new Date())
|
||||||
LoginUser loginUser = SecurityUtils.getLoginUser();
|
.leader(sysUser.getNickName())
|
||||||
SysUser sysUser = loginUser.getSysUser();
|
.phone(sysUser.getPhonenumber())
|
||||||
Result<SysDept> DeptList = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName());
|
.email(sysUser.getEmail())
|
||||||
SysDept sysDept = DeptList.getData();
|
.delFlag("0")
|
||||||
if(sysDept!=null){
|
.build();
|
||||||
return Result.error("部门名称重复");
|
remoteSysDeptService.add(DeptBuild);
|
||||||
}
|
}
|
||||||
addDept(enterpriseSaveReq, sysUser);
|
|
||||||
addUser(enterpriseSaveReq,sysUser);
|
|
||||||
|
|
||||||
return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq)));
|
public void addUser(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){
|
||||||
}
|
Result<SysDept> sysDeptResult = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName());
|
||||||
|
SysDept sysDept = sysDeptResult.getData();
|
||||||
|
SysUser UserBuild = SysUser.builder()
|
||||||
|
.userName(enterpriseSaveReq.getEbterpriseName())
|
||||||
|
.nickName(enterpriseSaveReq.getEbterpriseName())
|
||||||
|
.password("123456")
|
||||||
|
.deptId(sysDept.getDeptId())
|
||||||
|
.email(enterpriseSaveReq.getEmail())
|
||||||
|
.phonenumber(enterpriseSaveReq.getContactPhone())
|
||||||
|
.status("0")
|
||||||
|
.delFlag("0")
|
||||||
|
.roleId(3L)
|
||||||
|
.roleIds(new Long[]{3L})
|
||||||
|
.createBy(sysUser.getUserName())
|
||||||
|
.createTime(new Date())
|
||||||
|
.remark(enterpriseSaveReq.getRemark())
|
||||||
|
.build();
|
||||||
|
remoteSysUserService.add(UserBuild);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加部门表信息
|
* 修改车辆运营平台
|
||||||
* @param enterpriseSaveReq
|
*/
|
||||||
* @param sysUser
|
@RequiresPermissions("netWorking:car:edit")
|
||||||
* @return
|
@Log(title = "车辆运营平台", businessType = BusinessType.UPDATE)
|
||||||
*/
|
@PutMapping("/{id}")
|
||||||
public void addDept(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){
|
@ApiOperation("修改车辆运营平台")
|
||||||
|
public Result<String> edit(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
|
||||||
|
String username = SecurityUtils.getUsername();
|
||||||
|
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
|
||||||
|
}
|
||||||
|
|
||||||
SysDept DeptBuild = SysDept.builder()
|
/**
|
||||||
.deptName(enterpriseSaveReq.getEbterpriseName())
|
* 查询运营平台列表
|
||||||
.parentId(100L)
|
*/
|
||||||
.ancestors("0,100")
|
@GetMapping("/selectByName")
|
||||||
.orderNum(2)
|
public Result<Enterprise> selectByName() {
|
||||||
.status("0")
|
String username = SecurityUtils.getLoginUser().getUsername();
|
||||||
.createBy(sysUser.getUserName())
|
Enterprise enterprise = enterpriseService.selectByName(username);
|
||||||
.createTime(new Date())
|
return Result.success(enterprise);
|
||||||
.leader(sysUser.getNickName())
|
}
|
||||||
.phone(sysUser.getPhonenumber())
|
|
||||||
.email(sysUser.getEmail())
|
|
||||||
.delFlag("0")
|
|
||||||
.build();
|
|
||||||
remoteSysDeptService.add(DeptBuild);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addUser(EnterpriseSaveReq enterpriseSaveReq,SysUser sysUser){
|
/**
|
||||||
Result<SysDept> sysDeptResult = remoteSysDeptService.selectDeptByName(enterpriseSaveReq.getEbterpriseName());
|
* 删除车辆运营平台
|
||||||
SysDept sysDept = sysDeptResult.getData();
|
*/
|
||||||
SysUser UserBuild = SysUser.builder()
|
@RequiresPermissions("netWorking:car:remove")
|
||||||
.userName(enterpriseSaveReq.getEbterpriseName())
|
@Log(title = "车辆运营平台", businessType = BusinessType.DELETE)
|
||||||
.nickName(enterpriseSaveReq.getEbterpriseName())
|
@DeleteMapping("/{ids}")
|
||||||
.password("123456")
|
@ApiOperation("删除车辆运营平台")
|
||||||
.deptId(sysDept.getDeptId())
|
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
|
||||||
.email(enterpriseSaveReq.getEmail())
|
public Result<String> remove(@PathVariable List<String> ids) {
|
||||||
.phonenumber(enterpriseSaveReq.getContactPhone())
|
return toAjax(enterpriseService.removeBatchByIds(ids));
|
||||||
.status("0")
|
}
|
||||||
.delFlag("0")
|
|
||||||
.roleId(3L)
|
|
||||||
.roleIds(new Long[]{3L})
|
|
||||||
.createBy(sysUser.getUserName())
|
|
||||||
.createTime(new Date())
|
|
||||||
.remark(enterpriseSaveReq.getRemark())
|
|
||||||
.build();
|
|
||||||
remoteSysUserService.add(UserBuild);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改车辆运营平台
|
* 完善企业信息
|
||||||
*/
|
* @param id
|
||||||
@RequiresPermissions("netWorking:car:edit")
|
* @param enterpriseEditReq
|
||||||
@Log(title = "车辆运营平台", businessType = BusinessType.UPDATE)
|
* @return
|
||||||
@PutMapping("/{id}")
|
*/
|
||||||
@ApiOperation("修改车辆运营平台")
|
@PostMapping("/updateEnterprise/{id}")
|
||||||
public Result<String> edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
|
public Result<String> updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) {
|
||||||
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
|
return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除车辆运营平台
|
* 企业认证
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("netWorking:car:remove")
|
@PostMapping("/authentication")
|
||||||
@Log(title = "车辆运营平台", businessType = BusinessType.DELETE)
|
public Result<String> authentication(@RequestBody Enterprise enterprise ) {
|
||||||
@DeleteMapping("/{ids}")
|
enterpriseService.authentication(enterprise);
|
||||||
@ApiOperation("删除车辆运营平台")
|
return Result.success();
|
||||||
@ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4")
|
}
|
||||||
public Result<String> remove(@PathVariable List<String> ids) {
|
|
||||||
|
|
||||||
return toAjax(enterpriseService.removeBatchByIds(ids));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package com.muyu.net.working.mapper;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.muyu.net.working.domain.Enterprise;
|
import com.muyu.net.working.domain.Enterprise;
|
||||||
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 企业信息Mapper接口
|
* 企业信息Mapper接口
|
||||||
|
|
@ -12,4 +13,8 @@ import com.muyu.net.working.domain.Enterprise;
|
||||||
*/
|
*/
|
||||||
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
|
public interface EnterpriseMapper extends BaseMapper<Enterprise> {
|
||||||
|
|
||||||
|
Enterprise selectByName(@Param("name") String name);
|
||||||
|
|
||||||
|
void authentication(Enterprise enterprise);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,10 @@ public interface EnterpriseService extends IService<Enterprise> {
|
||||||
* @param enterprise 企业信息
|
* @param enterprise 企业信息
|
||||||
* @return 企业信息集合
|
* @return 企业信息集合
|
||||||
*/
|
*/
|
||||||
public List<Enterprise> list(Enterprise enterprise);
|
List<Enterprise> list(Enterprise enterprise);
|
||||||
|
|
||||||
|
Enterprise selectByName(String name);
|
||||||
|
|
||||||
|
void authentication(Enterprise enterprise);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,18 @@
|
||||||
package com.muyu.net.working.service.impl;
|
package com.muyu.net.working.service.impl;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.muyu.common.core.utils.ObjUtils;
|
import com.muyu.common.core.utils.ObjUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.muyu.net.working.mapper.EnterpriseMapper;
|
import com.muyu.net.working.mapper.EnterpriseMapper;
|
||||||
import com.muyu.net.working.domain.Enterprise;
|
import com.muyu.net.working.domain.Enterprise;
|
||||||
|
|
@ -21,81 +30,132 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@Service
|
@Service
|
||||||
public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
|
public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
|
||||||
|
|
||||||
/**
|
@Autowired
|
||||||
* 查询企业信息列表
|
private EnterpriseMapper enterpriseMapper;
|
||||||
*
|
/**
|
||||||
* @param enterprise 企业信息
|
* 查询车辆运营平台列表
|
||||||
* @return 企业信息
|
*
|
||||||
*/
|
* @param enterprise 车辆运营平台
|
||||||
@Override
|
* @return 车辆运营平台
|
||||||
public List<Enterprise> list(Enterprise enterprise) {
|
*/
|
||||||
LambdaQueryWrapper<Enterprise> queryWrapper = new LambdaQueryWrapper<>();
|
@Override
|
||||||
|
public List<Enterprise> list(Enterprise enterprise) {
|
||||||
|
LambdaQueryWrapper<Enterprise> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getEbterpriseName())){
|
if (ObjUtils.notNull(enterprise.getEbterpriseName())){
|
||||||
queryWrapper.like(Enterprise::getEbterpriseName, enterprise.getEbterpriseName());
|
queryWrapper.like(Enterprise::getEbterpriseName, enterprise.getEbterpriseName());
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getLegalPerson())){
|
|
||||||
queryWrapper.eq(Enterprise::getLegalPerson, enterprise.getLegalPerson());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getBusinessLincenseNumber())){
|
|
||||||
queryWrapper.eq(Enterprise::getBusinessLincenseNumber, enterprise.getBusinessLincenseNumber());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getEstabinessDate())){
|
|
||||||
queryWrapper.eq(Enterprise::getEstabinessDate, enterprise.getEstabinessDate());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getBusinessScope())){
|
|
||||||
queryWrapper.eq(Enterprise::getBusinessScope, enterprise.getBusinessScope());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getAddress())){
|
|
||||||
queryWrapper.eq(Enterprise::getAddress, enterprise.getAddress());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getContactPhone())){
|
|
||||||
queryWrapper.eq(Enterprise::getContactPhone, enterprise.getContactPhone());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getEmail())){
|
|
||||||
queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getStatus())){
|
|
||||||
queryWrapper.eq(Enterprise::getStatus, enterprise.getStatus());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getRegistrationDate())){
|
|
||||||
queryWrapper.eq(Enterprise::getRegistrationDate, enterprise.getRegistrationDate());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getCertificationId())){
|
|
||||||
queryWrapper.eq(Enterprise::getCertificationId, enterprise.getCertificationId());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getAuthenticationDate())){
|
|
||||||
queryWrapper.eq(Enterprise::getAuthenticationDate, enterprise.getAuthenticationDate());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getServiceLevel())){
|
|
||||||
queryWrapper.eq(Enterprise::getServiceLevel, enterprise.getServiceLevel());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getOpenServerId())){
|
|
||||||
queryWrapper.eq(Enterprise::getOpenServerId, enterprise.getOpenServerId());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ObjUtils.notNull(enterprise.getAddServerId())){
|
|
||||||
queryWrapper.eq(Enterprise::getAddServerId, enterprise.getAddServerId());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return list(queryWrapper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getLegalPerson())){
|
||||||
|
queryWrapper.eq(Enterprise::getLegalPerson, enterprise.getLegalPerson());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getBusinessLincenseNumber())){
|
||||||
|
queryWrapper.eq(Enterprise::getBusinessLincenseNumber, enterprise.getBusinessLincenseNumber());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getEstabinessDate())){
|
||||||
|
queryWrapper.eq(Enterprise::getEstabinessDate, enterprise.getEstabinessDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getBusinessScope())){
|
||||||
|
queryWrapper.eq(Enterprise::getBusinessScope, enterprise.getBusinessScope());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getAddress())){
|
||||||
|
queryWrapper.eq(Enterprise::getAddress, enterprise.getAddress());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getContactPhone())){
|
||||||
|
queryWrapper.eq(Enterprise::getContactPhone, enterprise.getContactPhone());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getEmail())){
|
||||||
|
queryWrapper.eq(Enterprise::getEmail, enterprise.getEmail());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getEnterpriseStatus())){
|
||||||
|
queryWrapper.eq(Enterprise::getEnterpriseStatus, enterprise.getEnterpriseStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getRegistrationDate())){
|
||||||
|
queryWrapper.eq(Enterprise::getRegistrationDate, enterprise.getRegistrationDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getCertificationId())){
|
||||||
|
queryWrapper.eq(Enterprise::getCertificationId, enterprise.getCertificationId());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getAuthenticationDate())){
|
||||||
|
queryWrapper.eq(Enterprise::getAuthenticationDate, enterprise.getAuthenticationDate());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getServiceLevel())){
|
||||||
|
queryWrapper.eq(Enterprise::getServiceLevel, enterprise.getServiceLevel());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getOpenServerId())){
|
||||||
|
queryWrapper.eq(Enterprise::getOpenServerId, enterprise.getOpenServerId());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ObjUtils.notNull(enterprise.getAddServerId())){
|
||||||
|
queryWrapper.eq(Enterprise::getAddServerId, enterprise.getAddServerId());
|
||||||
|
}
|
||||||
|
|
||||||
|
return list(queryWrapper);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Enterprise selectByName(String name) {
|
||||||
|
return enterpriseMapper.selectByName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void authentication(Enterprise enterprise) {
|
||||||
|
enterpriseMapper.authentication(enterprise);
|
||||||
|
try {
|
||||||
|
postTest(enterprise);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void postTest(Enterprise enterprise) throws Exception {
|
||||||
|
// 1.请求URL
|
||||||
|
String postUrl = "http://101.34.248.9:10006/webhook/%E6%96%B0%E5%BB%BA%E4%BC%81%E4%B8%9A%E6%95%B0%E6%8D%AE%E5%BA%93";
|
||||||
|
// 2.请求参数JSON格式
|
||||||
|
Integer id = enterprise.getId();
|
||||||
|
Map<String, String> parammap = new HashMap<>();
|
||||||
|
parammap.put("entId", "jiang-"+id);
|
||||||
|
parammap.put("mysqlPort", String.valueOf(3306+enterprise.getId()));
|
||||||
|
String json = JSON.toJSONString(parammap);
|
||||||
|
// 3.创建连接与设置连接参数
|
||||||
|
URL urlObj = new URL(postUrl);
|
||||||
|
HttpURLConnection httpConn = (HttpURLConnection) urlObj.openConnection();
|
||||||
|
httpConn.setRequestMethod("POST");
|
||||||
|
httpConn.setRequestProperty("Charset", "UTF-8");
|
||||||
|
// POST请求且JSON数据,必须设置
|
||||||
|
httpConn.setRequestProperty("Content-Type", "application/json");
|
||||||
|
// 打开输出流,默认是false
|
||||||
|
httpConn.setDoOutput(true);
|
||||||
|
// 打开输入流,默认是true,可省略
|
||||||
|
httpConn.setDoInput(true);
|
||||||
|
// 4.从HttpURLConnection获取输出流和写数据
|
||||||
|
OutputStream oStream = httpConn.getOutputStream();
|
||||||
|
oStream.write(json.getBytes());
|
||||||
|
oStream.flush();
|
||||||
|
// 5.发起http调用(getInputStream触发http请求)
|
||||||
|
if (httpConn.getResponseCode() != 200) {
|
||||||
|
throw new Exception("调用服务端异常.");
|
||||||
|
}
|
||||||
|
// 6.从HttpURLConnection获取输入流和读数据
|
||||||
|
BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(httpConn.getInputStream()));
|
||||||
|
String resultData = br.readLine();
|
||||||
|
System.out.println("从服务端返回结果: " + resultData);
|
||||||
|
// 7.关闭HttpURLConnection连接
|
||||||
|
httpConn.disconnect();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,40 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.muyu.net.working.mapper.EnterpriseMapper">
|
<mapper namespace="com.muyu.net.working.mapper.EnterpriseMapper">
|
||||||
|
|
||||||
<resultMap type="com.muyu.net.working.domain.Enterprise" id="EnterpriseResult">
|
<resultMap type="com.muyu.net.working.domain.Enterprise" id="EnterpriseResult">
|
||||||
<result property="id" column="id" />
|
<result property="id" column="id" />
|
||||||
<result property="ebterpriseName" column="ebterprise_name" />
|
<result property="ebterpriseName" column="ebterprise_name" />
|
||||||
<result property="legalPerson" column="legal_person" />
|
<result property="legalPerson" column="legal_person" />
|
||||||
<result property="businessLincenseNumber" column="business_lincense_number" />
|
<result property="businessLincenseNumber" column="business_lincense_number" />
|
||||||
<result property="estabinessDate" column="estabiness_date" />
|
<result property="estabinessDate" column="estabiness_date" />
|
||||||
<result property="businessScope" column="business_scope" />
|
<result property="businessScope" column="business_scope" />
|
||||||
<result property="address" column="address" />
|
<result property="address" column="address" />
|
||||||
<result property="contactPhone" column="contact_phone" />
|
<result property="contactPhone" column="contact_phone" />
|
||||||
<result property="email" column="email" />
|
<result property="email" column="email" />
|
||||||
<result property="status" column="status" />
|
<result property="enterpriseStatus" column="enterprise_status" />
|
||||||
<result property="registrationDate" column="registration_date" />
|
<result property="registrationDate" column="registration_date" />
|
||||||
<result property="certificationId" column="certification_id" />
|
<result property="certificationId" column="certification_id" />
|
||||||
<result property="authenticationDate" column="authentication_date" />
|
<result property="authenticationDate" column="authentication_date" />
|
||||||
<result property="serviceLevel" column="service_level" />
|
<result property="serviceLevel" column="service_level" />
|
||||||
<result property="openServerId" column="open_server_id" />
|
<result property="openServerId" column="open_server_id" />
|
||||||
<result property="addServerId" column="add_server_id" />
|
<result property="addServerId" column="add_server_id" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time" />
|
||||||
<result property="remark" column="remark" />
|
<result property="remark" column="remark" />
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectEnterpriseVo">
|
<sql id="selectEnterpriseVo">
|
||||||
select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise
|
select id, ebterprise_name, legal_person, business_lincense_number, estabiness_date, business_scope, address, contact_phone, email, enterprise_status, registration_date, certification_id, authentication_date, service_level, open_server_id, add_server_id, create_by, create_time, update_by, update_time, remark from enterprise
|
||||||
</sql>
|
</sql>
|
||||||
|
<update id="authentication">
|
||||||
|
update enterprise set enterprise_status = 'N' where id = #{id}
|
||||||
|
</update>
|
||||||
|
<select id="selectByName" resultType="com.muyu.net.working.domain.Enterprise">
|
||||||
|
select * from enterprise where ebterprise_name = #{name}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,12 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 远程调用部门接口 RemoteSysDeptService
|
||||||
|
*
|
||||||
|
* @author PengJiang
|
||||||
|
* Date 2024/6/7 09:00
|
||||||
|
*/
|
||||||
@FeignClient(
|
@FeignClient(
|
||||||
contextId = "remoteSysDeptService",
|
contextId = "remoteSysDeptService",
|
||||||
value = ServiceNameConstants.SYSTEM_SERVICE,
|
value = ServiceNameConstants.SYSTEM_SERVICE,
|
||||||
|
|
@ -18,11 +24,9 @@ import org.springframework.web.bind.annotation.RequestParam;
|
||||||
path = "/dept"
|
path = "/dept"
|
||||||
)
|
)
|
||||||
public interface RemoteSysDeptService {
|
public interface RemoteSysDeptService {
|
||||||
|
|
||||||
@GetMapping("/selectDeptByName")
|
@GetMapping("/selectDeptByName")
|
||||||
public Result<SysDept> selectDeptByName (@RequestParam("name") String name);
|
Result<SysDept> selectDeptByName(@RequestParam("name") String name);
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public Result add (@Validated @RequestBody SysDept dept);
|
Result add(@Validated @RequestBody SysDept dept);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,12 @@ import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 远程调用用户 RemoteSysUserService
|
||||||
|
*
|
||||||
|
* @author PengJiang
|
||||||
|
* Date 2024/6/7 08:51
|
||||||
|
*/
|
||||||
@FeignClient(
|
@FeignClient(
|
||||||
contextId = "remoteSysUserService",
|
contextId = "remoteSysUserService",
|
||||||
value = ServiceNameConstants.SYSTEM_SERVICE,
|
value = ServiceNameConstants.SYSTEM_SERVICE,
|
||||||
|
|
@ -24,5 +30,5 @@ public interface RemoteSysUserService {
|
||||||
*/
|
*/
|
||||||
@RequiresPermissions("system:user:add")
|
@RequiresPermissions("system:user:add")
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public Result add (@Validated @RequestBody SysUser user);
|
Result add(@Validated @RequestBody SysUser user);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@
|
||||||
<sql id="selectUserVo">
|
<sql id="selectUserVo">
|
||||||
select u.user_id,
|
select u.user_id,
|
||||||
u.dept_id,
|
u.dept_id,
|
||||||
-- u.type,
|
|
||||||
u.user_name,
|
u.user_name,
|
||||||
u.nick_name,
|
u.nick_name,
|
||||||
u.email,
|
u.email,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue