framework/src/main/java/com/yuanchu/limslaboratory/utils/MyUtils.java
@@ -49,7 +49,7 @@ } /** * è·åéæºå å¯ç * è·åéæºæ°å * @param n 使° * @return è¿åéæºå¼ */ sys/src/main/resources/application-dev.yml
@@ -13,7 +13,7 @@ datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/lims_manage?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 username: root password: 123456 druid: 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); 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); } } user-server/src/main/java/com/yuanchu/limslaboratory/controller/AdminController.java
ÎļþÒÑɾ³ý 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 { } 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 { } 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 { } 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 { } 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> { } 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> { } user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.javacopy 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
Îļþ´Ó user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.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> { } user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
ÎļþÃû´Ó user-server/src/main/java/com/yuanchu/limslaboratory/mapper/AdminMapper.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> { } user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Admin.java
ÎļþÒÑɾ³ý 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; } 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 = "ä¼ä¸åç¨æ·å ³èid") @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; } 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; } 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; } 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> { } 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> { } user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
ÎļþÃû´Ó user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.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> { } user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.javacopy 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
Îļþ´Ó user-server/src/main/java/com/yuanchu/limslaboratory/service/AdminService.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> { } user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/AdminServiceImpl.java
ÎļþÒÑɾ³ý 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 { } 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 { } 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 { } 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 { } 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> 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> 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> 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>