精准饲喂后台修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/controller/BillPersonnelAdmissionController.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.modular.clean.billpersonneladmission.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.modular.clean.billpersonneladmission.entity.BillPersonnelAdmission;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionAddParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionEditParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionIdParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionPageParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.service.BillPersonnelAdmissionService;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 入场申请控制器
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ */
+@Api(tags = "入场申请控制器")
+@ApiSupport(author = "SNOWY_TEAM", order = 1)
+@RestController
+@Validated
+public class BillPersonnelAdmissionController {
+
+    @Resource
+    private BillPersonnelAdmissionService billPersonnelAdmissionService;
+
+    /**
+     * 获取入场申请分页
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("获取入场申请分页")
+    @SaCheckPermission("/clean/billpersonneladmission/page")
+    @GetMapping("/clean/billpersonneladmission/page")
+    public CommonResult<Page<BillPersonnelAdmission>> page(BillPersonnelAdmissionPageParam billPersonnelAdmissionPageParam) {
+        return CommonResult.data(billPersonnelAdmissionService.page(billPersonnelAdmissionPageParam));
+    }
+
+    /**
+     * 添加入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation("添加入场申请")
+    @CommonLog("添加入场申请")
+    @SaCheckPermission("/clean/billpersonneladmission/add")
+    @PostMapping("/clean/billpersonneladmission/add")
+    public CommonResult<String> add(@RequestBody @Valid BillPersonnelAdmissionAddParam billPersonnelAdmissionAddParam) {
+        billPersonnelAdmissionService.add(billPersonnelAdmissionAddParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 编辑入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    @ApiOperationSupport(order = 3)
+    @ApiOperation("编辑入场申请")
+    @CommonLog("编辑入场申请")
+    @SaCheckPermission("/clean/billpersonneladmission/edit")
+    @PostMapping("/clean/billpersonneladmission/edit")
+    public CommonResult<String> edit(@RequestBody @Valid BillPersonnelAdmissionEditParam billPersonnelAdmissionEditParam) {
+        billPersonnelAdmissionService.edit(billPersonnelAdmissionEditParam);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 删除入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    @ApiOperationSupport(order = 4)
+    @ApiOperation("删除入场申请")
+    @CommonLog("删除入场申请")
+    @SaCheckPermission("/clean/billpersonneladmission/delete")
+    @PostMapping("/clean/billpersonneladmission/delete")
+    public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
+                                                   CommonValidList<BillPersonnelAdmissionIdParam> billPersonnelAdmissionIdParamList) {
+        billPersonnelAdmissionService.delete(billPersonnelAdmissionIdParamList);
+        return CommonResult.ok();
+    }
+
+    /**
+     * 获取入场申请详情
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    @ApiOperationSupport(order = 5)
+    @ApiOperation("获取入场申请详情")
+    @SaCheckPermission("/clean/billpersonneladmission/detail")
+    @GetMapping("/clean/billpersonneladmission/detail")
+    public CommonResult<BillPersonnelAdmission> detail(@Valid BillPersonnelAdmissionIdParam billPersonnelAdmissionIdParam) {
+        return CommonResult.data(billPersonnelAdmissionService.detail(billPersonnelAdmissionIdParam));
+    }
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/entity/BillPersonnelAdmission.java

@@ -0,0 +1,135 @@
+/*
+ * 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.clean.billpersonneladmission.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 wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+@Setter
+@TableName("bill_personnel_admission")
+public class BillPersonnelAdmission {
+
+    /** ID */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "ID", position = 1)
+    private Integer id;
+
+    /** 0正常入场  1紧急入场 */
+    @ApiModelProperty(value = "0正常入场  1紧急入场", position = 2)
+    private Integer admissionType;
+
+    /** 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐 */
+    @ApiModelProperty(value = "来访类型 0人员  1环保车  2饲料车  3送猪车 4物资车  ", position = 3)
+    private Integer vistitType;
+
+    /** 目的地 */
+    @ApiModelProperty(value = "目的地", position = 4)
+    private String destName;
+
+    /** 目的地 id */
+    @ApiModelProperty(value = "目的地 id", position = 5)
+    private Integer destId;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 6)
+    private String admissionUserName;
+
+    /** 申请人id */
+    @ApiModelProperty(value = "申请人id", position = 7)
+    private Integer admissionUserId;
+
+    /** 来访时间 */
+    @ApiModelProperty(value = "来访时间", position = 8)
+    private Date vistitDate;
+
+    /** 提交时间 */
+    @ApiModelProperty(value = "提交时间", position = 9)
+    private Date subDate;
+
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 10)
+    private String phone;
+
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 11)
+    private String workName;
+
+    /** 证件类型 */
+    @ApiModelProperty(value = "证件类型", position = 12)
+    private Integer papersType;
+
+    /** 证件号码 */
+    @ApiModelProperty(value = "证件号码", position = 13)
+    private String papersCode;
+
+    /** 照片地址 */
+    @ApiModelProperty(value = "照片地址", position = 14)
+    private String imgUrl;
+
+    /** 来访理由 */
+    @ApiModelProperty(value = "来访理由", position = 15)
+    private String vistitReson;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 16)
+    private String orgId;
+
+    /** 当前状态 0待审批 1通过  2拒绝  3待上传物资信息 */
+    @ApiModelProperty(value = "当前状态 0待审批 1通过  2拒绝  3待上传物资信息", position = 17)
+    private Integer billStatus;
+
+    /** 处理时间 */
+    @ApiModelProperty(value = "处理时间", position = 18)
+    private Date passDate;
+
+    /** 处理人 */
+    @ApiModelProperty(value = "处理人", position = 19)
+    private String passUserName;
+
+    /** 处理人id */
+    @ApiModelProperty(value = "处理人id", position = 20)
+    private Integer passUserId;
+
+    /** 进程id */
+    @ApiModelProperty(value = "进程id", position = 21)
+    private Integer processId;
+
+    /** 车牌号 */
+    @ApiModelProperty(value = "车牌号", position = 22)
+    private String carNum;
+
+    /** 拉猪车来源 */
+    @ApiModelProperty(value = "拉猪车来源", position = 23)
+    private String source;
+
+    /** 人员照片 */
+    @ApiModelProperty(value = "人员照片", position = 24)
+    private String userImgUrl;
+
+    /** 删除标志 */
+    @ApiModelProperty(value = "删除标志", position = 25)
+    @TableLogic
+    @TableField(fill = FieldFill.INSERT)
+    private String deleteFlag;
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/enums/BillPersonnelAdmissionEnum.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.modular.clean.billpersonneladmission.enums;
+
+import lombok.Getter;
+
+/**
+ * 入场申请枚举
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+public enum BillPersonnelAdmissionEnum {
+
+    /** 测试 */
+    TEST("TEST");
+
+    private final String value;
+
+    BillPersonnelAdmissionEnum(String value) {
+        this.value = value;
+    }
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/mapper/BillPersonnelAdmissionMapper.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.modular.clean.billpersonneladmission.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import vip.xiaonuo.modular.clean.billpersonneladmission.entity.BillPersonnelAdmission;
+
+/**
+ * 入场申请Mapper接口
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/mapper/mapping/BillPersonnelAdmissionMapper.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.modular.clean.billpersonneladmission.mapper.BillPersonnelAdmissionMapper">
+
+</mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/param/BillPersonnelAdmissionAddParam.java

@@ -0,0 +1,126 @@
+/*
+ * 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.clean.billpersonneladmission.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 wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+@Setter
+public class BillPersonnelAdmissionAddParam {
+
+    /** 0正常入场  1紧急入场 */
+    @ApiModelProperty(value = "0正常入场  1紧急入场", position = 2)
+    private Integer admissionType;
+
+    /** 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐 */
+    @ApiModelProperty(value = "来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐", position = 3)
+    private Integer vistitType;
+
+    /** 目的地 */
+    @ApiModelProperty(value = "目的地", position = 4)
+    private String destName;
+
+    /** 目的地 id */
+    @ApiModelProperty(value = "目的地 id", position = 5)
+    private Integer destId;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 6)
+    private String admissionUserName;
+
+    /** 申请人id */
+    @ApiModelProperty(value = "申请人id", position = 7)
+    private Integer admissionUserId;
+
+    /** 来访时间 */
+    @ApiModelProperty(value = "来访时间", position = 8)
+    private Date vistitDate;
+
+    /** 提交时间 */
+    @ApiModelProperty(value = "提交时间", position = 9)
+    private Date subDate;
+
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 10)
+    private String phone;
+
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 11)
+    private String workName;
+
+    /** 证件类型 */
+    @ApiModelProperty(value = "证件类型", position = 12)
+    private Integer papersType;
+
+    /** 证件号码 */
+    @ApiModelProperty(value = "证件号码", position = 13)
+    private String papersCode;
+
+    /** 照片地址 */
+    @ApiModelProperty(value = "照片地址", position = 14)
+    private String imgUrl;
+
+    /** 来访理由 */
+    @ApiModelProperty(value = "来访理由", position = 15)
+    private String vistitReson;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 16)
+    private String orgId;
+
+    /** 当前状态 0待审批 1通过  2拒绝  3待上传物资信息 */
+    @ApiModelProperty(value = "当前状态 0待审批 1通过  2拒绝  3待上传物资信息", position = 17)
+    private Integer billStatus;
+
+    /** 处理时间 */
+    @ApiModelProperty(value = "处理时间", position = 18)
+    private Date passDate;
+
+    /** 处理人 */
+    @ApiModelProperty(value = "处理人", position = 19)
+    private String passUserName;
+
+    /** 处理人id */
+    @ApiModelProperty(value = "处理人id", position = 20)
+    private Integer passUserId;
+
+    /** 进程id */
+    @ApiModelProperty(value = "进程id", position = 21)
+    private Integer processId;
+
+    /** 车牌号 */
+    @ApiModelProperty(value = "车牌号", position = 22)
+    private String carNum;
+
+    /** 拉猪车来源 */
+    @ApiModelProperty(value = "拉猪车来源", position = 23)
+    private String source;
+
+    /** 人员照片 */
+    @ApiModelProperty(value = "人员照片", position = 24)
+    private String userImgUrl;
+
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/param/BillPersonnelAdmissionEditParam.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.modular.clean.billpersonneladmission.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 wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+@Setter
+public class BillPersonnelAdmissionEditParam {
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true, position = 1)
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+    /** 0正常入场  1紧急入场 */
+    @ApiModelProperty(value = "0正常入场  1紧急入场", position = 2)
+    private Integer admissionType;
+
+    /** 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐 */
+    @ApiModelProperty(value = "来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐", position = 3)
+    private Integer vistitType;
+
+    /** 目的地 */
+    @ApiModelProperty(value = "目的地", position = 4)
+    private String destName;
+
+    /** 目的地 id */
+    @ApiModelProperty(value = "目的地 id", position = 5)
+    private Integer destId;
+
+    /** 申请人 */
+    @ApiModelProperty(value = "申请人", position = 6)
+    private String admissionUserName;
+
+    /** 申请人id */
+    @ApiModelProperty(value = "申请人id", position = 7)
+    private Integer admissionUserId;
+
+    /** 来访时间 */
+    @ApiModelProperty(value = "来访时间", position = 8)
+    private Date vistitDate;
+
+    /** 提交时间 */
+    @ApiModelProperty(value = "提交时间", position = 9)
+    private Date subDate;
+
+    /** 手机号 */
+    @ApiModelProperty(value = "手机号", position = 10)
+    private String phone;
+
+    /** 单位名称 */
+    @ApiModelProperty(value = "单位名称", position = 11)
+    private String workName;
+
+    /** 证件类型 */
+    @ApiModelProperty(value = "证件类型", position = 12)
+    private Integer papersType;
+
+    /** 证件号码 */
+    @ApiModelProperty(value = "证件号码", position = 13)
+    private String papersCode;
+
+    /** 照片地址 */
+    @ApiModelProperty(value = "照片地址", position = 14)
+    private String imgUrl;
+
+    /** 来访理由 */
+    @ApiModelProperty(value = "来访理由", position = 15)
+    private String vistitReson;
+
+    /** 组织id */
+    @ApiModelProperty(value = "组织id", position = 16)
+    private String orgId;
+
+    /** 当前状态 0待审批 1通过  2拒绝  3待上传物资信息 */
+    @ApiModelProperty(value = "当前状态 0待审批 1通过  2拒绝  3待上传物资信息", position = 17)
+    private Integer billStatus;
+
+    /** 处理时间 */
+    @ApiModelProperty(value = "处理时间", position = 18)
+    private Date passDate;
+
+    /** 处理人 */
+    @ApiModelProperty(value = "处理人", position = 19)
+    private String passUserName;
+
+    /** 处理人id */
+    @ApiModelProperty(value = "处理人id", position = 20)
+    private Integer passUserId;
+
+    /** 进程id */
+    @ApiModelProperty(value = "进程id", position = 21)
+    private Integer processId;
+
+    /** 车牌号 */
+    @ApiModelProperty(value = "车牌号", position = 22)
+    private String carNum;
+
+    /** 拉猪车来源 */
+    @ApiModelProperty(value = "拉猪车来源", position = 23)
+    private String source;
+
+    /** 人员照片 */
+    @ApiModelProperty(value = "人员照片", position = 24)
+    private String userImgUrl;
+
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/param/BillPersonnelAdmissionIdParam.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.modular.clean.billpersonneladmission.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 入场申请Id参数
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+@Setter
+public class BillPersonnelAdmissionIdParam {
+
+    /** ID */
+    @ApiModelProperty(value = "ID", required = true)
+    @NotBlank(message = "id不能为空")
+    private Integer id;
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/param/BillPersonnelAdmissionPageParam.java

@@ -0,0 +1,59 @@
+/*
+ * 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.clean.billpersonneladmission.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 入场申请查询参数
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+@Getter
+@Setter
+public class BillPersonnelAdmissionPageParam {
+
+    /** 当前页 */
+    @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;
+
+    /** 来访时间开始 */
+    @ApiModelProperty(value = "来访时间开始")
+    private String startVistitDate;
+
+    /** 来访时间结束 */
+    @ApiModelProperty(value = "来访时间结束")
+    private String endVistitDate;
+
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/service/BillPersonnelAdmissionService.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.modular.clean.billpersonneladmission.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import vip.xiaonuo.modular.clean.billpersonneladmission.entity.BillPersonnelAdmission;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionAddParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionEditParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionIdParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionPageParam;
+
+import java.util.List;
+
+/**
+ * 入场申请Service接口
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+public interface BillPersonnelAdmissionService extends IService<BillPersonnelAdmission> {
+
+    /**
+     * 获取入场申请分页
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    Page<BillPersonnelAdmission> page(BillPersonnelAdmissionPageParam billPersonnelAdmissionPageParam);
+
+    /**
+     * 添加入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    void add(BillPersonnelAdmissionAddParam billPersonnelAdmissionAddParam);
+
+    /**
+     * 编辑入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    void edit(BillPersonnelAdmissionEditParam billPersonnelAdmissionEditParam);
+
+    /**
+     * 删除入场申请
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    void delete(List<BillPersonnelAdmissionIdParam> billPersonnelAdmissionIdParamList);
+
+    /**
+     * 获取入场申请详情
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     */
+    BillPersonnelAdmission detail(BillPersonnelAdmissionIdParam billPersonnelAdmissionIdParam);
+
+    /**
+     * 获取入场申请详情
+     *
+     * @author wang
+     * @date  2024/01/03 09:27
+     **/
+    BillPersonnelAdmission queryEntity(String id);
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/clean/billpersonneladmission/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -0,0 +1,97 @@
+/*
+ * 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.clean.billpersonneladmission.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.modular.clean.billpersonneladmission.entity.BillPersonnelAdmission;
+import vip.xiaonuo.modular.clean.billpersonneladmission.mapper.BillPersonnelAdmissionMapper;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionAddParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionEditParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionIdParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.param.BillPersonnelAdmissionPageParam;
+import vip.xiaonuo.modular.clean.billpersonneladmission.service.BillPersonnelAdmissionService;
+
+import java.util.List;
+
+/**
+ * 入场申请Service接口实现类
+ *
+ * @author wang
+ * @date  2024/01/03 09:27
+ **/
+@Service
+public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnelAdmissionMapper, BillPersonnelAdmission> implements BillPersonnelAdmissionService {
+
+    @Override
+    public Page<BillPersonnelAdmission> page(BillPersonnelAdmissionPageParam billPersonnelAdmissionPageParam) {
+        QueryWrapper<BillPersonnelAdmission> queryWrapper = new QueryWrapper<>();
+        if(ObjectUtil.isNotEmpty(billPersonnelAdmissionPageParam.getStartVistitDate()) && ObjectUtil.isNotEmpty(billPersonnelAdmissionPageParam.getEndVistitDate())) {
+            queryWrapper.lambda().between(BillPersonnelAdmission::getVistitDate, billPersonnelAdmissionPageParam.getStartVistitDate(), billPersonnelAdmissionPageParam.getEndVistitDate());
+        }
+        if(ObjectUtil.isAllNotEmpty(billPersonnelAdmissionPageParam.getSortField(), billPersonnelAdmissionPageParam.getSortOrder())) {
+            CommonSortOrderEnum.validate(billPersonnelAdmissionPageParam.getSortOrder());
+            queryWrapper.orderBy(true, billPersonnelAdmissionPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
+                    StrUtil.toUnderlineCase(billPersonnelAdmissionPageParam.getSortField()));
+        } else {
+            queryWrapper.lambda().orderByAsc(BillPersonnelAdmission::getId);
+        }
+        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(BillPersonnelAdmissionAddParam billPersonnelAdmissionAddParam) {
+        BillPersonnelAdmission billPersonnelAdmission = BeanUtil.toBean(billPersonnelAdmissionAddParam, BillPersonnelAdmission.class);
+        this.save(billPersonnelAdmission);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void edit(BillPersonnelAdmissionEditParam billPersonnelAdmissionEditParam) {
+        BillPersonnelAdmission billPersonnelAdmission = this.queryEntity(billPersonnelAdmissionEditParam.getId());
+        BeanUtil.copyProperties(billPersonnelAdmissionEditParam, billPersonnelAdmission);
+        this.updateById(billPersonnelAdmission);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void delete(List<BillPersonnelAdmissionIdParam> billPersonnelAdmissionIdParamList) {
+        // 执行删除
+        this.removeByIds(CollStreamUtil.toList(billPersonnelAdmissionIdParamList, BillPersonnelAdmissionIdParam::getId));
+    }
+
+    @Override
+    public BillPersonnelAdmission detail(BillPersonnelAdmissionIdParam billPersonnelAdmissionIdParam) {
+        return this.queryEntity(billPersonnelAdmissionIdParam.getId());
+    }
+
+    @Override
+    public BillPersonnelAdmission queryEntity(String id) {
+        BillPersonnelAdmission billPersonnelAdmission = this.getById(id);
+        if(ObjectUtil.isEmpty(billPersonnelAdmission)) {
+            throw new CommonException("入场申请不存在，id值为：{}", id);
+        }
+        return billPersonnelAdmission;
+    }
+}

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -129,7 +129,7 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
     public JSONObject listEnv(String orgId) {
         JSONObject jsonObject = new JSONObject();
         long deviceNum = this.count(new QueryWrapper<FeedingEnv>().lambda().eq(FeedingEnv::getOrgId, orgId));
-        if (deviceNum == 0){
+        if (deviceNum > 0){
             jsonObject.put("envCount", 0);
             jsonObject.put("onliveCount", 0);
             jsonObject.put("offliveCount", 0);

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

@@ -96,10 +96,14 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
         FeedingFatVo feed = fatMapper.getFeed(feedingEnv.getDeviceCode(), orgId);
         double aDouble = Double.parseDouble(feed.getTodayFeed());
         double aDouble1 = Double.parseDouble(feed.getDayWeight());
-        double rank = aDouble / aDouble1;
-        DecimalFormat def = new DecimalFormat("0.00");
+        if (aDouble1 == 0) {
+            feed.setRank("0.00%");
+        } else {
+            double rank = aDouble / aDouble1;
+            DecimalFormat def = new DecimalFormat("0.00");
+            feed.setRank(def.format(rank));
+        }
         feed.setFatCount(1);
-        feed.setRank(def.format(rank));
         return feed;
     }