杰生

hx-common/code-generator/src/main/java/com/fjhx/modular/Storage.java

@@ -37,7 +37,7 @@ public class Storage {
     public static String MODULAR_NAME = "storage";
 
     // 需要生成的表名称,多表用,隔开
-    public static String INCLUDE = "material_category";
+    public static String INCLUDE = "u_user";
 
     // mysql连接
     public static String MYSQL_URL = "rm-wz9f1jcr5466b42415o.mysql.rds.aliyuncs.com:3306";

hx-service-api/storage-api/src/main/java/com/fjhx/entity/u/UUser.java

@@ -0,0 +1,131 @@
+package com.fjhx.entity.u;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+
+import com.fjhx.base.BasicEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 管理员
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UUser extends BasicEntity {
+
+
+    /**
+     * 软删除
+     */
+    @TableLogic
+    @TableField("IsDelete")
+    private Boolean IsDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("CreatedTime")
+    private Date CreatedTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("UpdatedTime")
+    private Date UpdatedTime;
+
+    /**
+     * 手机号码
+     */
+    @TableField("Mobile")
+    private String Mobile;
+
+    /**
+     * 真实姓名
+     */
+    @TableField("RealName")
+    private String RealName;
+
+    /**
+     * 部门ID
+     */
+    @TableField("DepartmentIDStr")
+    private String DepartmentIDStr;
+
+    /**
+     * 用户状态 是否离职
+     */
+    @TableField("IsQuit")
+    private Boolean IsQuit;
+
+    /**
+     * 离职时间
+     */
+    @TableField("QuitTime")
+    private Date QuitTime;
+
+    @TableField("IsSuperAdmin")
+    private Boolean IsSuperAdmin;
+
+    /**
+     * 工号
+     */
+    @TableField("JobNo")
+    private String JobNo;
+
+    /**
+     * 身份证
+     */
+    @TableField("IDCard")
+    private String IDCard;
+
+    /**
+     * 是否是负责人
+     */
+    @TableField("IsLeader")
+    private Boolean IsLeader;
+
+    /**
+     * 人脸照片
+     */
+    @TableField("FaceImagUrl")
+    private String FaceImagUrl;
+
+    /**
+     * 第三方人脸id
+     */
+    @TableField("FaceID")
+    private String FaceID;
+
+    /**
+     * 用户状态 是否在线可接单
+     */
+    @TableField("IsOnLine")
+    private Boolean IsOnLine;
+
+    /**
+     * 性别 （枚举定义：0=未知，1=男，2=女）
+     */
+    @TableField("SexCode")
+    private Integer SexCode;
+
+    /**
+     * 角色ID
+     */
+    @TableField("RoleKey")
+    private String RoleKey;
+
+    /**
+     * 部门ID
+     */
+    @TableField("DepartmentID")
+    private String DepartmentID;
+
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/u/UUserEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.u;
+
+import com.fjhx.entity.u.UUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 管理员
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UUserEx extends UUser {
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/params/u/UUserVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.u;
+
+import com.fjhx.entity.u.UUser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 管理员
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UUserVo extends UUser {
+
+}

hx-service/storage/src/main/java/com/fjhx/u/controller/UUserController.java

@@ -0,0 +1,62 @@
+package com.fjhx.u.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.u.UUser;
+import com.fjhx.u.service.UUserService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@RestController
+@RequestMapping("/uUser")
+public class UUserController {
+
+    @Autowired
+    private UUserService uUserService;
+
+//    @PostMapping("/page")
+//    public R page(@RequestBody Map<String, Object> condition){
+//        Page<UUser> result = uUserService.getPage(condition);
+//        return R.success(result);
+//    }
+//
+//    @PostMapping("/add")
+//    public R add(@RequestBody UUserVo uUserVo){
+//        uUserService.add(uUserVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/edit")
+//    public R edit(@RequestBody UUserVo uUserVo){
+//        uUserService.edit(uUserVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    public R delete(@RequestBody UUserVo uUserVo){
+//        uUserService.delete(uUserVo);
+//        return R.success();
+//    }
+
+    @PostMapping("/list")
+    public R list(@RequestBody Map<String, Object> condition) {
+        List<Map<String,Object>> result = uUserService.getList(condition);
+        return R.success(result);
+    }
+
+}
+

hx-service/storage/src/main/java/com/fjhx/u/mapper/UUserMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.u.mapper;
+
+import com.fjhx.entity.u.UUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 管理员 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+public interface UUserMapper extends BaseMapper<UUser> {
+
+}

hx-service/storage/src/main/java/com/fjhx/u/mapper/UUserMapper.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.fjhx.u.mapper.UUserMapper">
+
+</mapper>

hx-service/storage/src/main/java/com/fjhx/u/service/UUserService.java

@@ -0,0 +1,31 @@
+package com.fjhx.u.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.u.UUser;
+import com.fjhx.params.u.UUserVo;
+import com.fjhx.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+public interface UUserService extends BaseService<UUser> {
+
+    Page<UUser> getPage(Map<String, Object> condition);
+
+    void add(UUserVo uUserVo);
+
+    void edit(UUserVo uUserVo);
+
+    void delete(UUserVo uUserVo);
+
+    List<Map<String, Object>> getList(Map<String, Object> condition);
+
+}

hx-service/storage/src/main/java/com/fjhx/u/service/impl/UUserServiceImpl.java

@@ -0,0 +1,61 @@
+package com.fjhx.u.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.u.UUser;
+import com.fjhx.params.u.UUserVo;
+import com.fjhx.u.mapper.UUserMapper;
+import com.fjhx.u.service.UUserService;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-11-28
+ */
+@Service
+public class UUserServiceImpl extends ServiceImpl<UUserMapper, UUser> implements UUserService {
+
+    @Override
+    public Page<UUser> getPage(Map<String, Object> condition) {
+
+        IWrapper<UUser> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(UUserVo uUserVo) {
+        save(uUserVo);
+    }
+
+    @Override
+    public void edit(UUserVo uUserVo) {
+        updateById(uUserVo);
+    }
+
+    @Override
+    public void delete(UUserVo uUserVo) {
+        removeById(uUserVo.getId());
+    }
+
+    @Override
+    public List<Map<String, Object>> getList(Map<String, Object> condition) {
+        List<String> deptIdList = Convert.toList(String.class, condition.get("deptIdList"));
+
+        IWrapper<UUser> wrapper = IWrapper.getWrapper(condition);
+        wrapper.in(ObjectUtil.isNotEmpty(deptIdList), "DepartmentID", deptIdList);
+        wrapper.select("id", "RealName", "DepartmentID");
+        return listMaps(wrapper);
+    }
+
+}