six-vehicle
/
cloud-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feax:()添加企业表的同时将数据同步进去 企业列表展示

dev.entOperation
crj 2024-10-04 11:09:33 +08:00
parent 0c7795ea71
commit 46689d02e1
5 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
View File

@ -89,13 +89,6 @@
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join</artifactId>
<version>1.4.13</version>
</dependency>
</dependencies>
<build>

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java
View File

@ -33,7 +33,7 @@ public class CarMessageController {
@GetMapping("/selectByTemplateId")
private Result<List<CarMessage>> selectByTemplateId(@RequestParam("templateId") Integer templateId) {
return Result.success(carMessageService.list
(new LambdaQueryWrapper<CarMessage>().eq(CarMessage::getTemplateId, templateId)));
(new LambdaQueryWrapper<CarMessage>().eq(CarMessage::getTemplateId, templateId)));
}
}

3
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java
View File

@ -1,7 +1,6 @@
package com.muyu.enterprise.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.muyu.enterprise.domain.SysCarFault;
import org.apache.ibatis.annotations.Mapper;
@ -13,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper;
* @Description SysCarFaultMapper:故障管理持久层
*/
@Mapper
public interface SysCarFaultMapper extends MPJBaseMapper<SysCarFault> {
public interface SysCarFaultMapper extends BaseMapper<SysCarFault> {
}

26
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java
View File

@ -40,7 +40,7 @@ public class SysEntController extends BaseController {
* 获取企业信息
* @return 响应结果
*/
@GetMapping(value = "/getInfo")
@RequestMapping(value = "/selectList",method = RequestMethod.GET)
@Operation(summary = "获取企业信息", description = "现有的基础企业信息")
public Result<List<EntResp>> getInfo() {
return Result.success(
@ -48,18 +48,18 @@ public class SysEntController extends BaseController {
);
}
/**
* 查询企业信息列表
* @param entListReq 企业列表请求对象
* @return 响应结果
*/
@PostMapping(value = "/selectList")
@Operation(summary = "查询企业信息列表", description = "分页展示企业信息")
public Result<TableDataInfo<EntResp>> selectList(@RequestBody EntListReq entListReq) {
startPage();
List<EntResp> entRespList = sysEntService.selectList(entListReq);
return getDataTable(entRespList);
}
// /**
// * 查询企业信息列表
// * @param entListReq 企业列表请求对象
// * @return 响应结果
// */
// @PostMapping(value = "/selectList")
// @Operation(summary = "查询企业信息列表", description = "分页展示企业信息")
// public Result<TableDataInfo<EntResp>> selectList(@RequestBody EntListReq entListReq) {
// startPage();
// List<EntResp> entRespList = sysEntService.selectList(entListReq);
// return getDataTable(entRespList);
// }
/**
* 根据ID获取企业信息

23
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.*;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@ -126,7 +123,6 @@ public class SysUserController extends BaseController {
@InnerAuth
@PostMapping("/register")
public Result<Boolean> register (@RequestBody RegisterBody registerBody) {
// String username = registerBody.getUsername();
String username = registerBody.getUsername();
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
@ -136,17 +132,16 @@ public class SysUserController extends BaseController {
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return Result.error("当前系统没有开启注册功能！");
}
// SysUser sysUser = SysUser.builder().userName(username).build();
if (!userService.checkUserNameUnique(sysUser)) {
return Result.error("保存用户'" + username + "'失败，注册账号已存在");
}
//添加企业
SysEnt sysEnt = SysEnt.builder()
.name(registerBody.getEntName())
.leader(registerBody.getLeader())
.phone(registerBody.getPhone())
.email(registerBody.getEmail())
.entCode(registerBody.getUsername())
.build();
entService.save(sysEnt);
@ -215,6 +210,20 @@ public class SysUserController extends BaseController {
//执行建表语句
statement.executeUpdate(tableSQL);
log.info("创建表成功");
String insertSQL="INSERT INTO sys_ent (name, leader, phone, email, ent_code, ent_status, create_by, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
try(PreparedStatement preparedStatement = connection1.prepareStatement(insertSQL)) {
//设置插入的值
preparedStatement.setString(1,registerBody.getEntName());
preparedStatement.setString(2,registerBody.getLeader());
preparedStatement.setString(3,registerBody.getPhone());
preparedStatement.setString(4,registerBody.getEmail());
preparedStatement.setString(5,username);
preparedStatement.setInt(6,0);
preparedStatement.setString(7, sysUser.getCreateBy());
preparedStatement.setTimestamp(8, new Timestamp(System.currentTimeMillis())); // 当前时间
preparedStatement.executeUpdate();
log.info("插入企业信息成功");
}
return Result.success();
}
}