diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java deleted file mode 100644 index 6a11f5b..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/Enterprise.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.muyu.net.working.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.annotation.Excel; -import com.muyu.net.working.domain.req.EnterpriseQueryReq; -import com.muyu.net.working.domain.req.EnterpriseSaveReq; -import com.muyu.net.working.domain.req.EnterpriseEditReq; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 企业信息对象 enterprise - * - * @author muyu - * @date 2024-05-27 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("enterprise") -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "Enterprise", description = "企业信息") -public class Enterprise extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 主键 */ - @TableId(value = "id",type = IdType.AUTO) - @ApiModelProperty(name = "主键", value = "主键") - private String id; - - /** 企业名称 */ - @Excel(name = "企业名称") - @ApiModelProperty(name = "企业名称", value = "企业名称") - private String ebterpriseName; - - /** 法定代表人 */ - @Excel(name = "法定代表人") - @ApiModelProperty(name = "法定代表人", value = "法定代表人") - private String legalPerson; - - /** 经营执照凭证号码 */ - @Excel(name = "经营执照凭证号码") - @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") - private String businessLincenseNumber; - - /** 企业成立时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "企业成立时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") - private Date estabinessDate; - - /** 经营范围 */ - @Excel(name = "经营范围") - @ApiModelProperty(name = "经营范围", value = "经营范围") - private String businessScope; - - /** 注册地址 */ - @Excel(name = "注册地址") - @ApiModelProperty(name = "注册地址", value = "注册地址") - private String address; - - /** 企业联系方式 */ - @Excel(name = "企业联系方式") - @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") - private String contactPhone; - - /** 公司邮箱 */ - @Excel(name = "公司邮箱") - @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") - private String email; - - /** 企业当前状态 */ - @Excel(name = "企业当前状态") - @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; - - /** 企业入驻平台时期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "企业入驻平台时期", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") - private Date registrationDate; - - /** 企业认证id */ - @Excel(name = "企业认证id") - @ApiModelProperty(name = "企业认证id", value = "企业认证id") - private Long certificationId; - - /** 认证时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "认证时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty(name = "认证时间", value = "认证时间") - private Date authenticationDate; - - /** 服务级别 */ - @Excel(name = "服务级别") - @ApiModelProperty(name = "服务级别", value = "服务级别") - private Long serviceLevel; - - /** 开通服务id */ - @Excel(name = "开通服务id") - @ApiModelProperty(name = "开通服务id", value = "开通服务id") - private Long openServerId; - - /** 增值服务id */ - @Excel(name = "增值服务id") - @ApiModelProperty(name = "增值服务id", value = "增值服务id") - private Long addServerId; - - /** - * 查询构造器 - */ - public static Enterprise queryBuild( EnterpriseQueryReq enterpriseQueryReq){ - return Enterprise.builder() - .ebterpriseName(enterpriseQueryReq.getEbterpriseName()) - .legalPerson(enterpriseQueryReq.getLegalPerson()) - .businessLincenseNumber(enterpriseQueryReq.getBusinessLincenseNumber()) - .estabinessDate(enterpriseQueryReq.getEstabinessDate()) - .businessScope(enterpriseQueryReq.getBusinessScope()) - .address(enterpriseQueryReq.getAddress()) - .contactPhone(enterpriseQueryReq.getContactPhone()) - .email(enterpriseQueryReq.getEmail()) - .status(enterpriseQueryReq.getStatus()) - .registrationDate(enterpriseQueryReq.getRegistrationDate()) - .certificationId(enterpriseQueryReq.getCertificationId()) - .authenticationDate(enterpriseQueryReq.getAuthenticationDate()) - .serviceLevel(enterpriseQueryReq.getServiceLevel()) - .openServerId(enterpriseQueryReq.getOpenServerId()) - .addServerId(enterpriseQueryReq.getAddServerId()) - .build(); - } - - /** - * 添加构造器 - */ - public static Enterprise saveBuild(EnterpriseSaveReq enterpriseSaveReq){ - return Enterprise.builder() - .ebterpriseName(enterpriseSaveReq.getEbterpriseName()) - .legalPerson(enterpriseSaveReq.getLegalPerson()) - .businessLincenseNumber(enterpriseSaveReq.getBusinessLincenseNumber()) - .estabinessDate(enterpriseSaveReq.getEstabinessDate()) - .businessScope(enterpriseSaveReq.getBusinessScope()) - .address(enterpriseSaveReq.getAddress()) - .contactPhone(enterpriseSaveReq.getContactPhone()) - .email(enterpriseSaveReq.getEmail()) - .status(enterpriseSaveReq.getStatus()) - .registrationDate(enterpriseSaveReq.getRegistrationDate()) - .certificationId(enterpriseSaveReq.getCertificationId()) - .authenticationDate(enterpriseSaveReq.getAuthenticationDate()) - .serviceLevel(enterpriseSaveReq.getServiceLevel()) - .openServerId(enterpriseSaveReq.getOpenServerId()) - .addServerId(enterpriseSaveReq.getAddServerId()) - .createBy(enterpriseSaveReq.getCreateBy()) - .createTime(new Date()) - .remark(enterpriseSaveReq.getRemark()) - .build(); - } - - /** - * 修改构造器 - */ - public static Enterprise editBuild(String id, EnterpriseEditReq enterpriseEditReq){ - return Enterprise.builder() - .id(id) - .ebterpriseName(enterpriseEditReq.getEbterpriseName()) - .legalPerson(enterpriseEditReq.getLegalPerson()) - .businessLincenseNumber(enterpriseEditReq.getBusinessLincenseNumber()) - .estabinessDate(enterpriseEditReq.getEstabinessDate()) - .businessScope(enterpriseEditReq.getBusinessScope()) - .address(enterpriseEditReq.getAddress()) - .contactPhone(enterpriseEditReq.getContactPhone()) - .email(enterpriseEditReq.getEmail()) - .status(enterpriseEditReq.getStatus()) - .registrationDate(enterpriseEditReq.getRegistrationDate()) - .certificationId(enterpriseEditReq.getCertificationId()) - .authenticationDate(enterpriseEditReq.getAuthenticationDate()) - .serviceLevel(enterpriseEditReq.getServiceLevel()) - .openServerId(enterpriseEditReq.getOpenServerId()) - .addServerId(enterpriseEditReq.getAddServerId()) - .updateBy(enterpriseEditReq.getUpdateBy()) - .updateTime(new Date()) - .remark(enterpriseEditReq.getRemark()) - .build(); - } - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java deleted file mode 100644 index 7284615..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseEditReq.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.muyu.net.working.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 企业信息对象 enterprise - * - * @author muyu - * @date 2024-05-27 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "EnterpriseEditReq", description = "企业信息") -public class EnterpriseEditReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 企业名称 */ - @ApiModelProperty(name = "企业名称", value = "企业名称") - private String ebterpriseName; - - /** 法定代表人 */ - @ApiModelProperty(name = "法定代表人", value = "法定代表人") - private String legalPerson; - - /** 经营执照凭证号码 */ - @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") - private String businessLincenseNumber; - - /** 企业成立时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") - private Date estabinessDate; - - /** 经营范围 */ - @ApiModelProperty(name = "经营范围", value = "经营范围") - private String businessScope; - - /** 注册地址 */ - @ApiModelProperty(name = "注册地址", value = "注册地址") - private String address; - - /** 企业联系方式 */ - @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") - private String contactPhone; - - /** 公司邮箱 */ - @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") - private String email; - - /** 企业当前状态 */ - @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; - - /** 企业入驻平台时期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") - private Date registrationDate; - - /** 企业认证id */ - @ApiModelProperty(name = "企业认证id", value = "企业认证id") - private Long certificationId; - - /** 认证时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "认证时间", value = "认证时间") - private Date authenticationDate; - - /** 服务级别 */ - @ApiModelProperty(name = "服务级别", value = "服务级别") - private Long serviceLevel; - - /** 开通服务id */ - @ApiModelProperty(name = "开通服务id", value = "开通服务id") - private Long openServerId; - - /** 增值服务id */ - @ApiModelProperty(name = "增值服务id", value = "增值服务id") - private Long addServerId; - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java deleted file mode 100644 index 2b893a3..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseQueryReq.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.muyu.net.working.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 企业信息对象 enterprise - * - * @author muyu - * @date 2024-05-27 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "EnterpriseQueryReq", description = "企业信息") -public class EnterpriseQueryReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 企业名称 */ - @ApiModelProperty(name = "企业名称", value = "企业名称") - private String ebterpriseName; - - /** 法定代表人 */ - @ApiModelProperty(name = "法定代表人", value = "法定代表人") - private String legalPerson; - - /** 经营执照凭证号码 */ - @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") - private String businessLincenseNumber; - - /** 企业成立时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") - private Date estabinessDate; - - /** 经营范围 */ - @ApiModelProperty(name = "经营范围", value = "经营范围") - private String businessScope; - - /** 注册地址 */ - @ApiModelProperty(name = "注册地址", value = "注册地址") - private String address; - - /** 企业联系方式 */ - @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") - private String contactPhone; - - /** 公司邮箱 */ - @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") - private String email; - - /** 企业当前状态 */ - @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; - - /** 企业入驻平台时期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") - private Date registrationDate; - - /** 企业认证id */ - @ApiModelProperty(name = "企业认证id", value = "企业认证id") - private Long certificationId; - - /** 认证时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(name = "认证时间", value = "认证时间") - private Date authenticationDate; - - /** 服务级别 */ - @ApiModelProperty(name = "服务级别", value = "服务级别") - private Long serviceLevel; - - /** 开通服务id */ - @ApiModelProperty(name = "开通服务id", value = "开通服务id") - private Long openServerId; - - /** 增值服务id */ - @ApiModelProperty(name = "增值服务id", value = "增值服务id") - private Long addServerId; - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java b/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java deleted file mode 100644 index 03c34b6..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-common/src/main/java/com/muyu/net/working/domain/req/EnterpriseSaveReq.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.muyu.net.working.domain.req; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.AllArgsConstructor; -import lombok.experimental.SuperBuilder; -import io.swagger.annotations.*; -import com.muyu.common.core.web.domain.BaseEntity; - -/** - * 企业信息对象 enterprise - * - * @author muyu - * @date 2024-05-27 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@ApiModel(value = "EnterpriseSaveReq", description = "企业信息") -public class EnterpriseSaveReq extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** 主键 */ - - @ApiModelProperty(name = "主键", value = "主键") - private String id; - - /** 企业名称 */ - - @ApiModelProperty(name = "企业名称", value = "企业名称") - private String ebterpriseName; - - /** 法定代表人 */ - - @ApiModelProperty(name = "法定代表人", value = "法定代表人") - private String legalPerson; - - /** 经营执照凭证号码 */ - - @ApiModelProperty(name = "经营执照凭证号码", value = "经营执照凭证号码") - private String businessLincenseNumber; - - /** 企业成立时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "企业成立时间", value = "企业成立时间") - private Date estabinessDate; - - /** 经营范围 */ - - @ApiModelProperty(name = "经营范围", value = "经营范围") - private String businessScope; - - /** 注册地址 */ - - @ApiModelProperty(name = "注册地址", value = "注册地址") - private String address; - - /** 企业联系方式 */ - - @ApiModelProperty(name = "企业联系方式", value = "企业联系方式") - private String contactPhone; - - /** 公司邮箱 */ - - @ApiModelProperty(name = "公司邮箱", value = "公司邮箱") - private String email; - - /** 企业当前状态 */ - - @ApiModelProperty(name = "企业当前状态", value = "企业当前状态") - private String status; - - /** 企业入驻平台时期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "企业入驻平台时期", value = "企业入驻平台时期") - private Date registrationDate; - - /** 企业认证id */ - - @ApiModelProperty(name = "企业认证id", value = "企业认证id") - private Long certificationId; - - /** 认证时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - - @ApiModelProperty(name = "认证时间", value = "认证时间") - private Date authenticationDate; - - /** 服务级别 */ - - @ApiModelProperty(name = "服务级别", value = "服务级别") - private Long serviceLevel; - - /** 开通服务id */ - - @ApiModelProperty(name = "开通服务id", value = "开通服务id") - private Long openServerId; - - /** 增值服务id */ - - @ApiModelProperty(name = "增值服务id", value = "增值服务id") - private Long addServerId; - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java deleted file mode 100644 index b0eaf90..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/MuYuNetWorkingApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.net.working; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import com.muyu.common.swagger.annotation.EnableCustomSwagger2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 车联网运营平台启动类 MuYuNetWorkingApplication - * - * @author DeKangLiu - * Date 2024/5/26 21:45 - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class MuYuNetWorkingApplication { - public static void main (String[] args) { - SpringApplication.run(MuYuNetWorkingApplication.class, args); - } -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java deleted file mode 100644 index 0618b4d..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.muyu.net.working.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import io.swagger.annotations.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -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.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.log.annotation.Log; -import com.muyu.common.log.enums.BusinessType; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.net.working.domain.Enterprise; -import com.muyu.net.working.domain.req.EnterpriseQueryReq; -import com.muyu.net.working.domain.req.EnterpriseSaveReq; -import com.muyu.net.working.domain.req.EnterpriseEditReq; -import com.muyu.net.working.service.EnterpriseService; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 企业信息Controller - * - * @author muyu - * @date 2024-05-27 - */ -@Api(tags = "企业信息") -@RestController -@RequestMapping("/car") -public class EnterpriseController extends BaseController { - @Autowired - private EnterpriseService enterpriseService; - - /** - * 查询企业信息列表 - */ - @ApiOperation("获取企业信息列表") - @RequiresPermissions("netWorking:car:list") - @GetMapping("/list") - public Result> list(EnterpriseQueryReq enterpriseQueryReq) { - startPage(); - List list = enterpriseService.list(Enterprise.queryBuild(enterpriseQueryReq)); - return getDataTable(list); - } - - /** - * 导出企业信息列表 - */ - @ApiOperation("导出企业信息列表") - @RequiresPermissions("netWorking:car:export") - @Log(title = "企业信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, Enterprise enterprise) { - List list = enterpriseService.list(enterprise); - ExcelUtil util = new ExcelUtil(Enterprise.class); - util.exportExcel(response, list, "企业信息数据"); - } - - /** - * 获取企业信息详细信息 - */ - @ApiOperation("获取企业信息详细信息") - @RequiresPermissions("netWorking:car:query") - @GetMapping(value = "/{id}") - @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class) - public Result getInfo(@PathVariable("id") String id) { - return Result.success(enterpriseService.getById(id)); - } - - /** - * 新增企业信息 - */ - @RequiresPermissions("netWorking:car:add") - @Log(title = "企业信息", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("新增企业信息") - public Result add(@RequestBody EnterpriseSaveReq enterpriseSaveReq) { - return toAjax(enterpriseService.save(Enterprise.saveBuild(enterpriseSaveReq))); - } - - /** - * 修改企业信息 - */ - @RequiresPermissions("netWorking:car:edit") - @Log(title = "企业信息", businessType = BusinessType.UPDATE) - @PutMapping("/{id}") - @ApiOperation("修改企业信息") - public Result edit(@PathVariable String id, @RequestBody EnterpriseEditReq enterpriseEditReq) { - return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); - } - - /** - * 删除企业信息 - */ - @RequiresPermissions("netWorking:car:remove") - @Log(title = "企业信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - @ApiOperation("删除企业信息") - @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") - public Result remove(@PathVariable List ids) { - return toAjax(enterpriseService.removeBatchByIds(ids)); - } -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java deleted file mode 100644 index 0a82543..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/mapper/EnterpriseMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.net.working.mapper; - -import java.util.List; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.net.working.domain.Enterprise; - -/** - * 企业信息Mapper接口 - * - * @author muyu - * @date 2024-05-27 - */ -public interface EnterpriseMapper extends BaseMapper { - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java deleted file mode 100644 index 5bb5b4a..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/EnterpriseService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.net.working.service; - -import java.util.List; -import com.muyu.net.working.domain.Enterprise; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 企业信息Service接口 - * - * @author muyu - * @date 2024-05-27 - */ -public interface EnterpriseService extends IService { - /** - * 查询企业信息列表 - * - * @param enterprise 企业信息 - * @return 企业信息集合 - */ - public List list(Enterprise enterprise); - -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java deleted file mode 100644 index 5ca6b7d..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/service/impl/EnterpriseServiceImpl.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.muyu.net.working.service.impl; - -import java.util.List; - -import com.muyu.common.core.utils.ObjUtils; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import com.muyu.net.working.mapper.EnterpriseMapper; -import com.muyu.net.working.domain.Enterprise; -import com.muyu.net.working.service.EnterpriseService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - -/** - * 企业信息Service业务层处理 - * - * @author muyu - * @date 2024-05-27 - */ -@Slf4j -@Service -public class EnterpriseServiceImpl extends ServiceImpl implements EnterpriseService { - - /** - * 查询企业信息列表 - * - * @param enterprise 企业信息 - * @return 企业信息 - */ - @Override - public List list(Enterprise enterprise) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - - if (ObjUtils.notNull(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); - } -} diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml deleted file mode 100644 index 74678d7..0000000 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/resources/mapper/netWorking/EnterpriseMapper.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - diff --git a/sql/ry_20230706.sql b/sql/ry_20230706.sql index 8365034..4f5e7b6 100644 --- a/sql/ry_20230706.sql +++ b/sql/ry_20230706.sql @@ -67,8 +67,8 @@ create table sys_user ( -- ---------------------------- -- 初始化-用户信息表数据 -- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); +insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '101.34.248.9', sysdate(), 'admin', sysdate(), '', null, '管理员'); +insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '101.34.248.9', sysdate(), 'admin', sysdate(), '', null, '测试员'); -- ---------------------------- diff --git a/sql/ry_config_20220929.sql b/sql/ry_config_20220929.sql index a426ae7..da9c070 100644 --- a/sql/ry_config_20220929.sql +++ b/sql/ry_config_20220929.sql @@ -40,7 +40,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (5,'muyu-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip','48e0ed4a040c402bdc2444213a82c910','2020-11-20 00:00:00','2022-09-29 02:49:09','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), (6,'muyu-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip\n\n# 代码生成\ngen:\n # 作者\n author: muyu\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.muyu.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), (7,'muyu-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.muyu.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By muyu\n licenseUrl: https://muyu.vip\n','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), -(8,'muyu-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/muyu/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), +(8,'muyu-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://101.34.248.9:9300\r\n path: D:/muyu/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), (9,'sentinel-muyu-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"muyu-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"muyu-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','限流策略','null','null','json',NULL,'');