From f10cdc8d9d4e73908d41c47a77ecd65b08c25576 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 07 七月 2023 11:05:20 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-management-system
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseServiceImpl.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java | 48 +++++
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 6
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 7
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java | 6
user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java | 6
user-server/src/main/resources/mapper/RoleMapper.xml | 5
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseService.java | 16 +
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java | 16 +
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java | 59 ++++++
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 6
framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java | 2
sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java | 8
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 62 ++++++
user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java | 16 +
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java | 47 +++++
user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseController.java | 20 ++
user-server/src/main/resources/mapper/UserMapper.xml | 5
/dev/null | 20 --
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 20 ++
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseMapper.java | 16 +
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 20 ++
user-server/src/main/resources/mapper/EnterpriseMapper.xml | 5
user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml | 5
28 files changed, 481 insertions(+), 40 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java b/framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java
index dba8bec..3efefe9 100644
--- a/framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java
@@ -49,7 +49,7 @@
}
/**
- * 鑾峰彇闅忔満鍔犲瘑鐩�
+ * 鑾峰彇闅忔満鏁板瓧
* @param n 浣嶆暟
* @return 杩斿洖闅忔満鍊�
*/
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java b/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
index 063777c..a70131e 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/CodeGenerator.java
@@ -17,14 +17,14 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://localhost:3306/lims_manage?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ public static String database_url = "jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
public static String database_driver_name = "com.mysql.cj.jdbc.Driver";
public static String database_username = "root";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
public static String model_name = "/user-server"; // 濡傛灉涓哄垎甯冨紡濉瓙妯″潡鍚嶇О锛屽鏋滀笉鏄垎甯冨紡涓虹┖鍗冲彲
- public static String setParent = "com.yunchu.limslaboratory"; // 鍖呰矾寰�
- public static Boolean Override = true; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
+ public static String setParent = "com.yuanchu.limslaboratory"; // 鍖呰矾寰�
+ public static Boolean Override = false; // 鏄惁瑕嗙洊鍘熸潵鐨勬枃浠讹紵
public static void main(String[] args) {
// 浠ｇ爜鐢熸垚鍣�
@@ -98,7 +98,7 @@
.setColumnNaming(NamingStrategy.underline_to_camel)
.setEntityLombokModel(true)
.setRestControllerStyle(true)
- .setInclude(scanner("琛ㄥ悕锛屽涓┖鏍煎垎鍓�").split(" "))
+ .setInclude(scanner("琛ㄥ悕锛屽涓┖鏍煎垎鍓�").split(","))
.setControllerMappingHyphenStyle(true)
.setTablePrefix("m_");
mpg.setStrategy(strategy);
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 9c10eef..901a1a4 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,16 +1,17 @@
package com.yuanchu.limslaboratory;
-import com.yuanchu.limslaboratory.utils.MyUtils;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+
+import java.text.NumberFormat;
@SpringBootTest
class SysApplicationTests {
@Test
void contextLoads() {
- String number = MyUtils.getNumber(6);
- System.out.println(number);
+
}
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/AdminController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/AdminController.java
deleted file mode 100644
index 2f93b30..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/AdminController.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.clients.UserLoginUtils;
-import com.yuanchu.limslaboratory.pojo.Admin;
-import com.yuanchu.limslaboratory.service.AdminService;
-import com.yuanchu.limslaboratory.utils.SpringUtils;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
- */
-@Api(tags = "绠＄悊鍛樻搷浣滄帴鍙�")
-@RestController
-@RequestMapping("/admin")
-public class AdminController {
-
- @Autowired
- private AdminService service;
-
- @ApiOperation("Post鎺ュ彛")
- @PostMapping("/post")
- public Result<Map<String, Object>> post(Admin admin) {
- UserLoginUtils bean = SpringUtils.getBean(UserLoginUtils.class);
- return bean.LoginExamine();
- }
-
- @ApiOperation("鍒犻櫎鎺ュ彛")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "闇�瑕佸垹闄ょ殑ID", dataTypeClass = String.class, required = true)
- })
- @PostMapping("/delete")
- public Result<?> delete(Integer id) {
- service.removeById(id);
- return Result.success("鐧诲綍鎴愬姛");
- }
-
- @ApiOperation("鏌ヨ鎺ュ彛")
- @GetMapping("/get")
- public Result<?> get() {
- List<Admin> list = service.list();
- return Result.success(list);
- }
-
- @GetMapping("/鏇存柊鎺ュ彛")
- @ApiOperation("Crunchy")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "闇�瑕佺殑ID", dataTypeClass = String.class, required = true)
- })
- public Result<?> put(String id) {
- Admin systest2 = service.getById(id);
- systest2.setId(1);
- service.updateById(systest2);
- return Result.success();
- }
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseController.java
new file mode 100644
index 0000000..65ecfc8
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@RestController
+@RequestMapping("/enterprise")
+public class EnterpriseController {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
new file mode 100644
index 0000000..4265bd6
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/EnterpriseUserListController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@RestController
+@RequestMapping("/enterprise-user-list")
+public class EnterpriseUserListController {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
new file mode 100644
index 0000000..0191900
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@RestController
+@RequestMapping("/role")
+public class RoleController {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
new file mode 100644
index 0000000..5bb5aca
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@RestController
+@RequestMapping("/user")
+public class UserController {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseMapper.java
new file mode 100644
index 0000000..9b927b0
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.Enterprise;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+public interface EnterpriseMapper extends BaseMapper<Enterprise> {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java
new file mode 100644
index 0000000..cd206d7
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/EnterpriseUserListMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+public interface EnterpriseUserListMapper extends BaseMapper<EnterpriseUserList> {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
similarity index 61%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java
copy to user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
index 1b0c719..764ad21 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
@@ -1,6 +1,6 @@
package com.yuanchu.limslaboratory.mapper;
-import com.yuanchu.limslaboratory.pojo.Admin;
+import com.yuanchu.limslaboratory.pojo.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
+ * @since 2023-07-07
*/
-public interface AdminMapper extends BaseMapper<Admin> {
+public interface RoleMapper extends BaseMapper<Role> {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
similarity index 61%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 1b0c719..ba21890 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -1,6 +1,6 @@
package com.yuanchu.limslaboratory.mapper;
-import com.yuanchu.limslaboratory.pojo.Admin;
+import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
+ * @since 2023-07-07
*/
-public interface AdminMapper extends BaseMapper<Admin> {
+public interface UserMapper extends BaseMapper<User> {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Admin.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Admin.java
deleted file mode 100644
index 53db2ca..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Admin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Admin瀵硅薄", description="")
-public class Admin implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "涓婚敭ID", hidden = true)
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8") // 鍚庡彴缁欏墠绔仛鏃堕棿鏍煎紡鍖�
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @TableField(fill = FieldFill.INSERT_UPDATE, update = "now()")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8") // 鍚庡彴缁欏墠绔仛鏃堕棿鏍煎紡鍖�
- private LocalDateTime updateTime;
-
- @TableLogic(value = "0", delval = "1")
- @ApiModelProperty(value = "閫昏緫鍒犻櫎", hidden = true)
- private Integer isDelete;
-
- @ApiModelProperty(value = "涔愯閿�", hidden = true)
-// @Version
- private Integer version;
-
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
new file mode 100644
index 0000000..175ba92
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Enterprise.java
@@ -0,0 +1,59 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Enterprise瀵硅薄", description="")
+public class Enterprise implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "浼佷笟缂栧彿")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶅瓧")
+ private String name;
+
+ @ApiModelProperty(value = "浼佷笟绠�绉�")
+ private String byname;
+
+ @ApiModelProperty(value = "鑱旂郴浜鸿处鍙�")
+ private String linkAccount;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄瘑鐮�")
+ private String linkPassword;
+
+ @ApiModelProperty(value = "鑱旂郴浜哄悕瀛�")
+ private String linkName;
+
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�")
+ private String linkPhone;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "閿�")
+ private Integer version;
+
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java
new file mode 100644
index 0000000..d1ed711
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/EnterpriseUserList.java
@@ -0,0 +1,47 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="EnterpriseUserList瀵硅薄", description="")
+public class EnterpriseUserList implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "浼佷笟鍜岀敤鎴峰叧鑱攊d")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "浼佷笟id")
+ private Integer enterpriseId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛id")
+ private Integer userId;
+
+ @ApiModelProperty(value = "0:鍒犻櫎;1:姝ｅ父")
+ private Integer state;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
new file mode 100644
index 0000000..152fe60
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
@@ -0,0 +1,48 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="Role瀵硅薄", description="")
+public class Role implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "瑙掕壊id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "瑙掕壊鍚�")
+ private String name;
+
+ @ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺")
+ private Integer power;
+
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
+ private Integer state;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "涔愯閿�")
+ private Integer version;
+
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
new file mode 100644
index 0000000..34f3d2f
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -0,0 +1,62 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="User瀵硅薄", description="")
+public class User implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐢ㄦ埛id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "璐﹀彿")
+ private String account;
+
+ @ApiModelProperty(value = "瀵嗙爜")
+ private String password;
+
+ @ApiModelProperty(value = "濮撳悕")
+ private String name;
+
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ @ApiModelProperty(value = "閭")
+ private String email;
+
+ @ApiModelProperty(value = "骞撮緞")
+ private Integer age;
+
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
+ private Integer jobState;
+
+ private LocalDateTime createTime;
+
+ private LocalDateTime updateTime;
+
+ private Integer version;
+
+ @ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
+ private Integer roleId;
+
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseService.java
new file mode 100644
index 0000000..677779d
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Enterprise;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+public interface EnterpriseService extends IService<Enterprise> {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java
new file mode 100644
index 0000000..5e99cac
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/EnterpriseUserListService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+public interface EnterpriseUserListService extends IService<EnterpriseUserList> {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
similarity index 61%
rename from user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
index c6e61a6..f301dfb 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
@@ -1,6 +1,6 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.Admin;
+import com.yuanchu.limslaboratory.pojo.Role;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
+ * @since 2023-07-07
*/
-public interface AdminService extends IService<Admin> {
+public interface RoleService extends IService<Role> {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
similarity index 61%
copy from user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java
copy to user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index c6e61a6..ff42a44 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -1,6 +1,6 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.Admin;
+import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -9,8 +9,8 @@
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
+ * @since 2023-07-07
*/
-public interface AdminService extends IService<Admin> {
+public interface UserService extends IService<User> {
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/AdminServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/AdminServiceImpl.java
deleted file mode 100644
index db1d7df..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/AdminServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.yuanchu.limslaboratory.pojo.Admin;
-import com.yuanchu.limslaboratory.mapper.AdminMapper;
-import com.yuanchu.limslaboratory.service.AdminService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-04
- */
-@Service
-public class AdminServiceImpl extends ServiceImpl<AdminMapper, Admin> implements AdminService {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseServiceImpl.java
new file mode 100644
index 0000000..227ae2f
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Enterprise;
+import com.yuanchu.limslaboratory.mapper.EnterpriseMapper;
+import com.yuanchu.limslaboratory.service.EnterpriseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Service
+public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterprise> implements EnterpriseService {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java
new file mode 100644
index 0000000..5a918b9
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/EnterpriseUserListServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.EnterpriseUserList;
+import com.yuanchu.limslaboratory.mapper.EnterpriseUserListMapper;
+import com.yuanchu.limslaboratory.service.EnterpriseUserListService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Service
+public class EnterpriseUserListServiceImpl extends ServiceImpl<EnterpriseUserListMapper, EnterpriseUserList> implements EnterpriseUserListService {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
new file mode 100644
index 0000000..ba4584e
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.Role;
+import com.yuanchu.limslaboratory.mapper.RoleMapper;
+import com.yuanchu.limslaboratory.service.RoleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
new file mode 100644
index 0000000..6cf6e1f
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.mapper.UserMapper;
+import com.yuanchu.limslaboratory.service.UserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-07
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
+
+}
diff --git a/user-server/src/main/resources/mapper/EnterpriseMapper.xml b/user-server/src/main/resources/mapper/EnterpriseMapper.xml
new file mode 100644
index 0000000..4e3ed5f
--- /dev/null
+++ b/user-server/src/main/resources/mapper/EnterpriseMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunachu.limslaboratory.mapper.EnterpriseMapper">
+
+</mapper>
diff --git a/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml b/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
new file mode 100644
index 0000000..a9293d3
--- /dev/null
+++ b/user-server/src/main/resources/mapper/EnterpriseUserListMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.EnterpriseUserListMapper">
+
+</mapper>
diff --git a/user-server/src/main/resources/mapper/RoleMapper.xml b/user-server/src/main/resources/mapper/RoleMapper.xml
new file mode 100644
index 0000000..ea9cf2d
--- /dev/null
+++ b/user-server/src/main/resources/mapper/RoleMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.RoleMapper">
+
+</mapper>
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
new file mode 100644
index 0000000..b18997b
--- /dev/null
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.limslaboratory.mapper.UserMapper">
+
+</mapper>
--
Gitblit v1.9.3