Pārlūkot izejas kodu

生物防控人员

523096025 1 gadu atpakaļ
vecāks
revīzija
f63da2e08b
40 mainītis faili ar 1224 papildinājumiem un 7 dzēšanām
  1. 2 2
      huimv-admin/src/main/java/com/huimv/admin/common/token/TokenSign.java
  2. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BaseLocationController.java
  3. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BaseProcessController.java
  4. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java
  5. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BillIsolateController.java
  6. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BillPcrController.java
  7. 20 0
      huimv-admin/src/main/java/com/huimv/admin/controller/BillPersonnelAdmissionController.java
  8. 60 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BaseLocation.java
  9. 79 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BaseProcess.java
  10. 101 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BillClean.java
  11. 126 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java
  12. 108 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BillPcr.java
  13. 129 0
      huimv-admin/src/main/java/com/huimv/admin/entity/BillPersonnelAdmission.java
  14. 14 1
      huimv-admin/src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java
  15. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BaseLocationMapper.java
  16. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BaseProcessMapper.java
  17. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BillCleanMapper.java
  18. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BillIsolateMapper.java
  19. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BillPcrMapper.java
  20. 16 0
      huimv-admin/src/main/java/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.java
  21. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBaseLocationService.java
  22. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBaseProcessService.java
  23. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBillCleanService.java
  24. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBillIsolateService.java
  25. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBillPcrService.java
  26. 16 0
      huimv-admin/src/main/java/com/huimv/admin/service/IBillPersonnelAdmissionService.java
  27. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BaseLocationServiceImpl.java
  28. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BaseProcessServiceImpl.java
  29. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java
  30. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BillIsolateServiceImpl.java
  31. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPcrServiceImpl.java
  32. 20 0
      huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java
  33. 24 4
      huimv-admin/src/main/java/com/huimv/admin/timer/CarmeraTimer.java
  34. 17 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BaseLocationMapper.xml
  35. 20 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BaseProcessMapper.xml
  36. 25 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml
  37. 30 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BillIsolateMapper.xml
  38. 27 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPcrMapper.xml
  39. 30 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.xml
  40. 0 0
      huimv-admin/src/main/resources/com/huimv/admin/mapper/ProdCountMapper.xml

+ 2 - 2
huimv-admin/src/main/java/com/huimv/admin/common/token/TokenSign.java

@@ -10,9 +10,9 @@ import java.util.Date;
 public class TokenSign {
 
     /**
-     * 过期时间60分钟
+     * 过期时间7天
      */
-    private static final long EXPIRE_TIME= 24 * 60 * 60 * 1000;
+    private static final long EXPIRE_TIME= 7 * 24 * 60 * 60 * 1000;
 
     /**
      * 私钥,使用它生成token,最好进行下加密

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BaseLocationController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/base-location")
+public class BaseLocationController {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BaseProcessController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 流程表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/base-process")
+public class BaseProcessController {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BillCleanController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 洗消表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/bill-clean")
+public class BillCleanController {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BillIsolateController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 隔离 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/bill-isolate")
+public class BillIsolateController {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BillPcrController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * pcr 表 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/bill-pcr")
+public class BillPcrController {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/controller/BillPersonnelAdmissionController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 入场申请 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@RestController
+@RequestMapping("/bill-personnel-admission")
+public class BillPersonnelAdmissionController {
+
+}

+ 60 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BaseLocation.java

@@ -0,0 +1,60 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_location")
+public class BaseLocation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名字
+     */
+    private String locationName;
+
+    /**
+     * pcr 次数
+     */
+    private Integer pcrNum;
+
+    /**
+     * 洗消次数
+     */
+    private Integer washNum;
+
+    /**
+     * 洗澡次数
+     */
+    private Integer batheNum;
+
+    private Integer farmId;
+
+    /**
+     * 0检测地点,1 工作地点
+     */
+    private Integer locationType;
+
+//    private Integer processId;
+
+
+}

+ 79 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BaseProcess.java

@@ -0,0 +1,79 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 流程表
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_process")
+public class BaseProcess implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime subDate;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 当前位置
+     */
+    private String currentLocation;
+
+    /**
+     * 当前位置id
+     */
+    private String currentLocationId;
+
+    private Integer farmId;
+
+    /**
+     * 0 进行中,1已完成,2拒绝(提前结束)
+     */
+    private Integer processType;
+
+
+}

+ 101 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BillClean.java

@@ -0,0 +1,101 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 洗消表
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_clean")
+public class BillClean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime subDate;
+
+    private Integer farmId;
+
+    /**
+     * 当前状态 0待审批 1合格  2异常
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    /**
+     * 检测地点
+     */
+    private String testLocation;
+
+    private Integer testLocationId;
+
+
+}

+ 126 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BillIsolate.java

@@ -0,0 +1,126 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 隔离
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_isolate")
+public class BillIsolate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime subDate;
+
+    private Integer farmId;
+
+    /**
+     * 当前状态 0待隔离 1隔离中  2已完成 3提前解除
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    /**
+     * 隔离地点
+     */
+    private String isolateLocation;
+
+    private Integer isolateLocationId;
+
+    /**
+     * 隔离开始时间
+     */
+    private LocalDateTime isolateStartDate;
+
+    /**
+     * 隔离结束时间
+     */
+    private LocalDateTime isolateEndDate;
+
+    /**
+     * 隔离天数
+     */
+    private Integer isolateDayNum;
+
+    /**
+     * 真实隔离天数
+     */
+    private Integer isolateRealDayNum;
+
+    /**
+     * 真实隔离结束时间
+     */
+    private LocalDateTime isolateRealEndDate;
+
+
+}

+ 108 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BillPcr.java

@@ -0,0 +1,108 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * pcr 表
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_pcr")
+public class BillPcr implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0正常  1复审
+     */
+    private Integer pcrType;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime subDate;
+
+    /**
+     * 检测时间
+     */
+    private LocalDateTime checkDate;
+
+    /**
+     * 当前状态 0待审批 1合格  2异常 3已失效
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+    private Integer farmId;
+
+    private String testLocation;
+
+    private Integer testLocationId;
+
+
+}

+ 129 - 0
huimv-admin/src/main/java/com/huimv/admin/entity/BillPersonnelAdmission.java

@@ -0,0 +1,129 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 入场申请
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("bill_personnel_admission")
+public class BillPersonnelAdmission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 0正常入场  1紧急入场
+     */
+    private Integer admissionType;
+
+    /**
+     * 来访类型 0人员  1环保车 2拉猪车 3饲料车  4送猪车 5物资车  6送餐
+     */
+    private Integer vistitType;
+
+    /**
+     * 目的地
+     */
+    private String destName;
+
+    /**
+     * 目的地 id
+     */
+    private Integer destId;
+
+    /**
+     * 申请人
+     */
+    private String admissionUserName;
+
+    /**
+     * 申请人id
+     */
+    private Integer admissionUserId;
+
+    /**
+     * 来访时间
+     */
+    private LocalDateTime vistitDate;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime subDate;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 单位名称
+     */
+    private String workName;
+
+    /**
+     * 证件类型
+     */
+    private Integer papersType;
+
+    /**
+     * 证件号码
+     */
+    private String papersCode;
+
+    /**
+     * 照片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 来访理由
+     */
+    private String vistitReson;
+
+    private Integer farmId;
+
+    /**
+     * 当前状态 0待审批 1通过  2拒绝
+     */
+    private Integer billStatus;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime passDate;
+
+    /**
+     * 处理人
+     */
+    private String passUserName;
+
+    /**
+     * 处理人id
+     */
+    private Integer passUserId;
+
+    /**
+     * 进程id
+     */
+    private Integer processId;
+
+
+}

+ 14 - 1
huimv-admin/src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java

@@ -44,8 +44,21 @@ public class SysAccountMultilevel extends Model {
     private Integer lastFarmId;
 
     private String userName;
-    private Integer type;
     private String farmNames;
 
+    //0管理员,1 场长 2 紧急进程审核员  ,3生物安全负责人 ,4 pcr 检测人员,5洗消站点工作人员
+    private Integer type;
+
+    private String workLocation;
+    private String workLocationId;
+    //工作岗位 1 场长 2 紧急进程审核员  ,3生物安全负责人 ,4 pcr 检测人员,5洗消站点工作人员
+    private String workPost;
+    private String phone;
+    private String imgUrl;
+    private String workName;
+    //证件类型 0身份证 ,1护照
+    private String papersType;
+    private String papersCode;
+
 
 }

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BaseLocationMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BaseLocation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BaseLocationMapper extends BaseMapper<BaseLocation> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BaseProcessMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BaseProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 流程表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BaseProcessMapper extends BaseMapper<BaseProcess> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BillCleanMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillClean;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 洗消表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BillCleanMapper extends BaseMapper<BillClean> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BillIsolateMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillIsolate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 隔离 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BillIsolateMapper extends BaseMapper<BillIsolate> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BillPcrMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillPcr;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * pcr 表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BillPcrMapper extends BaseMapper<BillPcr> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 入场申请 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface BillPersonnelAdmissionMapper extends BaseMapper<BillPersonnelAdmission> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBaseLocationService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BaseLocation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBaseLocationService extends IService<BaseLocation> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBaseProcessService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BaseProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 流程表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBaseProcessService extends IService<BaseProcess> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBillCleanService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillClean;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 洗消表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBillCleanService extends IService<BillClean> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBillIsolateService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillIsolate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 隔离 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBillIsolateService extends IService<BillIsolate> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBillPcrService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillPcr;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * pcr 表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBillPcrService extends IService<BillPcr> {
+
+}

+ 16 - 0
huimv-admin/src/main/java/com/huimv/admin/service/IBillPersonnelAdmissionService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 入场申请 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+public interface IBillPersonnelAdmissionService extends IService<BillPersonnelAdmission> {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BaseLocationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BaseLocation;
+import com.huimv.admin.mapper.BaseLocationMapper;
+import com.huimv.admin.service.IBaseLocationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BaseLocationServiceImpl extends ServiceImpl<BaseLocationMapper, BaseLocation> implements IBaseLocationService {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BaseProcessServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BaseProcess;
+import com.huimv.admin.mapper.BaseProcessMapper;
+import com.huimv.admin.service.IBaseProcessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 流程表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BaseProcessServiceImpl extends ServiceImpl<BaseProcessMapper, BaseProcess> implements IBaseProcessService {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BillCleanServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillClean;
+import com.huimv.admin.mapper.BillCleanMapper;
+import com.huimv.admin.service.IBillCleanService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 洗消表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BillCleanServiceImpl extends ServiceImpl<BillCleanMapper, BillClean> implements IBillCleanService {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BillIsolateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillIsolate;
+import com.huimv.admin.mapper.BillIsolateMapper;
+import com.huimv.admin.service.IBillIsolateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 隔离 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BillIsolateServiceImpl extends ServiceImpl<BillIsolateMapper, BillIsolate> implements IBillIsolateService {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPcrServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillPcr;
+import com.huimv.admin.mapper.BillPcrMapper;
+import com.huimv.admin.service.IBillPcrService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * pcr 表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BillPcrServiceImpl extends ServiceImpl<BillPcrMapper, BillPcr> implements IBillPcrService {
+
+}

+ 20 - 0
huimv-admin/src/main/java/com/huimv/admin/service/impl/BillPersonnelAdmissionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.BillPersonnelAdmission;
+import com.huimv.admin.mapper.BillPersonnelAdmissionMapper;
+import com.huimv.admin.service.IBillPersonnelAdmissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 入场申请 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-07-21
+ */
+@Service
+public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnelAdmissionMapper, BillPersonnelAdmission> implements IBillPersonnelAdmissionService {
+
+}

+ 24 - 4
huimv-admin/src/main/java/com/huimv/admin/timer/CarmeraTimer.java

@@ -18,15 +18,16 @@ import com.huimv.admin.entity.zengxindto.*;
 import com.huimv.admin.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
+import java.lang.invoke.MethodHandleProxies;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -80,4 +81,23 @@ public class CarmeraTimer {
         System.out.println(" ====== getCameras请求返回结果:【{" + data + "}】");
         return data;
     }
+
+
+    public static void main(String[] args) {
+        RestTemplate restTemplate = new RestTemplate();
+        String envUrl = "https://dnqyt.envchina.com/api/public/station-data";
+        LocalDate previousDay = LocalDate.now().minusDays(1);
+        LocalDateTime previousDayStart = LocalDateTime.of(previousDay, LocalTime.MIN);
+
+        String sgToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJkYW9ub25nIiwidWlkIjozLCJ1biI6IlpYUUxZWktKMjMwN0EyIiwiZXhwIjoxNjg5MDcwNTYxLCJqdGkiOiIzIn0.BEFESZrKOwBej4rxOfoj7qPcHGomh6KN7xbXdjOB__w";
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("token",sgToken);
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<Map<String, Object>> formEntity = new HttpEntity<Map<String, Object>>(headers);
+
+        String urlWithParams = envUrl + "?type=D&mn=33330424001391" + "&startTime=" + "2023-07-10 00:00:00" + "&endTime=" + "2023-07-10 00:00:00";
+        ResponseEntity<String> result = restTemplate.exchange(urlWithParams, HttpMethod.GET,formEntity,String.class);
+        System.out.println(result);
+    }
+
 }

+ 17 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BaseLocationMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BaseLocationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BaseLocation">
+        <id column="id" property="id" />
+        <result column="location_name" property="locationName" />
+        <result column="pcr_num" property="pcrNum" />
+        <result column="wash_num" property="washNum" />
+        <result column="bathe_num" property="batheNum" />
+        <result column="farm_id" property="farmId" />
+        <result column="location_type" property="locationType" />
+        <result column="process_id" property="processId" />
+    </resultMap>
+
+</mapper>

+ 20 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BaseProcessMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BaseProcessMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BaseProcess">
+        <id column="id" property="id" />
+        <result column="dest_name" property="destName" />
+        <result column="dest_id" property="destId" />
+        <result column="admission_user_name" property="admissionUserName" />
+        <result column="admission_user_id" property="admissionUserId" />
+        <result column="sub_date" property="subDate" />
+        <result column="update_date" property="updateDate" />
+        <result column="current_location" property="currentLocation" />
+        <result column="current_location_id" property="currentLocationId" />
+        <result column="farm_id" property="farmId" />
+        <result column="process_type" property="processType" />
+    </resultMap>
+
+</mapper>

+ 25 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BillCleanMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BillCleanMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BillClean">
+        <id column="id" property="id" />
+        <result column="vistit_type" property="vistitType" />
+        <result column="dest_name" property="destName" />
+        <result column="dest_id" property="destId" />
+        <result column="admission_user_name" property="admissionUserName" />
+        <result column="admission_user_id" property="admissionUserId" />
+        <result column="vistit_date" property="vistitDate" />
+        <result column="sub_date" property="subDate" />
+        <result column="farm_id" property="farmId" />
+        <result column="bill_status" property="billStatus" />
+        <result column="pass_date" property="passDate" />
+        <result column="pass_user_name" property="passUserName" />
+        <result column="pass_user_id" property="passUserId" />
+        <result column="process_id" property="processId" />
+        <result column="test_location" property="testLocation" />
+        <result column="test_location_id" property="testLocationId" />
+    </resultMap>
+
+</mapper>

+ 30 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BillIsolateMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BillIsolateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BillIsolate">
+        <id column="id" property="id" />
+        <result column="vistit_type" property="vistitType" />
+        <result column="dest_name" property="destName" />
+        <result column="dest_id" property="destId" />
+        <result column="admission_user_name" property="admissionUserName" />
+        <result column="admission_user_id" property="admissionUserId" />
+        <result column="vistit_date" property="vistitDate" />
+        <result column="sub_date" property="subDate" />
+        <result column="farm_id" property="farmId" />
+        <result column="bill_status" property="billStatus" />
+        <result column="pass_date" property="passDate" />
+        <result column="pass_user_name" property="passUserName" />
+        <result column="pass_user_id" property="passUserId" />
+        <result column="process_id" property="processId" />
+        <result column="isolate_location" property="isolateLocation" />
+        <result column="isolate_location_id" property="isolateLocationId" />
+        <result column="isolate_start_date" property="isolateStartDate" />
+        <result column="isolate_end_date" property="isolateEndDate" />
+        <result column="isolate_day_num" property="isolateDayNum" />
+        <result column="isolate_real_day_num" property="isolateRealDayNum" />
+        <result column="isolate_real_end_date" property="isolateRealEndDate" />
+    </resultMap>
+
+</mapper>

+ 27 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPcrMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BillPcrMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BillPcr">
+        <id column="id" property="id" />
+        <result column="pcr_type" property="pcrType" />
+        <result column="vistit_type" property="vistitType" />
+        <result column="dest_name" property="destName" />
+        <result column="dest_id" property="destId" />
+        <result column="admission_user_name" property="admissionUserName" />
+        <result column="admission_user_id" property="admissionUserId" />
+        <result column="vistit_date" property="vistitDate" />
+        <result column="sub_date" property="subDate" />
+        <result column="check_date" property="checkDate" />
+        <result column="bill_status" property="billStatus" />
+        <result column="pass_date" property="passDate" />
+        <result column="pass_user_name" property="passUserName" />
+        <result column="pass_user_id" property="passUserId" />
+        <result column="process_id" property="processId" />
+        <result column="farm_id" property="farmId" />
+        <result column="test_location" property="testLocation" />
+        <result column="test_location_id" property="testLocationId" />
+    </resultMap>
+
+</mapper>

+ 30 - 0
huimv-admin/src/main/resources/com/huimv/admin/mapper/BillPersonnelAdmissionMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.common.mapper.BillPersonnelAdmissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.common.entity.BillPersonnelAdmission">
+        <id column="id" property="id" />
+        <result column="admission_type" property="admissionType" />
+        <result column="vistit_type" property="vistitType" />
+        <result column="dest_name" property="destName" />
+        <result column="dest_id" property="destId" />
+        <result column="admission_user_name" property="admissionUserName" />
+        <result column="admission_user_id" property="admissionUserId" />
+        <result column="vistit_date" property="vistitDate" />
+        <result column="sub_date" property="subDate" />
+        <result column="phone" property="phone" />
+        <result column="work_name" property="workName" />
+        <result column="papers_type" property="papersType" />
+        <result column="papers_code" property="papersCode" />
+        <result column="img_url" property="imgUrl" />
+        <result column="vistit_reson" property="vistitReson" />
+        <result column="farm_id" property="farmId" />
+        <result column="bill_status" property="billStatus" />
+        <result column="pass_date" property="passDate" />
+        <result column="pass_user_name" property="passUserName" />
+        <result column="pass_user_id" property="passUserId" />
+        <result column="process_id" property="processId" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/mapper/ProdCountMapper.xml → huimv-admin/src/main/resources/com/huimv/admin/mapper/ProdCountMapper.xml