فهرست منبع

v3项目-新增隐患排查

wwh 3 روز پیش
والد
کامیت
56946e73e8
27فایلهای تغییر یافته به همراه1225 افزوده شده و 3 حذف شده
  1. 1 1
      app-admin/src/main/java/com/ruoyi/web/v2/server/EnvInputServer.java
  2. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckDailyController.java
  3. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckLedgerController.java
  4. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckMonthlyController.java
  5. 61 0
      app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckQuarterController.java
  6. 65 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckDailyEntity.java
  7. 88 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckLedgerEntity.java
  8. 70 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckMonthlyEntity.java
  9. 71 0
      app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckQuarterEntity.java
  10. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckDailyMapper.java
  11. 15 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckLedgerMapper.java
  12. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckMonthlyMapper.java
  13. 14 0
      app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckQuarterMapper.java
  14. 55 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckDailyPageReq.java
  15. 29 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckLedgerPageReq.java
  16. 62 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckMonthlyPageReq.java
  17. 81 0
      app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckQuarterPageReq.java
  18. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckDailyService.java
  19. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckLedgerService.java
  20. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckMonthlyService.java
  21. 24 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckQuarterService.java
  22. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckDailyServiceImpl.java
  23. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckLedgerImpl.java
  24. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckMonthlyServiceImpl.java
  25. 76 0
      app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckQuarterServiceImpl.java
  26. 1 1
      app-admin/src/main/resources/application-druid.yml
  27. 1 1
      app-admin/src/main/resources/application.yml

+ 1 - 1
app-admin/src/main/java/com/ruoyi/web/v2/server/EnvInputServer.java

@@ -14,7 +14,7 @@ public class EnvInputServer {
     private EnvInputServerHandler serverHandler;
     //监听端口
 //    private int port = 3729;
-    private int port = 3726;
+    private int port = 3739;
     //创建构造方法
     public EnvInputServer(){
     }

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckDailyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckDailyEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckDailyPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckDailyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(日次) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb_risk_check_daily")
+@Api("3.0 隐患风险点检记录(日次)")
+public class HbRiskCheckDailyController {
+
+    @Resource
+    private IHbRiskCheckDailyService riskCheckDailyService;
+
+    @ApiOperation("隐患风险点检记录(日次)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbRiskCheckDailyEntity request){
+        return riskCheckDailyService.add(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(日次)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbRiskCheckDailyEntity request){
+        return riskCheckDailyService.edit(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(日次)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return riskCheckDailyService.delete(ids);
+    }
+
+    @ApiOperation("隐患风险点检记录(日次)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbRiskCheckDailyPageReq request) {
+        return riskCheckDailyService.page(request);
+    }
+
+
+    @ApiOperation("隐患风险点检记录(日次)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return riskCheckDailyService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckLedgerController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckLedgerEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckLedgerPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckLedgerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 隐患排查治理台账 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb_risk_check_ledger")
+@Api("3.0 隐患排查治理台账")
+public class HbRiskCheckLedgerController {
+
+    @Resource
+    private IHbRiskCheckLedgerService riskCheckService;
+
+    @ApiOperation("隐患排查治理台账记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbRiskCheckLedgerEntity request){
+        return riskCheckService.add(request);
+    }
+
+    @ApiOperation("隐患排查治理台账记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbRiskCheckLedgerEntity request){
+        return riskCheckService.edit(request);
+    }
+
+    @ApiOperation("隐患排查治理台账记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return riskCheckService.delete(ids);
+    }
+
+    @ApiOperation("隐患排查治理台账记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbRiskCheckLedgerPageReq request) {
+        return riskCheckService.page(request);
+    }
+
+
+    @ApiOperation("隐患排查治理台账记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return riskCheckService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckMonthlyController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckMonthlyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(月次) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb_risk_check_monthly")
+@Api("3.0 隐患风险点检记录(月次)")
+public class HbRiskCheckMonthlyController {
+
+    @Resource
+    private IHbRiskCheckMonthlyService riskCheckService;
+
+    @ApiOperation("隐患风险点检记录(月次)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbRiskCheckMonthlyEntity request){
+        return riskCheckService.add(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(月次)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbRiskCheckMonthlyEntity request){
+        return riskCheckService.edit(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(月次)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return riskCheckService.delete(ids);
+    }
+
+    @ApiOperation("隐患风险点检记录(月次)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbRiskCheckMonthlyPageReq request) {
+        return riskCheckService.page(request);
+    }
+
+
+    @ApiOperation("隐患风险点检记录(月次)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return riskCheckService.listAll();
+    }
+
+}

+ 61 - 0
app-admin/src/main/java/com/ruoyi/web/v3/controller/HbRiskCheckQuarterController.java

@@ -0,0 +1,61 @@
+package com.ruoyi.web.v3.controller;
+
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckMonthlyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(季度) 前端控制器
+ * </p>
+ *
+ */
+@RestController
+@RequestMapping("/v3/hb_risk_check_quarter")
+@Api("3.0 隐患风险点检记录(季度)")
+public class HbRiskCheckQuarterController {
+
+    @Resource
+    private IHbRiskCheckMonthlyService riskCheckService;
+
+    @ApiOperation("隐患风险点检记录(季度)记录添加")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody HbRiskCheckMonthlyEntity request){
+        return riskCheckService.add(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(季度)记录修改")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody HbRiskCheckMonthlyEntity request){
+        return riskCheckService.edit(request);
+    }
+
+    @ApiOperation("隐患风险点检记录(季度)记录删除")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody Map<String, String> paramsMap) {
+        String ids = paramsMap.get("ids");
+        return riskCheckService.delete(ids);
+    }
+
+    @ApiOperation("隐患风险点检记录(季度)记录分页查询")
+    @GetMapping("/page")
+    public AjaxResult page(@ModelAttribute HbRiskCheckMonthlyPageReq request) {
+        return riskCheckService.page(request);
+    }
+
+
+    @ApiOperation("隐患风险点检记录(季度)记录列表全量查询")
+    @GetMapping("/list")
+    public AjaxResult listAll(){
+        return riskCheckService.listAll();
+    }
+
+}

+ 65 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckDailyEntity.java

@@ -0,0 +1,65 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0隐患风险点检记录(日次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_risk_check_daily")
+@ApiModel(value="HbRiskCheckDaily", description="v3.0隐患风险点检记录(日次)")
+public class HbRiskCheckDailyEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "排查日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+    @ApiModelProperty(value = "排查结果(0:未通过 1:已通过)")
+    private Boolean isChecked;
+
+
+    @ApiModelProperty(value = "检查人(签字)")
+    private String inspectorConfirm;
+
+
+    @ApiModelProperty(value = "异常情况记录")
+    private String unusualCaseDetail;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+}

+ 88 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckLedgerEntity.java

@@ -0,0 +1,88 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0隐患排查治理台账
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_risk_check_ledger")
+@ApiModel(value="HbRiskCheckLedger", description="v3.0隐患排查治理台账")
+public class HbRiskCheckLedgerEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号", example = "1")
+    private Integer sequenceNo;
+
+
+    @ApiModelProperty(value = "检查时间", example = "2025-08-20 09:00:00")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+
+    @ApiModelProperty(value = "检查人", example = "张三")
+    private String inspectorName;
+
+
+    @ApiModelProperty(value = "责任部门", example = "生产部")
+    private String dept;
+
+
+    @ApiModelProperty(value = "事故隐患", example = "配电箱未上锁")
+    private String potentialDetail;
+
+
+    @ApiModelProperty(value = "隐患等级", example = "重大隐患")
+    private String potentialLevel;
+
+
+    @ApiModelProperty(value = "治理措施", example = "立即上锁并张贴警示标识")
+    private String solutionDetail;
+
+
+    @ApiModelProperty(value = "完成时限", example = "2025-08-25")
+    private String deadline;
+
+
+    @ApiModelProperty(value = "整改责任人", example = "李四")
+    private String upgradeOwner;
+
+
+    @ApiModelProperty(value = "复查人", example = "王五")
+    private String reviewerName;
+
+    @ApiModelProperty(value = "复查时间", example = "2025-08-21 10:00:00")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime reviewTime;
+
+    @ApiModelProperty(value = "复查结果(0未通过/1已通过)", example = "1")
+    private Boolean isReviewed;
+
+}

+ 70 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckMonthlyEntity.java

@@ -0,0 +1,70 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0隐患风险点检记录(月次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_risk_check_monthly")
+@ApiModel(value="HbRiskCheckMonthly", description="v3.0隐患风险点检记录(月次)")
+public class HbRiskCheckMonthlyEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "排查日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+
+    @ApiModelProperty(value = "月份区间")
+    private String monthSection;
+
+
+    @ApiModelProperty(value = "排查结果(0:未通过 1:已通过)")
+    private Boolean isChecked;
+
+
+    @ApiModelProperty(value = "检查人(签字)")
+    private String inspectorConfirm;
+
+
+    @ApiModelProperty(value = "异常情况记录")
+    private String unusualCaseDetail;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+}

+ 71 - 0
app-admin/src/main/java/com/ruoyi/web/v3/entity/HbRiskCheckQuarterEntity.java

@@ -0,0 +1,71 @@
+package com.ruoyi.web.v3.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.common.core.domain.AbstractEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * <p>
+ * v3.0隐患风险点检记录(季次)
+ * </p>
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("hb_risk_check_quarter")
+@ApiModel(value="HbRiskCheckQuarter", description="v3.0隐患风险点检记录(季次)")
+public class HbRiskCheckQuarterEntity extends AbstractEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+
+    @ApiModelProperty(value = "排查日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+
+    @ApiModelProperty(value = "排查季度")
+    private String checkQuarter;
+
+
+    @ApiModelProperty(value = "排查结果(0:未通过 1:已通过)")
+    private Boolean isChecked;
+
+
+    @ApiModelProperty(value = "检查人(签字)")
+    private String inspectorConfirm;
+
+
+    @ApiModelProperty(value = "异常情况记录")
+    private String unusualCaseDetail;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckDailyMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbRiskCheckDailyEntity;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(日次) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbRiskCheckDailyMapper extends BaseMapper<HbRiskCheckDailyEntity> {
+
+}

+ 15 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckLedgerMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbRiskCheckLedgerEntity;
+import com.ruoyi.web.v3.entity.HbRiskCheckQuarterEntity;
+
+/**
+ * <p>
+ * v3.0 隐患排查治理台账 Mapper 接口
+ * </p>
+ *
+ */
+public interface HbRiskCheckLedgerMapper extends BaseMapper<HbRiskCheckLedgerEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckMonthlyMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbRiskCheckMonthlyEntity;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(月次) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbRiskCheckMonthlyMapper extends BaseMapper<HbRiskCheckMonthlyEntity> {
+
+}

+ 14 - 0
app-admin/src/main/java/com/ruoyi/web/v3/mapper/HbRiskCheckQuarterMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.web.v3.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.web.v3.entity.HbRiskCheckQuarterEntity;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(季度) Mapper 接口
+ * </p>
+ *
+ */
+public interface HbRiskCheckQuarterMapper extends BaseMapper<HbRiskCheckQuarterEntity> {
+
+}

+ 55 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckDailyPageReq.java

@@ -0,0 +1,55 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbRiskCheckDailyPageReq", description="v3.0 隐患风险点检记录(日次)")
+public class HbRiskCheckDailyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "排查日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+    @ApiModelProperty(value = "排查结果(0:未通过 1:已通过)")
+    private Boolean isChecked;
+
+    @ApiModelProperty(value = "检查人(签字)")
+    private String inspectorConfirm;
+
+
+    @ApiModelProperty(value = "异常情况记录")
+    private String unusualCaseDetail;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

+ 29 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckLedgerPageReq.java

@@ -0,0 +1,29 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbRiskCheckLedgerPageReq", description="v3.0 隐患风险点检记录(季度)")
+public class HbRiskCheckLedgerPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+}

+ 62 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckMonthlyPageReq.java

@@ -0,0 +1,62 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbRiskCheckMonthlyPageReq", description="v3.0 隐患风险点检记录(月次)")
+public class HbRiskCheckMonthlyPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String jobTitle;
+
+
+    @ApiModelProperty(value = "编号")
+    private String recordNo;
+
+    @ApiModelProperty(value = "排查日期")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+
+    @ApiModelProperty(value = "月份区间")
+    private String monthSection;
+
+
+    @ApiModelProperty(value = "排查结果(0:未通过 1:已通过)")
+    private Boolean isChecked;
+
+
+    @ApiModelProperty(value = "检查人(签字)")
+    private String inspectorConfirm;
+
+
+    @ApiModelProperty(value = "异常情况记录")
+    private String unusualCaseDetail;
+
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

+ 81 - 0
app-admin/src/main/java/com/ruoyi/web/v3/model/request/HbRiskCheckQuarterPageReq.java

@@ -0,0 +1,81 @@
+package com.ruoyi.web.v3.model.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.ruoyi.web.v3.model.BasePageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HbRiskCheckQuarterPageReq", description="v3.0 隐患风险点检记录(季度)")
+public class HbRiskCheckQuarterPageReq extends BasePageRequest implements Serializable {
+
+    @ApiModelProperty(value = "数据唯一性标识id")
+    private String id;
+
+    @ApiModelProperty(value = "序号", example = "1")
+    private Integer sequenceNo;
+
+
+    @ApiModelProperty(value = "检查时间", example = "2025-08-20 09:00:00")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime checkDate;
+
+
+    @ApiModelProperty(value = "检查人", example = "张三")
+    private String inspectorName;
+
+
+    @ApiModelProperty(value = "责任部门", example = "生产部")
+    private String dept;
+
+
+    @ApiModelProperty(value = "事故隐患", example = "配电箱未上锁")
+    private String potentialDetail;
+
+
+    @ApiModelProperty(value = "隐患等级", example = "重大隐患")
+    private String potentialLevel;
+
+
+    @ApiModelProperty(value = "治理措施", example = "立即上锁并张贴警示标识")
+    private String solutionDetail;
+
+
+    @ApiModelProperty(value = "完成时限", example = "2025-08-25")
+    private String deadline;
+
+
+    @ApiModelProperty(value = "整改责任人", example = "李四")
+    private String upgradeOwner;
+
+
+    @ApiModelProperty(value = "复查人", example = "王五")
+    private String reviewerName;
+
+    @ApiModelProperty(value = "复查时间", example = "2025-08-21 10:00:00")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime reviewTime;
+
+    @ApiModelProperty(value = "复查结果(0未通过/1已通过)", example = "1")
+    private Boolean isReviewed;
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckDailyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckDailyEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckDailyPageReq;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(日次) 服务类
+ * </p>
+ */
+public interface IHbRiskCheckDailyService extends IService<HbRiskCheckDailyEntity> {
+
+    AjaxResult add(HbRiskCheckDailyEntity request);
+
+    AjaxResult edit(HbRiskCheckDailyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbRiskCheckDailyPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckLedgerService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckLedgerEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckLedgerPageReq;
+
+/**
+ * <p>
+ * v3.0 隐患排查治理台账 服务类
+ * </p>
+ */
+public interface IHbRiskCheckLedgerService extends IService<HbRiskCheckLedgerEntity> {
+
+    AjaxResult add(HbRiskCheckLedgerEntity request);
+
+    AjaxResult edit(HbRiskCheckLedgerEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbRiskCheckLedgerPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckMonthlyService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckMonthlyEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckMonthlyPageReq;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(日次) 服务类
+ * </p>
+ */
+public interface IHbRiskCheckMonthlyService extends IService<HbRiskCheckMonthlyEntity> {
+
+    AjaxResult add(HbRiskCheckMonthlyEntity request);
+
+    AjaxResult edit(HbRiskCheckMonthlyEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbRiskCheckMonthlyPageReq request);
+
+    AjaxResult listAll();
+}

+ 24 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/IHbRiskCheckQuarterService.java

@@ -0,0 +1,24 @@
+package com.ruoyi.web.v3.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckQuarterEntity;
+import com.ruoyi.web.v3.model.request.HbRiskCheckQuarterPageReq;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(季度) 服务类
+ * </p>
+ */
+public interface IHbRiskCheckQuarterService extends IService<HbRiskCheckQuarterEntity> {
+
+    AjaxResult add(HbRiskCheckQuarterEntity request);
+
+    AjaxResult edit(HbRiskCheckQuarterEntity request);
+
+    AjaxResult delete(String ids);
+
+    AjaxResult page(HbRiskCheckQuarterPageReq request);
+
+    AjaxResult listAll();
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckDailyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckDailyEntity;
+import com.ruoyi.web.v3.mapper.HbRiskCheckDailyMapper;
+import com.ruoyi.web.v3.model.request.HbRiskCheckDailyPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckDailyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(日次) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbRiskCheckDailyServiceImpl extends ServiceImpl<HbRiskCheckDailyMapper, HbRiskCheckDailyEntity> implements IHbRiskCheckDailyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbRiskCheckDailyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getIsChecked())) {
+            return error("请输入【排查结果】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbRiskCheckDailyEntity::getCheckDate, request.getCheckDate()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbRiskCheckDailyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbRiskCheckDailyPageReq request) {
+        //将请求报文转为实体类
+        HbRiskCheckDailyEntity entity = BeanUtil.toBean(request, HbRiskCheckDailyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbRiskCheckDailyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckLedgerImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckLedgerEntity;
+import com.ruoyi.web.v3.mapper.HbRiskCheckLedgerMapper;
+import com.ruoyi.web.v3.model.request.HbRiskCheckLedgerPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckLedgerService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0  隐患排查治理台账 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbRiskCheckLedgerImpl extends ServiceImpl<HbRiskCheckLedgerMapper, HbRiskCheckLedgerEntity> implements IHbRiskCheckLedgerService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbRiskCheckLedgerEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getSolutionDetail())) {
+            return error("请输入【治理措施】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbRiskCheckLedgerEntity::getCheckDate, request.getCheckDate()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbRiskCheckLedgerEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbRiskCheckLedgerPageReq request) {
+        //将请求报文转为实体类
+        HbRiskCheckLedgerEntity entity = BeanUtil.toBean(request, HbRiskCheckLedgerEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbRiskCheckLedgerEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckMonthlyServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckMonthlyEntity;
+import com.ruoyi.web.v3.mapper.HbRiskCheckMonthlyMapper;
+import com.ruoyi.web.v3.model.request.HbRiskCheckMonthlyPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckMonthlyService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(月次) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbRiskCheckMonthlyServiceImpl extends ServiceImpl<HbRiskCheckMonthlyMapper, HbRiskCheckMonthlyEntity> implements IHbRiskCheckMonthlyService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbRiskCheckMonthlyEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getIsChecked())) {
+            return error("请输入【排查结果】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbRiskCheckMonthlyEntity::getCheckDate, request.getCheckDate()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbRiskCheckMonthlyEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbRiskCheckMonthlyPageReq request) {
+        //将请求报文转为实体类
+        HbRiskCheckMonthlyEntity entity = BeanUtil.toBean(request, HbRiskCheckMonthlyEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbRiskCheckMonthlyEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 76 - 0
app-admin/src/main/java/com/ruoyi/web/v3/service/impl/HbRiskCheckQuarterServiceImpl.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.v3.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.web.v3.entity.HbRiskCheckQuarterEntity;
+import com.ruoyi.web.v3.mapper.HbRiskCheckQuarterMapper;
+import com.ruoyi.web.v3.model.request.HbRiskCheckQuarterPageReq;
+import com.ruoyi.web.v3.service.IHbRiskCheckQuarterService;
+import com.ruoyi.web.v3.utils.QueryWrapperBuildUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+
+import static com.ruoyi.common.core.domain.AjaxResult.error;
+import static com.ruoyi.common.core.domain.AjaxResult.success;
+
+/**
+ * <p>
+ * v3.0 隐患风险点检记录(季度) 服务实现类
+ * </p>
+ *
+ */
+@Service
+public class HbRiskCheckQuarterServiceImpl extends ServiceImpl<HbRiskCheckQuarterMapper, HbRiskCheckQuarterEntity> implements IHbRiskCheckQuarterService {
+
+    @Transactional
+    @Override
+    public AjaxResult add(HbRiskCheckQuarterEntity request) {
+        //入参检测
+        if(ObjectUtils.isEmpty(request.getIsChecked())) {
+            return error("请输入【排查结果】!");
+        }
+        //防重检测,
+        Integer count = lambdaQuery().eq(HbRiskCheckQuarterEntity::getCheckDate, request.getCheckDate()).count();
+        if (count != 0) {
+            return error("请勿重复添加!");
+        }
+        return success("添加成功", baseMapper.insert(request));
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult edit(HbRiskCheckQuarterEntity request) {
+        //数据格式校验
+        if(ObjectUtils.isEmpty(request.getId())){
+            return error("待更新数据未传入有效ID,请设置数据的唯一标识ID!");
+        }
+        //根据数据的id更新所有不为空的字段
+        return updateById(request) ? success("修改成功!") : error("修改失败,请重试!");
+    }
+
+    @Transactional
+    @Override
+    public AjaxResult delete(String ids) {
+        String[] idList = ids.split(",");
+        return success("删除成功", removeByIds(Arrays.asList(idList)));
+    }
+
+    @Override
+    public AjaxResult page(HbRiskCheckQuarterPageReq request) {
+        //将请求报文转为实体类
+        HbRiskCheckQuarterEntity entity = BeanUtil.toBean(request, HbRiskCheckQuarterEntity.class);
+        //构造查询条件(检索条件未定时,先按不为空的字段进行等值查询)
+        QueryWrapper<HbRiskCheckQuarterEntity> wrapper = QueryWrapperBuildUtil.notNoneEqWrapperHelper(entity);
+        return success(baseMapper.selectPage(request.toPage(), wrapper));
+    }
+
+    @Override
+    public AjaxResult listAll() {
+        return success(lambdaQuery().list());
+    }
+}

+ 1 - 1
app-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://122.112.224.199:3306/huimv-jiangshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://122.112.224.199:3306/huimv-hebei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: hm123456
             # 从库数据源

+ 1 - 1
app-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口,默认为8080
-  port: 8089
+  port: 8180
   servlet:
     # 应用的访问路径
     context-path: /