Merge remote-tracking branch 'origin/dev.saas' into dev

dev.vehicleGateway
xinzirun 2024-09-26 10:23:39 +08:00
commit de23d2e383
8 changed files with 323 additions and 1 deletions

View File

@ -0,0 +1,56 @@
package com.muyu.common.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* @Author: zi run
* @Date 2024/9/25 22:38
* @Description
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "sys_ent")
@EqualsAndHashCode(callSuper = true)
public class SysEnt extends BaseEntity {
/**
*
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
*
*/
private String name;
/**
*
*/
private String leader;
/**
*
*/
private String phoneNumber;
/**
*
*/
private String email;
/**
*
*/
private Long databaseName;
}

View File

@ -11,7 +11,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @author muyu
*/
@EnableCustomConfig
//@EnableCustomSwagger2
@EnableMyFeignClients
@SpringBootApplication
public class CloudSystemApplication {

View File

@ -0,0 +1,53 @@
package com.muyu.system.controller;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
import com.muyu.common.system.domain.SysEnt;
import com.muyu.system.domain.req.EntListReq;
import com.muyu.system.domain.resp.EntResp;
import com.muyu.system.service.SysEntService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author: zi run
* @Date 2024/9/26 0:21
* @Description
*/
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/ent")
@Tag(name = "SysEntController", description = "企业管理")
public class SysEntController extends BaseController {
/**
*
*/
private final SysEntService sysEntService;
/**
*
*/
@GetMapping
@Operation(summary = "获取企业信息", description = "现有的基础企业信息")
public Result<List<EntResp>> get() {
return Result.success(sysEntService.selectList(new EntListReq()), Constants.SUCCESS_MESSAGE);
}
/**
*
*/
@PostMapping(value = "/selectList")
@Operation(summary = "查询企业信息列表", description = "分页展示企业信息")
public Result<TableDataInfo<EntResp>> selectList(@RequestBody EntListReq entListReq) {
startPage();
List<EntResp> entRespList = sysEntService.selectList(entListReq);
return getDataTable(entRespList);
}
}

View File

@ -0,0 +1,43 @@
package com.muyu.system.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: zi run
* @Date 2024/9/26 0:49
* @Description
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EntListReq {
/**
*
*/
private String entName;
/**
*
*/
private String leader;
/**
*
*/
private String phoneNumber;
/**
*
*/
private String email;
/**
*
*/
private String databaseName;
}

View File

@ -0,0 +1,69 @@
package com.muyu.system.domain.resp;
import com.muyu.common.system.domain.SysEnt;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author: zi run
* @Date 2024/9/26 0:42
* @Description
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EntResp {
/**
* ID
*/
@Schema(title = "企业ID", type = "Long", defaultValue = "1", description = "企业ID")
private Long entId;
/**
*
*/
@Schema(title = "企业名称", type = "String", defaultValue = "长安汽车", description = "企业名称")
private String entName;
/**
*
*/
@Schema(title = "负责人", type = "String", defaultValue = "张三", description = "负责人")
private String leader;
/**
*
*/
@Schema(title = "手机号码", type = "String", defaultValue = "18321974313", description = "手机号码")
private String phoneNumber;
/**
*
*/
@Schema(title = "邮箱", type = "String", defaultValue = "12123@qq.com", description = "邮箱账号")
private String email;
/**
*
*/
private Long databaseName;
/**
*
*/
public static EntResp entBuild(SysEnt sysEnt) {
return EntResp.builder()
.entId(sysEnt.getId())
.entName(sysEnt.getName())
.leader(sysEnt.getLeader())
.phoneNumber(sysEnt.getPhoneNumber())
.email(sysEnt.getEmail())
.databaseName(sysEnt.getDatabaseName())
.build();
}
}

View File

@ -0,0 +1,14 @@
package com.muyu.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.common.system.domain.SysEnt;
import org.apache.ibatis.annotations.Mapper;
/**
* @Author: zi run
* @Date 2024/9/26 0:10
* @Description
*/
@Mapper
public interface SysEntMapper extends BaseMapper<SysEnt> {
}

View File

@ -0,0 +1,23 @@
package com.muyu.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.system.domain.SysEnt;
import com.muyu.system.domain.req.EntListReq;
import com.muyu.system.domain.resp.EntResp;
import java.util.List;
/**
* @Author: zi run
* @Date 2024/9/26 0:14
* @Description
*/
public interface SysEntService extends IService<SysEnt> {
/**
*
* @param entListReq
* @return
*/
public List<EntResp> selectList(EntListReq entListReq);
}

View File

@ -0,0 +1,65 @@
package com.muyu.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.system.domain.SysEnt;
import com.muyu.system.domain.req.EntListReq;
import com.muyu.system.domain.resp.EntResp;
import com.muyu.system.mapper.SysEntMapper;
import com.muyu.system.service.SysEntService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Author: zi run
* @Date 2024/9/26 0:15
* @Description
*/
@Service
@RequiredArgsConstructor
public class SysEntServiceImpl extends ServiceImpl<SysEntMapper, SysEnt> implements SysEntService {
/**
*
*/
private final SysEntMapper sysEntMapper;
/**
*
* @param entListReq
* @return
*/
@Override
public List<EntResp> selectList(EntListReq entListReq) {
LambdaQueryWrapper<SysEnt> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(
StringUtils.isNotEmpty(entListReq.getEntName()),
SysEnt::getName, entListReq.getEntName()
);
queryWrapper.like(
StringUtils.isNotEmpty(entListReq.getLeader()),
SysEnt::getLeader, entListReq.getLeader()
);
queryWrapper.like(
StringUtils.isNotEmpty(entListReq.getPhoneNumber()),
SysEnt::getPhoneNumber, entListReq.getPhoneNumber()
);
queryWrapper.like(
StringUtils.isNotEmpty(entListReq.getEmail()),
SysEnt::getEmail, entListReq.getEmail()
);
queryWrapper.eq(
StringUtils.isNotEmpty(entListReq.getDatabaseName()),
SysEnt::getDatabaseName, entListReq.getDatabaseName()
);
List<SysEnt> sysEntList = this.list(queryWrapper);
return sysEntList.stream()
.map(EntResp::entBuild)
.toList();
}
}