修改

snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java

@@ -93,12 +93,16 @@ public abstract class SaBaseLoginUser {
     @ApiModelProperty(value = "组织名称", position = 33)
     private String orgName;
 
+    /** 工作地点名称 */
+    @ApiModelProperty(value = "工作地点名称", position = 34)
+    private String workLocationName;
+
     /** 职位id */
-    @ApiModelProperty(value = "部门id", position = 34)
+    @ApiModelProperty(value = "部门id", position = 35)
     private String departmentId;
 
     /** 职位名称 */
-    @ApiModelProperty(value = "部门名称", position = 35)
+    @ApiModelProperty(value = "部门名称", position = 36)
     private String departmentName;
 
     /** 上次登录ip */

snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java

@@ -49,4 +49,8 @@ public class AuthAccountPasswordLoginParam {
     /** 验证码请求号 */
     @ApiModelProperty(value = "验证码请求号", position = 5)
     private String validCodeReqNo;
+
+    /** 登录平台类型 */
+    @ApiModelProperty(value = "登录平台类型 0:后台 1:H5 2:大屏", position = 6)
+    private Integer type;
 }

snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java

@@ -25,6 +25,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.auth.api.SaBaseLoginUserApi;
 import vip.xiaonuo.auth.core.enums.SaClientTypeEnum;
 import vip.xiaonuo.auth.core.pojo.SaBaseClientLoginUser;
@@ -241,6 +242,19 @@ public class AuthServiceImpl implements AuthService {
             if(ObjectUtil.isEmpty(saBaseLoginUser)) {
                 throw new CommonException(AuthExceptionEnum.ACCOUNT_ERROR.getValue());
             }
+            if (authAccountPasswordLoginParam.getType() == 1){
+                if (saBaseLoginUser.getAccountType() == 1){
+                    throw new CommonException("公司账号无法登录H5页面!");
+                }
+                if (saBaseLoginUser.getAccountType() == 0){
+                    throw new CommonException("超管账号无法登录H5页面!");
+                }
+            }
+            if (authAccountPasswordLoginParam.getType() == 2){
+                if (saBaseLoginUser.getAccountType() == 0){
+                    throw new CommonException("超管账号无法登录大屏!");
+                }
+            }
             if (!saBaseLoginUser.getPassword().equals(passwordHash)) {
                 // 记录登录次数 和 过期时间
                 saveLoginTimes(account);

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/controller/SysBasePigpenController.java

@@ -0,0 +1,131 @@
+/*
+ * 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.sys.modular.basePigpen.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 org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import vip.xiaonuo.common.annotation.CommonLog;
+import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.common.pojo.CommonValidList;
+import vip.xiaonuo.sys.modular.basePigpen.entity.SysBasePigpen;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenAddParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenEditParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenIdParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenPageParam;
+import vip.xiaonuo.sys.modular.basePigpen.service.SysBasePigpenService;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 栋舍控制器
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ */
+@Api(tags = "栋舍控制器")
+@ApiSupport(author = "SNOWY_TEAM", order = 1)
+@RestController
+@Validated
+public class SysBasePigpenController {
+
+//    @Resource
+//    private SysBasePigpenService sysBasePigpenService;
+//
+//    /**
+//     * 获取栋舍分页
+//     *
+//     * @author newspaper
+//     * @date  2024/01/24 19:15
+//     */
+//    @ApiOperationSupport(order = 1)
+//    @ApiOperation("获取栋舍分页")
+//    @SaCheckPermission("/sys/basePigpen/page")
+//    @GetMapping("/sys/basePigpen/page")
+//    public CommonResult<Page<SysBasePigpen>> page(SysBasePigpenPageParam sysBasePigpenPageParam) {
+//        return CommonResult.data(sysBasePigpenService.page(sysBasePigpenPageParam));
+//    }
+//
+//    /**
+//     * 添加栋舍
+//     *
+//     * @author newspaper
+//     * @date  2024/01/24 19:15
+//     */
+//    @ApiOperationSupport(order = 2)
+//    @ApiOperation("添加栋舍")
+//    @CommonLog("添加栋舍")
+//    @SaCheckPermission("/sys/basePigpen/add")
+//    @PostMapping("/sys/basePigpen/add")
+//    public CommonResult<String> add(@RequestBody @Valid SysBasePigpenAddParam sysBasePigpenAddParam) {
+//        sysBasePigpenService.add(sysBasePigpenAddParam);
+//        return CommonResult.ok();
+//    }
+//
+//    /**
+//     * 编辑栋舍
+//     *
+//     * @author newspaper
+//     * @date  2024/01/24 19:15
+//     */
+//    @ApiOperationSupport(order = 3)
+//    @ApiOperation("编辑栋舍")
+//    @CommonLog("编辑栋舍")
+//    @SaCheckPermission("/sys/basePigpen/edit")
+//    @PostMapping("/sys/basePigpen/edit")
+//    public CommonResult<String> edit(@RequestBody @Valid SysBasePigpenEditParam sysBasePigpenEditParam) {
+//        sysBasePigpenService.edit(sysBasePigpenEditParam);
+//        return CommonResult.ok();
+//    }
+//
+//    /**
+//     * 删除栋舍
+//     *
+//     * @author newspaper
+//     * @date  2024/01/24 19:15
+//     */
+//    @ApiOperationSupport(order = 4)
+//    @ApiOperation("删除栋舍")
+//    @CommonLog("删除栋舍")
+//    @SaCheckPermission("/sys/basePigpen/delete")
+//    @PostMapping("/sys/basePigpen/delete")
+//    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
+//                                                   CommonValidList<SysBasePigpenIdParam> sysBasePigpenIdParamList) {
+//        sysBasePigpenService.delete(sysBasePigpenIdParamList);
+//        return CommonResult.ok();
+//    }
+//
+//    /**
+//     * 获取栋舍详情
+//     *
+//     * @author newspaper
+//     * @date  2024/01/24 19:15
+//     */
+//    @ApiOperationSupport(order = 5)
+//    @ApiOperation("获取栋舍详情")
+//    @SaCheckPermission("/sys/basePigpen/detail")
+//    @GetMapping("/sys/basePigpen/detail")
+//    public CommonResult<SysBasePigpen> detail(@Valid SysBasePigpenIdParam sysBasePigpenIdParam) {
+//        return CommonResult.data(sysBasePigpenService.detail(sysBasePigpenIdParam));
+//    }
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/entity/SysBasePigpen.java

@@ -0,0 +1,99 @@
+/*
+ * 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.sys.modular.basePigpen.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;
+
+/**
+ * 栋舍实体
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+@Setter
+@TableName("base_pigpen")
+public class SysBasePigpen {
+
+    /** ID */
+    @TableId
+    @ApiModelProperty(value = "ID", position = 1)
+    private String id;
+
+    /** 栋舍名字 */
+    @ApiModelProperty(value = "栋舍名字", position = 2)
+    private String buildName;
+
+    /** 父级ID */
+    @ApiModelProperty(value = "父级ID", position = 3)
+    private String parentId;
+
+    /** 所有父ID */
+    @ApiModelProperty(value = "所有父ID", position = 4)
+    private String pids;
+
+    /** 类型 0:栋舍 1:楼层 2:单元 */
+    @ApiModelProperty(value = "类型 0:栋舍 1:楼层 2:单元", position = 5)
+    private Integer type;
+
+    /** 阶段 */
+    @ApiModelProperty(value = "阶段", position = 6)
+    private String stage;
+
+    /** 容量 */
+    @ApiModelProperty(value = "容量", position = 7)
+    private Integer capacity;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 8)
+    private String orgId;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 9)
+    private Integer sort;
+
+    /** 栋舍全名 */
+    @ApiModelProperty(value = "栋舍全名", position = 10)
+    private String fullName;
+
+    /** 删除标识 */
+    @ApiModelProperty(value = "删除标识", position = 11)
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private String deleteFlag;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "创建时间", position = 12)
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /** 创建者 */
+    @ApiModelProperty(value = "创建者", position = 13)
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    /** 修改时间 */
+    @ApiModelProperty(value = "修改时间", position = 14)
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateTime;
+
+    /** 修改者 */
+    @ApiModelProperty(value = "修改者", position = 15)
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateUser;
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/enums/SysBasePigpenEnum.java

@@ -0,0 +1,34 @@
+/*
+ * 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.sys.modular.basePigpen.enums;
+
+import lombok.Getter;
+
+/**
+ * 栋舍枚举
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+public enum SysBasePigpenEnum {
+
+    /** 测试 */
+    TEST("TEST");
+
+    private final String value;
+
+    SysBasePigpenEnum(String value) {
+        this.value = value;
+    }
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/mapper/SysBasePigpenMapper.java

@@ -0,0 +1,25 @@
+/*
+ * 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.sys.modular.basePigpen.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import vip.xiaonuo.sys.modular.basePigpen.entity.SysBasePigpen;
+
+/**
+ * 栋舍Mapper接口
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+public interface SysBasePigpenMapper extends BaseMapper<SysBasePigpen> {
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/mapper/mapping/SysBasePigpenMapper.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="vip.xiaonuo.sys.modular.basePigpen.mapper.SysBasePigpenMapper">
+
+</mapper>

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/param/SysBasePigpenAddParam.java

@@ -0,0 +1,70 @@
+/*
+ * 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.sys.modular.basePigpen.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;
+
+/**
+ * 栋舍添加参数
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+@Setter
+public class SysBasePigpenAddParam {
+
+    /** 栋舍名字 */
+    @ApiModelProperty(value = "栋舍名字", position = 2)
+    private String buildName;
+
+    /** 父级ID */
+    @ApiModelProperty(value = "父级ID", position = 3)
+    private String parentId;
+
+    /** 所有父ID */
+    @ApiModelProperty(value = "所有父ID", position = 4)
+    private String pids;
+
+    /** 类型 0:栋舍 1:楼层 2:单元 */
+    @ApiModelProperty(value = "类型 0:栋舍 1:楼层 2:单元", position = 5)
+    private Integer type;
+
+    /** 阶段 */
+    @ApiModelProperty(value = "阶段", position = 6)
+    private String stage;
+
+    /** 容量 */
+    @ApiModelProperty(value = "容量", position = 7)
+    private Integer capacity;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 8)
+    private String orgId;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 9)
+    private Integer sort;
+
+    /** 栋舍全名 */
+    @ApiModelProperty(value = "栋舍全名", position = 10)
+    private String fullName;
+
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/param/SysBasePigpenEditParam.java

@@ -0,0 +1,75 @@
+/*
+ * 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.sys.modular.basePigpen.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;
+
+/**
+ * 栋舍编辑参数
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+@Setter
+public class SysBasePigpenEditParam {
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true, position = 1)
+    @NotBlank(message = "id不能为空")
+    private String id;
+
+    /** 栋舍名字 */
+    @ApiModelProperty(value = "栋舍名字", position = 2)
+    private String buildName;
+
+    /** 父级ID */
+    @ApiModelProperty(value = "父级ID", position = 3)
+    private String parentId;
+
+    /** 所有父ID */
+    @ApiModelProperty(value = "所有父ID", position = 4)
+    private String pids;
+
+    /** 类型 0:栋舍 1:楼层 2:单元 */
+    @ApiModelProperty(value = "类型 0:栋舍 1:楼层 2:单元", position = 5)
+    private Integer type;
+
+    /** 阶段 */
+    @ApiModelProperty(value = "阶段", position = 6)
+    private String stage;
+
+    /** 容量 */
+    @ApiModelProperty(value = "容量", position = 7)
+    private Integer capacity;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 8)
+    private String orgId;
+
+    /** 排序 */
+    @ApiModelProperty(value = "排序", position = 9)
+    private Integer sort;
+
+    /** 栋舍全名 */
+    @ApiModelProperty(value = "栋舍全名", position = 10)
+    private String fullName;
+
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/param/SysBasePigpenIdParam.java

@@ -0,0 +1,35 @@
+/*
+ * 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.sys.modular.basePigpen.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 栋舍Id参数
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+@Setter
+public class SysBasePigpenIdParam {
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空")
+    private String id;
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/param/SysBasePigpenPageParam.java

@@ -0,0 +1,51 @@
+/*
+ * 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.sys.modular.basePigpen.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 栋舍查询参数
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Getter
+@Setter
+public class SysBasePigpenPageParam {
+
+    /** 当前页 */
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer size;
+
+    /** 排序字段 */
+    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
+    private String sortField;
+
+    /** 排序方式 */
+    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
+    private String sortOrder;
+
+    /** 关键词 */
+    @ApiModelProperty(value = "关键词")
+    private String searchKey;
+
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/service/SysBasePigpenService.java

@@ -0,0 +1,80 @@
+/*
+ * 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.sys.modular.basePigpen.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.sys.modular.basePigpen.entity.SysBasePigpen;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenAddParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenEditParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenIdParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenPageParam;
+
+import java.util.List;
+
+/**
+ * 栋舍Service接口
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+public interface SysBasePigpenService extends IService<SysBasePigpen> {
+
+    /**
+     * 获取栋舍分页
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     */
+    Page<SysBasePigpen> page(SysBasePigpenPageParam sysBasePigpenPageParam);
+
+    /**
+     * 添加栋舍
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     */
+    void add(SysBasePigpenAddParam sysBasePigpenAddParam);
+
+    /**
+     * 编辑栋舍
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     */
+    void edit(SysBasePigpenEditParam sysBasePigpenEditParam);
+
+    /**
+     * 删除栋舍
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     */
+    void delete(List<SysBasePigpenIdParam> sysBasePigpenIdParamList);
+
+    /**
+     * 获取栋舍详情
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     */
+    SysBasePigpen detail(SysBasePigpenIdParam sysBasePigpenIdParam);
+
+    /**
+     * 获取栋舍详情
+     *
+     * @author newspaper
+     * @date  2024/01/24 19:15
+     **/
+    SysBasePigpen queryEntity(String id);
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/basePigpen/service/impl/SysBasePigpenServiceImpl.java

@@ -0,0 +1,94 @@
+/*
+ * 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.sys.modular.basePigpen.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.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.sys.modular.basePigpen.entity.SysBasePigpen;
+import vip.xiaonuo.sys.modular.basePigpen.mapper.SysBasePigpenMapper;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenAddParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenEditParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenIdParam;
+import vip.xiaonuo.sys.modular.basePigpen.param.SysBasePigpenPageParam;
+import vip.xiaonuo.sys.modular.basePigpen.service.SysBasePigpenService;
+
+import java.util.List;
+
+/**
+ * 栋舍Service接口实现类
+ *
+ * @author newspaper
+ * @date  2024/01/24 19:15
+ **/
+@Service
+public class SysBasePigpenServiceImpl extends ServiceImpl<SysBasePigpenMapper, SysBasePigpen> implements SysBasePigpenService {
+
+    @Override
+    public Page<SysBasePigpen> page(SysBasePigpenPageParam sysBasePigpenPageParam) {
+        QueryWrapper<SysBasePigpen> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isAllNotEmpty(sysBasePigpenPageParam.getSortField(), sysBasePigpenPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(sysBasePigpenPageParam.getSortOrder());
+            queryWrapper.orderBy(true, sysBasePigpenPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(sysBasePigpenPageParam.getSortField()));
+        } else {
+            queryWrapper.lambda().orderByAsc(SysBasePigpen::getId);
+        }
+        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(SysBasePigpenAddParam sysBasePigpenAddParam) {
+        SysBasePigpen sysBasePigpen = BeanUtil.toBean(sysBasePigpenAddParam, SysBasePigpen.class);
+        this.save(sysBasePigpen);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(SysBasePigpenEditParam sysBasePigpenEditParam) {
+        SysBasePigpen sysBasePigpen = this.queryEntity(sysBasePigpenEditParam.getId());
+        BeanUtil.copyProperties(sysBasePigpenEditParam, sysBasePigpen);
+        this.updateById(sysBasePigpen);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(List<SysBasePigpenIdParam> sysBasePigpenIdParamList) {
+        // 执行删除
+        this.removeByIds(CollStreamUtil.toList(sysBasePigpenIdParamList, SysBasePigpenIdParam::getId));
+    }
+
+    @Override
+    public SysBasePigpen detail(SysBasePigpenIdParam sysBasePigpenIdParam) {
+        return this.queryEntity(sysBasePigpenIdParam.getId());
+    }
+
+    @Override
+    public SysBasePigpen queryEntity(String id) {
+        SysBasePigpen sysBasePigpen = this.getById(id);
+        if(ObjectUtil.isEmpty(sysBasePigpen)) {
+            throw new CommonException("栋舍不存在，id值为：{}", id);
+        }
+        return sysBasePigpen;
+    }
+}

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -194,4 +194,9 @@ public class SysUser extends CommonEntity implements TransPojo {
     @TableField(exist = false)
     private String departmentName;
 
+    /** 工作地点名称 */
+    @ApiModelProperty(value = "工作地点名称", position = 50)
+    @TableField(exist = false)
+    private String workLocationName;
+
 }

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -58,6 +58,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fhs.trans.service.impl.TransService;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -75,6 +76,7 @@ import vip.xiaonuo.mobile.api.MobileButtonApi;
 import vip.xiaonuo.mobile.api.MobileMenuApi;
 import vip.xiaonuo.sys.core.enums.SysBuildInEnum;
 import vip.xiaonuo.sys.core.enums.SysDataTypeEnum;
+import vip.xiaonuo.sys.modular.basePigpen.service.SysBasePigpenService;
 import vip.xiaonuo.sys.modular.org.entity.SysOrg;
 import vip.xiaonuo.sys.modular.org.service.SysOrgService;
 import vip.xiaonuo.sys.modular.relation.entity.SysRelation;
@@ -164,6 +166,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     private UploadImage uploadImage;
 
+    @Resource
+    private SysBasePigpenService sysBasePigpenService;
+
     @Override
     public SysLoginUser getUserById(String id) {
         SysUser sysUser = this.getById(id);
@@ -179,6 +184,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getAccount, account));
         if (ObjectUtil.isNotEmpty(sysUser)) {
             transService.transOne(sysUser);
+            if (ObjectUtil.isNotEmpty(sysUser.getWorkLocationId())){
+                String[] split = sysUser.getWorkLocationId().split(",");
+                for (String s : split) {
+                    if (ObjectUtil.isEmpty(sysUser.getWorkLocationName())){
+                        sysUser.setWorkLocationName(sysBasePigpenService.getById(s).getFullName());
+                    }else {
+                        sysUser.setWorkLocationName(sysUser.getWorkLocationName()+","+sysBasePigpenService.getById(s).getFullName());
+                    }
+                }
+            }
             return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
         }
         return null;
@@ -493,11 +508,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public void updateAvatar(MultipartFile avatar) throws IOException {
         SysUser sysUser = this.queryEntity(StpUtil.getLoginIdAsString());
-//        String avatarUrl = uploadImage.getImageCom(avatar);
-//        if (avatarUrl.equals("上传失败")){
-//            throw new CommonException("图片上传失败!");
-//        }
-//        sysUser.setAvatar(avatarUrl);
+        String avatarUrl = uploadImage.getImageCom(avatar);
+        if (avatarUrl.equals("上传失败")){
+            throw new CommonException("图片上传失败!");
+        }
+        sysUser.setAvatar(avatarUrl);
         this.updateById(sysUser);
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/carCapture/mapper/mapping/CarCaptureMapper.xml

@@ -10,6 +10,7 @@
             `car_capture`
         WHERE
             org_id = #{orgId} AND cap_time BETWEEN NOW() - INTERVAL 12 HOUR AND NOW()
+            AND delete_flag = 'NOT_DELETE'
         GROUP BY
             DATE_FORMAT(cap_time, "%Y-%m-%d %H:00:00")
         ORDER BY

snowy-web-app/src/main/java/vip/xiaonuo/modular/ai/personCapture/mapper/mapping/PersonCaptureMapper.xml

@@ -10,6 +10,7 @@
             `person_capture`
         WHERE
             org_id = #{orgId} AND cap_time BETWEEN NOW() - INTERVAL 12 HOUR AND NOW()
+            AND delete_flag = 'NOT_DELETE'
         GROUP BY
             DATE_FORMAT(cap_time, "%Y-%m-%d %H:00:00")
         ORDER BY

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/baseConfig/controller/BaseConfigController.java

@@ -20,6 +20,7 @@ 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.models.auth.In;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +32,7 @@ import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.entity.vo.PigPriceVo;
 import vip.xiaonuo.modular.base.baseConfig.param.*;
 import vip.xiaonuo.modular.base.baseConfig.service.BaseConfigService;
 
@@ -152,5 +154,18 @@ public class BaseConfigController {
         return CommonResult.data(baseConfigService.listOrgId());
     }
 
+//    /**
+//     * 获取今日猪价
+//     *
+//     * @author newspaper
+//     * @date  2023/12/08 10:22
+//     */
+//    @ApiOperationSupport(order = 8)
+//    @ApiOperation("获取今日猪价")
+//    @GetMapping("/base/baseConfig/getTodayPigPrice")
+//    public CommonResult<PigPriceVo> getTodayPigPrice(Integer areano) {
+//        return CommonResult.data(baseConfigService.getTodayPigPrice(areano));
+//    }
+
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/baseConfig/entity/vo/PigPriceVo.java

@@ -0,0 +1,15 @@
+package vip.xiaonuo.modular.base.baseConfig.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PigPriceVo {
+    private BigDecimal outTodayPrice;
+    private BigDecimal outYesterdayPrice;
+    private BigDecimal inTodayPrice;
+    private BigDecimal inYesterdayPrice;
+    private BigDecimal aardvarkTodayPrice;
+    private BigDecimal aardvarkYesterdayPrice;
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/baseConfig/service/BaseConfigService.java

@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.biz.modular.org.entity.BizOrg;
 import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.entity.vo.PigPriceVo;
 import vip.xiaonuo.modular.base.baseConfig.param.*;
 
 import java.util.List;
@@ -83,4 +84,6 @@ public interface BaseConfigService extends IService<BaseConfig> {
     Page<BaseConfig> listChild(BaseConfigListChildParam baseConfigListChildParam);
 
     List<BizOrg> listOrgId();
+
+//    PigPriceVo getTodayPigPrice(Integer areano);
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/base/baseConfig/service/impl/BaseConfigServiceImpl.java

@@ -24,8 +24,13 @@ 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.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.org.entity.BizOrg;
 import vip.xiaonuo.biz.modular.org.mapper.BizOrgMapper;
@@ -35,13 +40,16 @@ import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.core.enums.BaseDataTypeEnum;
 import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.base.baseConfig.entity.vo.PigPriceVo;
 import vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper;
 import vip.xiaonuo.modular.base.baseConfig.param.*;
 import vip.xiaonuo.modular.base.baseConfig.service.BaseConfigService;
 
 import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -150,5 +158,35 @@ public class BaseConfigServiceImpl extends ServiceImpl<BaseConfigMapper, BaseCon
         return bizOrgs;
     }
 
+//    @Override
+//    public PigPriceVo getTodayPigPrice(Integer areano) {
+//        PigPriceVo pigPriceVo = new PigPriceVo();
+//        HttpHeaders httpHeaders = new HttpHeaders();
+//        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
+//        httpHeaders.setContentType(type);
+//        HashMap<String, Integer> map = new HashMap<>();
+//        map.put("ptype",1);
+//        map.put("areano",areano);
+//        map.put("datetype",0);
+//        HttpEntity<Map<String, String>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
+//        RestTemplate restTemplate = new RestTemplate();
+////        restTemplate.postForEntity("https://xt.yangzhu.vip/data/getzhujiahitsdata",objectHttpEntity)
+//        return pigPriceVo;
+//    }
+
+//    public static void main(String[] args) {
+//        HttpHeaders httpHeaders = new HttpHeaders();
+//        MediaType type = MediaType.parseMediaType("application/json;charset=UTF-8");
+//        httpHeaders.setContentType(type);
+//        HashMap<String, Integer> map = new HashMap<>();
+//        map.put("ptype",1);
+//        map.put("areano",areano);
+//        map.put("datetype",0);
+//        HttpEntity<Map<String, String>> objectHttpEntity = new HttpEntity<>(map, httpHeaders);
+//        RestTemplate restTemplate = new RestTemplate();
+//        ResponseEntity<String> responseEntity = restTemplate.postForEntity("https://xt.yangzhu.vip/data/getzhujiahitsdata", objectHttpEntity, String.class);
+//
+//    }
+
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -338,7 +338,7 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         Date timesmorning = DataUill.getTimesmorning();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", fatScreenParam.getOrgId())
-                .eq(StringUtils.isNotBlank(eartag), "unit_name", eartag);
+                .eq(StringUtils.isNotBlank(eartag), "unit_id", eartag);
         if ("1".equals(fatScreenParam.getTimeType())) {
             queryWrapper.ge("create_time", timesmorning);
         }