人员管理

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/controller/PeopleListController.java

@@ -0,0 +1,161 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.modular.base.peoplelist.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.web.multipart.MultipartFile;
+import vip.xiaonuo.common.annotation.CommonLog;
+import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.modular.base.peoplelist.entity.PeopleList;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListAddParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListEditParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListIdParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListPageParam;
+import vip.xiaonuo.modular.base.peoplelist.service.PeopleListService;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+/**
+ * people_list控制器
+ *
+ * @author wang
+ * @date 2023/12/28 16:19
+ */
+@Api(tags = "人员管理控制器")
+@ApiSupport(author = "SNOWY_TEAM", order = 1)
+@RestController
+@Validated
+public class PeopleListController {
+
+    @Resource
+    private PeopleListService peopleListService;
+
+    /**
+     * 获取people_list分页
+     *
+     * @author wang
+     * @date 2023/12/28 16:19
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取people_list分页")
+    @GetMapping("/base/peoplelist/page")
+    public CommonResult<Page<PeopleList>> page(PeopleListPageParam peopleListPageParam) {
+        return CommonResult.data(peopleListService.page(peopleListPageParam));
+    }
+
+    /**
+     * 添加people_list
+     *
+     * @author wang
+     * @date 2023/12/28 16:19
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("添加people_list")
+    @CommonLog("添加people_list")
+    @PostMapping("/base/peoplelist/add")
+    public CommonResult<String> add(@RequestParam @ApiParam(value = "姓名") String userName,
+                                    @RequestParam @ApiParam(value = "工号") String nickName,
+                                    @RequestParam @ApiParam(value = "性别 0为女 1为男") Integer sex,
+                                    @RequestParam @ApiParam(value = "身份证") String idCard,
+                                    @RequestParam @ApiParam(value = "员工电话") String phone,
+                                    @RequestParam @ApiParam(value = "紧急联系人电话") String publicPhone,
+                                    @RequestParam @ApiParam(value = "省市区") String province,
+                                    @RequestParam @ApiParam(value = "详细地址") String address,
+                                    @RequestParam @ApiParam(value = "入职时间") String entryDate,
+                                    @RequestParam @ApiParam(value = "0 在职 1离职") Integer workStatus,
+                                    @RequestParam @ApiParam(value = "工作岗位") String job,
+                                    @RequestParam @ApiParam(value = "部门") String department,
+                                    @RequestParam @ApiParam(value = "工作地点") String workLocation,
+                                    @RequestParam @ApiParam(value = "工作时间段") String workTime,
+                                    @RequestParam @ApiParam(value = "工作日") String workDay,
+                                    @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl,
+                                    @RequestParam @ApiParam(value = "组织id") String orgId) {
+        peopleListService.add(userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
+                workStatus, job, department, workLocation, workTime, workDay, imgUrl,orgId);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 编辑people_list
+     *
+     * @author wang
+     * @date 2023/12/28 16:19
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("编辑people_list")
+    @CommonLog("编辑people_list")
+    @PostMapping("/base/peoplelist/edit")
+    public CommonResult<String> edit(@RequestParam @ApiParam(value = "id") String id,
+                                     @RequestParam @ApiParam(value = "姓名") String userName,
+                                     @RequestParam @ApiParam(value = "工号") String nickName,
+                                     @RequestParam @ApiParam(value = "性别 0为女 1为男") Integer sex,
+                                     @RequestParam @ApiParam(value = "身份证") String idCard,
+                                     @RequestParam @ApiParam(value = "员工电话") String phone,
+                                     @RequestParam @ApiParam(value = "紧急联系人电话") String publicPhone,
+                                     @RequestParam @ApiParam(value = "省市区") String province,
+                                     @RequestParam @ApiParam(value = "详细地址") String address,
+                                     @RequestParam @ApiParam(value = "入职时间") String entryDate,
+                                     @RequestParam @ApiParam(value = "0 在职 1离职") Integer workStatus,
+                                     @RequestParam @ApiParam(value = "工作岗位") String job,
+                                     @RequestParam @ApiParam(value = "部门") String department,
+                                     @RequestParam @ApiParam(value = "工作地点") String workLocation,
+                                     @RequestParam @ApiParam(value = "工作时间段") String workTime,
+                                     @RequestParam @ApiParam(value = "工作日") String workDay,
+                                     @RequestParam @ApiParam(value = "员工照片") MultipartFile imgUrl) {
+        peopleListService.edit(id,userName, nickName, sex, idCard, phone, publicPhone, province, address, entryDate,
+                workStatus, job, department, workLocation, workTime, workDay, imgUrl);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 删除people_list
+     *
+     * @author wang
+     * @date 2023/12/28 16:19
+     */
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("删除people_list")
+    @CommonLog("删除people_list")
+    @PostMapping("/base/peoplelist/delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
+                                               CommonValidList<PeopleListIdParam> peopleListIdParamList) {
+        peopleListService.delete(peopleListIdParamList);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 获取people_list详情
+     *
+     * @author wang
+     * @date 2023/12/28 16:19
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("获取people_list详情")
+    @GetMapping("/base/peoplelist/detail")
+    public CommonResult<PeopleList> detail(@Valid PeopleListIdParam peopleListIdParam) {
+        return CommonResult.data(peopleListService.detail(peopleListIdParam));
+    }
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/entity/PeopleList.java

@@ -0,0 +1,120 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.modular.base.peoplelist.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * people_list实体
+ *
+ * @author wang
+ * @date  2023/12/28 16:19
+ **/
+@Getter
+@Setter
+@TableName("people_list")
+public class PeopleList {
+
+    /** ID */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "ID", position = 1)
+    private Integer id;
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名", position = 2)
+    private String userName;
+
+    /** 工号 */
+    @ApiModelProperty(value = "工号", position = 3)
+    private String nickName;
+
+    /** 性别 0为女 1为男 */
+    @ApiModelProperty(value = "性别 0为女 1为男", position = 4)
+    private Integer sex;
+
+    /** 身份证 */
+    @ApiModelProperty(value = "身份证", position = 5)
+    private String idCard;
+
+    /** 员工电话 */
+    @ApiModelProperty(value = "员工电话", position = 6)
+    private String phone;
+
+    /** 紧急联系人电话 */
+    @ApiModelProperty(value = "紧急联系人电话", position = 7)
+    private String publicPhone;
+
+    /** 省市区 */
+    @ApiModelProperty(value = "省市区", position = 8)
+    private String province;
+
+    /** 详细地址 */
+    @ApiModelProperty(value = "详细地址", position = 9)
+    private String address;
+
+    /** 入职时间 */
+    @ApiModelProperty(value = "入职时间", position = 10)
+    private String entryDate;
+
+    /** 0 在职 1离职 */
+    @ApiModelProperty(value = "0 在职 1离职", position = 11)
+    private Integer workStatus;
+
+    /** 工作岗位 */
+    @ApiModelProperty(value = "工作岗位", position = 12)
+    private String job;
+
+    /** 部门 */
+    @ApiModelProperty(value = "部门", position = 13)
+    private String department;
+
+    /** 工作地点 */
+    @ApiModelProperty(value = "工作地点", position = 14)
+    private String workLocation;
+
+    /** 工作时间段 */
+    @ApiModelProperty(value = "工作时间段", position = 15)
+    private String workTime;
+
+    /** 工作日 */
+    @ApiModelProperty(value = "工作日", position = 16)
+    private String workDay;
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人", position = 17)
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 18)
+    private Date createDate;
+
+    /** 删除标志 */
+    @ApiModelProperty(value = "删除标志", position = 19)
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private String deleteFlag;
+
+    /** 员工照片 */
+    @ApiModelProperty(value = "员工照片", position = 20)
+    private String imgUrl;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 21)
+    private String orgId;
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/enums/PeopleListEnum.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.enums;/*
+/*
  * Copyright [2022] [https://www.xiaonuo.vip]
  *
  * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
@@ -10,7 +10,7 @@ package vip.xiaonuo.modular.people.enums;/*
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-
+package vip.xiaonuo.modular.base.peoplelist.enums;
 
 import lombok.Getter;
 
@@ -18,7 +18,7 @@ import lombok.Getter;
  * people_list枚举
  *
  * @author wang
- * @date  2023/12/04 16:16
+ * @date  2023/12/28 16:19
  **/
 @Getter
 public enum PeopleListEnum {

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/mapper/PeopleListMapper.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.mapper;/*
+/*
  * Copyright [2022] [https://www.xiaonuo.vip]
  *
  * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
@@ -10,17 +10,16 @@ package vip.xiaonuo.modular.people.mapper;/*
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-
+package vip.xiaonuo.modular.base.peoplelist.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.people.entity.PeopleList;
-
+import vip.xiaonuo.modular.base.peoplelist.entity.PeopleList;
 
 /**
  * people_listMapper接口
  *
  * @author wang
- * @date  2023/12/04 16:16
+ * @date  2023/12/28 16:19
  **/
 public interface PeopleListMapper extends BaseMapper<PeopleList> {
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/mapper/mapping/PeopleListMapper.xml

@@ -1,5 +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="vip.xiaonuo.modular.people.mapper.PeopleListMapper">
+<mapper namespace="vip.xiaonuo.modular.base.peoplelist.mapper.PeopleListMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/param/PeopleListAddParam.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.modular.base.peoplelist.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * people_list添加参数
+ *
+ * @author wang
+ * @date  2023/12/28 16:19
+ **/
+@Getter
+@Setter
+public class PeopleListAddParam {
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名", position = 2)
+    private String userName;
+
+    /** 工号 */
+    @ApiModelProperty(value = "工号", position = 3)
+    private String nickName;
+
+    /** 性别 0为女 1为男 */
+    @ApiModelProperty(value = "性别 0为女 1为男", position = 4)
+    private Integer sex;
+
+    /** 身份证 */
+    @ApiModelProperty(value = "身份证", position = 5)
+    private String idCard;
+
+    /** 员工电话 */
+    @ApiModelProperty(value = "员工电话", position = 6)
+    private String phone;
+
+    /** 紧急联系人电话 */
+    @ApiModelProperty(value = "紧急联系人电话", position = 7)
+    private String publicPhone;
+
+    /** 省市区 */
+    @ApiModelProperty(value = "省市区", position = 8)
+    private String province;
+
+    /** 详细地址 */
+    @ApiModelProperty(value = "详细地址", position = 9)
+    private String address;
+
+    /** 入职时间 */
+    @ApiModelProperty(value = "入职时间", position = 10)
+    private Date entryDate;
+
+    /** 0 在职 1离职 */
+    @ApiModelProperty(value = "0 在职 1离职", position = 11)
+    private Integer workStatus;
+
+    /** 工作岗位 */
+    @ApiModelProperty(value = "工作岗位", position = 12)
+    private String job;
+
+    /** 部门 */
+    @ApiModelProperty(value = "部门", position = 13)
+    private String department;
+
+    /** 工作地点 */
+    @ApiModelProperty(value = "工作地点", position = 14)
+    private String workLocation;
+
+    /** 工作时间段 */
+    @ApiModelProperty(value = "工作时间段", position = 15)
+    private String workTime;
+
+    /** 工作日 */
+    @ApiModelProperty(value = "工作日", position = 16)
+    private String workDay;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 18)
+    private Date createDate;
+
+    /** 员工照片 */
+    @ApiModelProperty(value = "员工照片", position = 20)
+    private String imgUrl;
+
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/param/PeopleListEditParam.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.modular.base.peoplelist.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * people_list编辑参数
+ *
+ * @author wang
+ * @date  2023/12/28 16:19
+ **/
+@Getter
+@Setter
+public class PeopleListEditParam {
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名", position = 2)
+    private String userName;
+
+    /** 工号 */
+    @ApiModelProperty(value = "工号", position = 3)
+    private String nickName;
+
+    /** 性别 0为女 1为男 */
+    @ApiModelProperty(value = "性别 0为女 1为男", position = 4)
+    private Integer sex;
+
+    /** 身份证 */
+    @ApiModelProperty(value = "身份证", position = 5)
+    private String idCard;
+
+    /** 员工电话 */
+    @ApiModelProperty(value = "员工电话", position = 6)
+    private String phone;
+
+    /** 紧急联系人电话 */
+    @ApiModelProperty(value = "紧急联系人电话", position = 7)
+    private String publicPhone;
+
+    /** 省市区 */
+    @ApiModelProperty(value = "省市区", position = 8)
+    private String province;
+
+    /** 详细地址 */
+    @ApiModelProperty(value = "详细地址", position = 9)
+    private String address;
+
+    /** 入职时间 */
+    @ApiModelProperty(value = "入职时间", position = 10)
+    private Date entryDate;
+
+    /** 0 在职 1离职 */
+    @ApiModelProperty(value = "0 在职 1离职", position = 11)
+    private Integer workStatus;
+
+    /** 工作岗位 */
+    @ApiModelProperty(value = "工作岗位", position = 12)
+    private String job;
+
+    /** 部门 */
+    @ApiModelProperty(value = "部门", position = 13)
+    private String department;
+
+    /** 工作地点 */
+    @ApiModelProperty(value = "工作地点", position = 14)
+    private String workLocation;
+
+    /** 工作时间段 */
+    @ApiModelProperty(value = "工作时间段", position = 15)
+    private String workTime;
+
+    /** 工作日 */
+    @ApiModelProperty(value = "工作日", position = 16)
+    private String workDay;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 18)
+    private Date createDate;
+
+    /** 员工照片 */
+    @ApiModelProperty(value = "员工照片", position = 20)
+    private String imgUrl;
+
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/param/PeopleListEditParam.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.param;/*
+/*
  * Copyright [2022] [https://www.xiaonuo.vip]
  *
  * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
@@ -10,51 +10,27 @@ package vip.xiaonuo.modular.people.param;/*
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-
+package vip.xiaonuo.modular.base.peoplelist.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * people_list编辑参数
+ * people_listId参数
  *
  * @author wang
- * @date  2023/12/04 16:16
+ * @date  2023/12/28 16:19
  **/
 @Getter
 @Setter
-public class PeopleListEditParam {
+public class PeopleListIdParam {
 
     /** ID */
-    @ApiModelProperty(value = "ID", required = true, position = 1)
+    @ApiModelProperty(value = "ID", required = true)
     @NotNull(message = "id不能为空")
     private Integer id;
-
-    /** 登录账户 */
-    @ApiModelProperty(value = "姓名", position = 2)
-    private String userName;
-
-    /**  显示名称 */
-    @ApiModelProperty(value = " 工号", position = 3)
-    private String nickName;
-
-    /** 登录密码 */
-    @ApiModelProperty(value = "性别", position = 4)
-    private Integer sex;
-
-    /** 手机号 */
-    @ApiModelProperty(value = "手机号", position = 6)
-    private String phone;
-
-//    /** 头像 */
-//    @ApiModelProperty(value = "头像", position = 7)
-//    private String img;
-
-    /** 负责区域 */
-    @ApiModelProperty(value = "负责区域", position = 9)
-    private String manageArea;
-
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/param/PeopleListAddParam.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.param;/*
+/*
  * Copyright [2022] [https://www.xiaonuo.vip]
  *
  * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
@@ -10,47 +10,54 @@ package vip.xiaonuo.modular.people.param;/*
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-
+package vip.xiaonuo.modular.base.peoplelist.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * people_list添加参数
+ * people_list查询参数
  *
  * @author wang
- * @date  2023/12/04 16:16
+ * @date  2023/12/28 16:19
  **/
 @Getter
 @Setter
-public class PeopleListAddParam {
+public class PeopleListPageParam {
 
-    /** 登录账户 */
-    @ApiModelProperty(value = "姓名", position = 2)
-    private String userName;
+    /** 当前页 */
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
 
-    /**  显示名称 */
-    @ApiModelProperty(value = " 工号", position = 3)
-    private String nickName;
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer size;
 
-    /** 登录密码 */
-    @ApiModelProperty(value = "性别", position = 4)
-    private Integer sex;
+    /** 排序字段 */
+    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
+    private String sortField;
 
-    /** 手机号 */
-    @ApiModelProperty(value = "手机号", position = 6)
-    private String phone;
+    /** 排序方式 */
+    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
+    private String sortOrder;
 
-    /** 头像 */
-    @ApiModelProperty(value = "头像", position = 7)
-    private String img;
+    /** 关键词 */
+    @ApiModelProperty(value = "关键词")
+    private String searchKey;
 
-    /** 负责区域 */
-    @ApiModelProperty(value = "负责区域", position = 9)
-    private String manageArea;
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名")
+    private String userName;
 
-    /*组织id*/
-    @ApiModelProperty(value = "组织id", position = 10)
+    /** 工号 */
+    @ApiModelProperty(value = "工号")
+    private String nickName;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id")
     private String orgId;
+
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/service/PeopleListService.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.service;/*
+/*
  * Copyright [2022] [https://www.xiaonuo.vip]
  *
  * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
@@ -10,25 +10,27 @@ package vip.xiaonuo.modular.people.service;/*
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-
+package vip.xiaonuo.modular.base.peoplelist.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.modular.people.entity.PeopleList;
-import vip.xiaonuo.modular.people.param.PeopleListAddParam;
-import vip.xiaonuo.modular.people.param.PeopleListEditParam;
-import vip.xiaonuo.modular.people.param.PeopleListIdParam;
-import vip.xiaonuo.modular.people.param.PeopleListPageParam;
-
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.multipart.MultipartFile;
+import vip.xiaonuo.modular.base.peoplelist.entity.PeopleList;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListAddParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListEditParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListIdParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListPageParam;
 
+import java.util.Date;
 import java.util.List;
 
 /**
  * people_listService接口
  *
  * @author wang
- * @date  2023/12/04 16:16
+ * @date 2023/12/28 16:19
  **/
 public interface PeopleListService extends IService<PeopleList> {
 
@@ -36,7 +38,7 @@ public interface PeopleListService extends IService<PeopleList> {
      * 获取people_list分页
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      */
     Page<PeopleList> page(PeopleListPageParam peopleListPageParam);
 
@@ -44,23 +46,27 @@ public interface PeopleListService extends IService<PeopleList> {
      * 添加people_list
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      */
-    CommonResult add(PeopleListAddParam peopleListAddParam);
+    void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
+             String province, String address, String entryDate, Integer workStatus, String job, String department,
+             String workLocation, String workTime, String workDay, MultipartFile imgUrl,String orgId);
 
     /**
      * 编辑people_list
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      */
-    CommonResult edit(PeopleListEditParam peopleListEditParam);
+    void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
+              String province, String address, String entryDate, Integer workStatus, String job, String department,
+              String workLocation, String workTime, String workDay, MultipartFile imgUrl);
 
     /**
      * 删除people_list
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      */
     void delete(List<PeopleListIdParam> peopleListIdParamList);
 
@@ -68,7 +74,7 @@ public interface PeopleListService extends IService<PeopleList> {
      * 获取people_list详情
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      */
     PeopleList detail(PeopleListIdParam peopleListIdParam);
 
@@ -76,7 +82,7 @@ public interface PeopleListService extends IService<PeopleList> {
      * 获取people_list详情
      *
      * @author wang
-     * @date  2023/12/04 16:16
+     * @date 2023/12/28 16:19
      **/
-    PeopleList queryEntity(Integer id);
+    PeopleList queryEntity(String id);
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/peoplelist/service/impl/PeopleListServiceImpl.java

@@ -0,0 +1,165 @@
+/*
+ * Copyright [2022] [https://www.xiaonuo.vip]
+ *
+ * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
+ *
+ * 1.请不要删除和修改根目录下的LICENSE文件。
+ * 2.请不要删除和修改Snowy源码头部的版权声明。
+ * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
+ * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
+ * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
+ * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
+ */
+package vip.xiaonuo.modular.base.peoplelist.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.springframework.web.multipart.MultipartFile;
+import vip.xiaonuo.common.enums.CommonSortOrderEnum;
+import vip.xiaonuo.common.exception.CommonException;
+import vip.xiaonuo.common.page.CommonPageRequest;
+import vip.xiaonuo.dev.modular.file.enums.DevFileEngineTypeEnum;
+import vip.xiaonuo.dev.modular.file.service.DevFileService;
+import vip.xiaonuo.modular.base.department.entity.Department;
+import vip.xiaonuo.modular.base.peoplelist.entity.PeopleList;
+import vip.xiaonuo.modular.base.peoplelist.mapper.PeopleListMapper;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListAddParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListEditParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListIdParam;
+import vip.xiaonuo.modular.base.peoplelist.param.PeopleListPageParam;
+import vip.xiaonuo.modular.base.peoplelist.service.PeopleListService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * people_listService接口实现类
+ *
+ * @author wang
+ * @date  2023/12/28 16:19
+ **/
+@Service
+public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleList> implements PeopleListService {
+
+    @Autowired
+    private DevFileService devFileService;
+    @Override
+    public Page<PeopleList> page(PeopleListPageParam peopleListPageParam) {
+        QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", peopleListPageParam.getOrgId());
+        if(ObjectUtil.isNotEmpty(peopleListPageParam.getUserName())) {
+            queryWrapper.lambda().like(PeopleList::getUserName, peopleListPageParam.getUserName());
+        }
+        if(ObjectUtil.isNotEmpty(peopleListPageParam.getNickName())) {
+            queryWrapper.lambda().like(PeopleList::getNickName, peopleListPageParam.getNickName());
+        }
+        if(ObjectUtil.isAllNotEmpty(peopleListPageParam.getSortField(), peopleListPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(peopleListPageParam.getSortOrder());
+            queryWrapper.orderBy(true, peopleListPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(peopleListPageParam.getSortField()));
+        } else {
+            queryWrapper.lambda().orderByAsc(PeopleList::getId);
+        }
+        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
+                    String province, String address, String entryDate, Integer workStatus, String job, String department,
+                    String workLocation, String workTime, String workDay, MultipartFile imgUrl,String orgId) {
+        if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).eq(PeopleList::getOrgId,orgId)) > 0) {
+            throw new CommonException("存在重复工号!");
+        }
+        if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getIdCard,idCard).eq(PeopleList::getOrgId,orgId)) > 0) {
+            throw new CommonException("身份证号已存在!");
+        }
+        PeopleList people = new PeopleList();
+        people.setNickName(nickName);
+        people.setUserName(userName);
+        people.setSex(sex);
+        people.setIdCard(idCard);
+        people.setPublicPhone(publicPhone);
+        people.setProvince(province);
+        people.setAddress(address);
+        people.setEntryDate(entryDate);
+        people.setWorkDay(workDay);
+        people.setWorkStatus(workStatus);
+        people.setJob(job);
+        people.setDepartment(department);
+        people.setWorkLocation(workLocation);
+        people.setWorkTime(workTime);
+        people.setPhone(phone);
+        people.setOrgId(orgId);
+        if (ObjectUtil.isNotEmpty(imgUrl)){
+            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), imgUrl);
+            people.setImgUrl(uploadReturnUrl);
+        }
+        this.save(people);
+
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(String id,String userName, String nickName, Integer sex, String idCard, String phone, String publicPhone,
+                     String province, String address, String entryDate, Integer workStatus, String job, String department,
+                     String workLocation, String workTime, String workDay, MultipartFile imgUrl) {
+        PeopleList people = this.queryEntity(id);
+        if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getNickName,nickName).ne(PeopleList::getId,id)) > 0) {
+            throw new CommonException("存在重复工号!");
+        }
+        if (this.count(new QueryWrapper<PeopleList>().lambda().eq(PeopleList::getIdCard,idCard).ne(PeopleList::getId,id)) > 0) {
+            throw new CommonException("身份证号已存在!");
+        }
+        people.setNickName(nickName);
+        people.setUserName(userName);
+        people.setSex(sex);
+        people.setIdCard(idCard);
+        people.setPublicPhone(publicPhone);
+        people.setProvince(province);
+        people.setAddress(address);
+        people.setEntryDate(entryDate);
+        people.setWorkDay(workDay);
+        people.setWorkStatus(workStatus);
+        people.setJob(job);
+        people.setDepartment(department);
+        people.setWorkLocation(workLocation);
+        people.setWorkTime(workTime);
+        people.setPhone(phone);
+        if (ObjectUtil.isNotEmpty(imgUrl)){
+            String uploadReturnUrl = devFileService.uploadReturnId(DevFileEngineTypeEnum.LOCAL.getValue(), imgUrl);
+            people.setImgUrl(uploadReturnUrl);
+        }
+        this.updateById(people);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(List<PeopleListIdParam> peopleListIdParamList) {
+        // 执行删除
+        this.removeByIds(CollStreamUtil.toList(peopleListIdParamList, PeopleListIdParam::getId));
+    }
+
+    @Override
+    public PeopleList detail(PeopleListIdParam peopleListIdParam) {
+        return this.queryEntity(peopleListIdParam.getId().toString());
+    }
+
+    @Override
+    public PeopleList queryEntity(String id) {
+        PeopleList peopleList = this.getById(id);
+        if(ObjectUtil.isEmpty(peopleList)) {
+            throw new CommonException("people_list不存在，id值为：{}", id);
+        }
+        return peopleList;
+    }
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/bi/pigdeath/controller/PigDeathController.java

@@ -32,7 +32,8 @@ import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathEditParam;
 import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathIdParam;
 import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathPageParam;
 import vip.xiaonuo.modular.bi.pigdeath.service.PigDeathService;
-import vip.xiaonuo.modular.people.utils.UploadImage;
+import vip.xiaonuo.modular.bi.utils.UploadImage;
+
 
 import javax.annotation.Resource;
 import javax.validation.Valid;

snowy-web-app/src/main/java/vip/xiaonuo/modular/bi/pigdeath/service/impl/PigDeathServiceImpl.java

@@ -35,7 +35,7 @@ import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathEditParam;
 import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathIdParam;
 import vip.xiaonuo.modular.bi.pigdeath.param.PigDeathPageParam;
 import vip.xiaonuo.modular.bi.pigdeath.service.PigDeathService;
-import vip.xiaonuo.modular.people.entity.PeopleList;
+
 
 import java.util.Date;
 import java.util.List;

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/utils/DataUill.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.people.utils;
+package vip.xiaonuo.modular.bi.utils;
   
 import com.alibaba.fastjson.JSONObject;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/utils/UploadImage.java

@@ -1,8 +1,9 @@
-package vip.xiaonuo.modular.people.utils;
+package vip.xiaonuo.modular.bi.utils;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.jcraft.jsch.*;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
@@ -16,27 +17,27 @@ import java.util.Date;
 @Component
 public class UploadImage {
 
-//    @Value("${img.basePath}")
-    private   String basePath="/home/huimv/img/";
+    @Value("${img.basePath}")
+    private   String basePath;
 
-//    @Value("${img.ip}")
-    private    String ip="119.3.44.183" ;
+    @Value("${img.ip}")
+    private    String ip ;
 //    private   String ip = "36.134.209.211";
 //    private   String ip = "192.168.0.13";
 
-//    @Value("${img.user}")
-    private  String user="huimv" ;
+    @Value("${img.user}")
+    private  String user ;
 
 //    private   String password = "!Hm537e@1";
 
-//    @Value("${img.password}")
-    private   String password="!hm123@1";
+    @Value("${img.password}")
+    private   String password ;
 
-//    @Value("${img.port}")
-    public   Integer port=22 ;
+    @Value("${img.port}")
+    public   Integer port ;
 
-//    @Value("${img.url}")
-    public   String url="https://img.ifarmcloud.com/images/" ;
+    @Value("${img.url}")
+    public   String url ;
 
 
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyThreshold/param/EnergyThresholdModifyParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.param;
+package vip.xiaonuo.modular.energy.energythreshold.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyThreshold/param/EnergyThresholdSaveParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.param;
+package vip.xiaonuo.modular.energy.energythreshold.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyThreshold/param/EnergyThresholdSyncParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.param;
+package vip.xiaonuo.modular.energy.energythreshold.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyThreshold/param/EnergyThresholdUnitIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.param;
+package vip.xiaonuo.modular.energy.energythreshold.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/controller/EnergyThresholdController.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.controller;
+package vip.xiaonuo.modular.energy.energythreshold.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
@@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.modular.energy.energyThreshold.entity.EnergyThreshold;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdModifyParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSaveParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSyncParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdUnitIdParam;
-import vip.xiaonuo.modular.energy.energyThreshold.service.EnergyThresholdService;
+import vip.xiaonuo.modular.energy.energythreshold.entity.EnergyThreshold;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdModifyParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSaveParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSyncParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdUnitIdParam;
+import vip.xiaonuo.modular.energy.energythreshold.service.EnergyThresholdService;
 import vip.xiaonuo.modular.env.envThreshold.entity.EnvThreshold;
 import vip.xiaonuo.modular.env.envThreshold.param.EnvThresholdModifyParam;
 import vip.xiaonuo.modular.env.envThreshold.param.EnvThresholdSaveParam;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/entity/EnergyThreshold.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.entity;
+package vip.xiaonuo.modular.energy.energythreshold.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/enums/EnergyThresholdEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.enums;
+package vip.xiaonuo.modular.energy.energythreshold.enums;
 
 import lombok.Getter;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/mapper/EnergyThresholdMapper.java

@@ -10,10 +10,10 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.mapper;
+package vip.xiaonuo.modular.energy.energythreshold.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import vip.xiaonuo.modular.energy.energyThreshold.entity.EnergyThreshold;
+import vip.xiaonuo.modular.energy.energythreshold.entity.EnergyThreshold;
 
 /**
  * 能耗阈值Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/mapper/mapping/EnergyThresholdMapper.xml

@@ -1,5 +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="vip.xiaonuo.modular.energy.energyThreshold.mapper.EnergyThresholdMapper">
+<mapper namespace="vip.xiaonuo.modular.energy.energythreshold.mapper.EnergyThresholdMapper">
 
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/service/EnergyThresholdService.java

@@ -10,14 +10,14 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.service;
+package vip.xiaonuo.modular.energy.energythreshold.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.modular.energy.energyThreshold.entity.EnergyThreshold;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdModifyParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSaveParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSyncParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdUnitIdParam;
+import vip.xiaonuo.modular.energy.energythreshold.entity.EnergyThreshold;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdModifyParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSaveParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSyncParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdUnitIdParam;
 
 /**
  * 能耗阈值Service接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/service/impl/EnergyThresholdServiceImpl.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.energy.energyThreshold.service.impl;
+package vip.xiaonuo.modular.energy.energythreshold.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -22,13 +22,13 @@ import org.springframework.stereotype.Service;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
 import vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper;
-import vip.xiaonuo.modular.energy.energyThreshold.entity.EnergyThreshold;
-import vip.xiaonuo.modular.energy.energyThreshold.mapper.EnergyThresholdMapper;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdModifyParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSaveParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdSyncParam;
-import vip.xiaonuo.modular.energy.energyThreshold.param.EnergyThresholdUnitIdParam;
-import vip.xiaonuo.modular.energy.energyThreshold.service.EnergyThresholdService;
+import vip.xiaonuo.modular.energy.energythreshold.entity.EnergyThreshold;
+import vip.xiaonuo.modular.energy.energythreshold.mapper.EnergyThresholdMapper;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdModifyParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSaveParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdSyncParam;
+import vip.xiaonuo.modular.energy.energythreshold.param.EnergyThresholdUnitIdParam;
+import vip.xiaonuo.modular.energy.energythreshold.service.EnergyThresholdService;
 import vip.xiaonuo.modular.env.envThreshold.entity.EnvThreshold;
 
 import java.util.ArrayList;

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/controller/PeopleListController.java

@@ -1,126 +0,0 @@
-package vip.xiaonuo.modular.people.controller;/*
- * Copyright [2022] [https://www.xiaonuo.vip]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
- * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import vip.xiaonuo.common.annotation.CommonLog;
-import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.modular.people.entity.PeopleList;
-import vip.xiaonuo.modular.people.param.PeopleListAddParam;
-import vip.xiaonuo.modular.people.param.PeopleListEditParam;
-import vip.xiaonuo.modular.people.param.PeopleListIdParam;
-import vip.xiaonuo.modular.people.param.PeopleListPageParam;
-import vip.xiaonuo.modular.people.service.PeopleListService;
-import vip.xiaonuo.modular.people.utils.UploadImage;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import java.io.IOException;
-
-/**
- * people_list控制器
- *
- * @author wang
- * @date  2023/12/04 16:16
- */
-@Api(tags = "people_list控制器")
-@ApiSupport(author = "HUIMV", order = 1)
-@RestController
-@Validated
-public class PeopleListController {
-
-    @Resource
-    private PeopleListService peopleListService;
-    @Resource
-    private UploadImage uploadImage;
-
-
-    /**
-     * 获取people_list分页
-     *
-     * @author wang
-     * @date  2023/12/04 16:16
-     */
-    @ApiOperationSupport(order = 1)
-    @ApiOperation("获取people_list分页")
-    @GetMapping("/biz/nongke/page")
-    public CommonResult<Page<PeopleList>> page(PeopleListPageParam peopleListPageParam) {
-        return CommonResult.data(peopleListService.page(peopleListPageParam));
-    }
-
-    /**
-     * 添加people_list
-     *
-     * @author wang
-     * @date 2023/12/04 16:16
-     */
-    @ApiOperationSupport(order = 2)
-    @ApiOperation("添加people_list")
-    @CommonLog("添加people_list")
-    @PostMapping("/biz/nongke/add")
-    public CommonResult<String> add(@RequestBody @Valid PeopleListAddParam peopleListAddParam) throws IOException {
-        return peopleListService.add(peopleListAddParam);
-    }
-
-    /**
-     * 编辑people_list
-     *
-     * @author wang
-     * @date  2023/12/04 16:16
-     */
-    @ApiOperationSupport(order = 3)
-    @ApiOperation("编辑people_list")
-    @CommonLog("编辑people_list")
-    @PostMapping("/biz/nongke/edit")
-    public CommonResult<String> edit(@RequestBody @Valid PeopleListEditParam peopleListEditParam) {
-        return peopleListService.edit(peopleListEditParam);
-    }
-
-    /**
-     * 删除people_list
-     *
-     * @author wang
-     * @date  2023/12/04 16:16
-     */
-    @ApiOperationSupport(order = 4)
-    @ApiOperation("删除people_list")
-    @CommonLog("删除people_list")
-    @PostMapping("/biz/nongke/delete")
-    public CommonResult<String> delete(@RequestBody @NotEmpty(message = "集合不能为空")
-                                               CommonValidList<PeopleListIdParam> peopleListIdParamList) {
-        peopleListService.delete(peopleListIdParamList);
-        return CommonResult.ok();
-    }
-
-    /**
-     * 获取people_list详情
-     *
-     * @author wang
-     * @date  2023/12/04 16:16
-     */
-    @ApiOperationSupport(order = 5)
-    @ApiOperation("获取people_list详情")
-    @GetMapping("/biz/nongke/detail")
-    public CommonResult<PeopleList> detail(@Valid PeopleListIdParam peopleListIdParam) {
-        return CommonResult.data(peopleListService.detail(peopleListIdParam));
-    }
-}

snowy-web-app/src/main/java/vip/xiaonuo/modular/people/service/impl/PeopleListServiceImpl.java

@@ -1,136 +0,0 @@
-package vip.xiaonuo.modular.people.service.impl;/*
- * Copyright [2022] [https://www.xiaonuo.vip]
- *
- * Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
- *
- * 1.请不要删除和修改根目录下的LICENSE文件。
- * 2.请不要删除和修改Snowy源码头部的版权声明。
- * 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
- * 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
- * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
- * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
- */
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollStreamUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import vip.xiaonuo.common.enums.CommonSortOrderEnum;
-import vip.xiaonuo.common.exception.CommonException;
-import vip.xiaonuo.common.page.CommonPageRequest;
-
-import vip.xiaonuo.common.pojo.CommonResult;
-import vip.xiaonuo.common.util.CommonAvatarUtil;
-import vip.xiaonuo.modular.people.entity.PeopleList;
-import vip.xiaonuo.modular.people.mapper.PeopleListMapper;
-import vip.xiaonuo.modular.people.param.PeopleListAddParam;
-import vip.xiaonuo.modular.people.param.PeopleListEditParam;
-import vip.xiaonuo.modular.people.param.PeopleListIdParam;
-import vip.xiaonuo.modular.people.param.PeopleListPageParam;
-import vip.xiaonuo.modular.people.service.PeopleListService;
-
-import java.util.List;
-
-/**
- * people_listService接口实现类
- *
- * @author wang
- * @date 2023/12/04 16:16
- **/
-@Service
-public class PeopleListServiceImpl extends ServiceImpl<PeopleListMapper, PeopleList> implements PeopleListService {
-
-    @Autowired
-    private PeopleListMapper peopleListMapper;
-
-    @Override
-    public Page<PeopleList> page(PeopleListPageParam peopleListPageParam) {
-        QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
-        if (ObjectUtil.isNotEmpty(peopleListPageParam.getUserName())) {
-            queryWrapper.lambda().eq(PeopleList::getUserName, peopleListPageParam.getUserName());
-        }
-        if (ObjectUtil.isAllNotEmpty(peopleListPageParam.getSortField(), peopleListPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(peopleListPageParam.getSortOrder());
-            queryWrapper.orderBy(true, peopleListPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(peopleListPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(PeopleList::getId);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public CommonResult add(PeopleListAddParam peopleListAddParam) {
-        QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_name", peopleListAddParam.getUserName()).or()
-                .eq("nick_name", peopleListAddParam.getNickName()).and(i -> i.eq("org_id", peopleListAddParam.getOrgId()));
-        PeopleList one = peopleListMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isEmpty(one)) {
-            PeopleList peopleList = BeanUtil.toBean(peopleListAddParam, PeopleList.class);
-            if(ObjectUtil.isEmpty(peopleList.getImg())) {
-                // 设置默认头像
-                peopleList.setImg(CommonAvatarUtil.generateImg(peopleList.getUserName()));
-            }
-            this.save(peopleList);
-            return CommonResult.ok();
-        } else {
-            return new CommonResult(500, "姓名或工号已存在！", false);
-        }
-
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public CommonResult edit(PeopleListEditParam peopleListEditParam) {
-        PeopleList peopleList = this.queryEntity(peopleListEditParam.getId());
-        if (ObjectUtil.isNotEmpty(peopleListEditParam.getUserName()) || ObjectUtil.isNotEmpty(peopleListEditParam.getNickName())) {
-            QueryWrapper<PeopleList> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(StringUtils.isNotBlank(peopleListEditParam.getUserName()), "user_name", peopleListEditParam.getUserName())
-                    .or().eq(StringUtils.isNotBlank(peopleListEditParam.getNickName()), "nick_name", peopleListEditParam.getNickName())
-                    .and(i -> i.eq("org_id", peopleList.getOrgId()));
-
-            if (ObjectUtil.isEmpty(peopleListMapper.selectOne(queryWrapper))) {
-                BeanUtil.copyProperties(peopleListEditParam, peopleList);
-                this.updateById(peopleList);
-                return CommonResult.ok();
-            } else {
-                return new CommonResult(500, "修改的姓名或工号已存在！", false);
-            }
-        } else {
-            BeanUtil.copyProperties(peopleListEditParam, peopleList);
-            this.updateById(peopleList);
-            return CommonResult.ok();
-        }
-
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void delete(List<PeopleListIdParam> peopleListIdParamList) {
-        // 执行删除
-        this.removeByIds(CollStreamUtil.toList(peopleListIdParamList, PeopleListIdParam::getId));
-    }
-
-    @Override
-    public PeopleList detail(PeopleListIdParam peopleListIdParam) {
-        return this.queryEntity(peopleListIdParam.getId());
-    }
-
-    @Override
-    public PeopleList queryEntity(Integer id) {
-        PeopleList peopleList = this.getById(id);
-        if (ObjectUtil.isEmpty(peopleList)) {
-            throw new CommonException("people_list不存在，id值为：{}", id);
-        }
-        return peopleList;
-    }
-}