Merge remote-tracking branch 'origin/main'

数据分析模块开发
2026-01-22 11:23:31 +08:00 · 2026-01-22 11:23:13 +08:00
22 changed files with 1780 additions and 13 deletions
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewDevUsedVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewDevUsedVo.java
@ -0,0 +1,34 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjNewDevUsedVo {
+
+
+    private String id;
+    /**
+     * 使用时间
+     */
+    private String usedTime;
+
+    /**
+     * 设备名称
+     */
+    private String devName;
+    /**
+     * 设备id
+     */
+    private String devId;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewFaultVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewFaultVo.java
@ -0,0 +1,36 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjNewFaultVo {
+
+    private String id;
+    /**
+     * 使用时间
+     */
+    private String faultTime;
+
+    /**
+     * 设备名称
+     */
+    private String devName;
+    /**
+     * 设备id
+     */
+    private String devId;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 关键字
+     */
+    private String keyWord;
+
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewProProgressRealVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewProProgressRealVo.java
@ -0,0 +1,55 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+/**
+ * 工程进度分析关联表
+ */
+@Data
+public class SjNewProProgressRealVo {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 进度id
+     */
+    private String progressId;
+    /**
+     * 填报时间
+     */
+    private String inTime;
+    /**
+     * 计划进度
+     */
+    private String planProgress;
+    /**
+     * 实际进度
+     */
+    private String progress;
+    /**
+     * 偏差分析
+     */
+    private String analysis;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+    /**
+     * 备注
+     */
+    private String  remark;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewProProgressVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewProProgressVo.java
@ -0,0 +1,71 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+/**
+ * 工程进度分析表实体
+ */
+@Data
+public class SjNewProProgressVo {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 工序类型
+     */
+    private String gxType;
+    /**
+     * 工序
+     */
+    private String gx;
+    /**
+     * 计划开始时间
+     */
+    private String planStartTime;
+    /**
+     * 计划结束时间
+     */
+    private String planEndTime;
+    /**
+     * 投入人员
+     */
+    private String inUser;
+    /**
+     * 投入设备
+     */
+    private String inDevice;
+    /**
+     * 实际进度
+     */
+    private String progress;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+
+
+
+
+
+
+
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerAnalysicVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerAnalysicVo.java
@ -0,0 +1,65 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjNewWorkerAnalysicVo {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 姓名
+     */
+    private String userName;
+    /**
+     * 班组id
+     */
+    private String teamId;
+    /**
+     * 班组名称
+     */
+    private String teamName;
+    /**
+     * 工作内容
+     */
+    private String workContent;
+    /**
+     * 任务状态
+     */
+    private String taskStatus;
+    /**
+     * 计划开始时间
+     */
+    private String planStartTime;
+    /**
+     * 计划结束时间
+     */
+    private String planEndTime;
+    /**
+     * 实际结束时间
+     */
+    private String endTime;
+    /**
+     * 是否延期
+     */
+    private String isYq;
+    /**
+     * 延期天数
+     */
+    private String yaDay;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewWorkerWarnVo.java
@ -0,0 +1,44 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjNewWorkerWarnVo {
+
+    private String id;
+    /**
+     * 提醒时间
+     */
+    private String txTime;
+    /**
+     * 预警类型
+     */
+    private String txType;
+    /**
+     * 预警内容
+     */
+    private String content;
+    /**
+     * 数据类型
+     */
+    private String dataType;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 处理措施
+     */
+    private String measureData;
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewZylllWarnVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjNewZylllWarnVo.java
@ -0,0 +1,46 @@
+package com.securitycontrol.entity.background.vo;
+
+import lombok.Data;
+
+@Data
+public class SjNewZylllWarnVo {
+    private String id;
+    /**
+     * 提醒时间
+     */
+    private String txTime;
+    /**
+     * 预警类型
+     */
+    private String txType;
+    /**
+     * 预警内容
+     */
+    private String content;
+    /**
+     * 数据类型
+     */
+    private String dataType;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 处理措施
+     */
+    private String measureData;
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 关键字查询
+     */
+    private String keyWord;
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjNewProProgressController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjNewProProgressController.java
@ -0,0 +1,89 @@
+package com.securitycontrol.background.controller;
+
+import com.securitycontrol.background.service.SjNewProProgressService;
+import com.securitycontrol.common.core.web.controller.BaseController;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.common.core.web.page.TableDataInfo;
+import com.securitycontrol.common.log.annotation.Log;
+import com.securitycontrol.common.log.enums.OperationType;
+import com.securitycontrol.entity.background.vo.SjEnergyVo;
+import com.securitycontrol.entity.background.vo.SjNewProProgressRealVo;
+import com.securitycontrol.entity.background.vo.SjNewProProgressVo;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 工程进度分析
+ */
+@RestController
+@RequestMapping("/sj/newProProgress/")
+@Slf4j
+public class SjNewProProgressController  extends BaseController {
+
+        @Autowired
+        private SjNewProProgressService service;
+
+    @GetMapping("list")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.QUERY_BUSINESS, details = "施工进度分析数据管理数据集合", type = "业务日志")
+    public TableDataInfo getList(SjNewProProgressVo vo) {
+        startPage();
+        List<SjNewProProgressVo> list=service.getList(vo);
+        return getDataTable(list);
+    }
+
+
+    @GetMapping("getRealList")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.QUERY_BUSINESS, details = "施工进度分析数据管理数据集合", type = "业务日志")
+    public TableDataInfo getRealList(SjNewProProgressRealVo dto) {
+        startPage();
+        List<SjNewProProgressRealVo>   list = service.getRealList(dto);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("addData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult addData(@RequestBody SjNewProProgressVo vo) {
+        return service.addData(vo);
+    }
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("updateData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult updateData(@RequestBody SjNewProProgressVo vo) {
+        return service.updateData(vo);
+    }
+
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("deleteData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult deleteData(@RequestBody SjNewProProgressVo vo) {
+        return service.deleteData(vo);
+    }
+
+
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("addRealData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult addRealData(@RequestBody SjNewProProgressRealVo vo) {
+        return service.addRealData(vo);
+    }
+
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("updateRealData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult updateRealData(@RequestBody SjNewProProgressRealVo vo) {
+        return service.updateRealData(vo);
+    }
+    @ApiOperation(value = "施工进度分析数据管理")
+    @PostMapping("deleteRealData")
+    @Log(title = "数据分析", menu = "数据分析->施工进度分析数据管理", grade = OperationType.ADD_BUSINESS, details = "施工进度分析数据管理", type = "业务日志")
+    public AjaxResult deleteRealData(@RequestBody SjNewProProgressRealVo vo) {
+        return service.deleteRealData(vo);
+    }
+
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjNewWorkerController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjNewWorkerController.java
@ -0,0 +1,87 @@
+package com.securitycontrol.background.controller;
+
+import com.securitycontrol.background.service.SjNewWorkerService;
+import com.securitycontrol.common.core.web.controller.BaseController;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.common.core.web.page.TableDataInfo;
+import com.securitycontrol.common.log.annotation.Log;
+import com.securitycontrol.common.log.enums.OperationType;
+import com.securitycontrol.entity.background.vo.SjNewWorkerAnalysicVo;
+import com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工人效益分析
+ */
+@RestController
+@RequestMapping("/sj/newWorker/")
+@Slf4j
+public class SjNewWorkerController  extends BaseController {
+
+        @Autowired
+        private SjNewWorkerService service;
+
+        @GetMapping("list")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.QUERY_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public TableDataInfo getList(SjNewWorkerAnalysicVo vo) {
+                startPage();
+                List<SjNewWorkerAnalysicVo> list=service.getList(vo);
+                return getDataTable(list);
+        }
+
+        @GetMapping("getWarnList")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.QUERY_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public TableDataInfo getWarnList(SjNewWorkerWarnVo vo) {
+                startPage();
+                List<SjNewWorkerWarnVo>   list = service.getWarnList(vo);
+                return getDataTable(list);
+        }
+
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("addData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult addData(@RequestBody SjNewWorkerAnalysicVo vo) {
+                return service.addData(vo);
+        }
+
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("updateData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult updateData(@RequestBody SjNewWorkerAnalysicVo vo) {
+                return service.updateData(vo);
+        }
+
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("deleteData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult deleteData(@RequestBody SjNewWorkerAnalysicVo vo) {
+                return service.deleteData(vo);
+        }
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("addWarnData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult addWarnData(@RequestBody SjNewWorkerWarnVo vo) {
+                return service.addWarnData(vo);
+        }
+
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("updateWarnData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult updateWarnData(@RequestBody SjNewWorkerWarnVo vo) {
+                return service.updateWarnData(vo);
+        }
+
+        @ApiOperation(value = "工人效益分析")
+        @PostMapping("delWarnData")
+        @Log(title = "数据分析", menu = "数据分析->工人效益分析", grade = OperationType.ADD_BUSINESS, details = "工人效益分析", type = "业务日志")
+        public AjaxResult delWarnData(@RequestBody SjNewWorkerWarnVo vo) {
+                return service.delWarnData(vo);
+        }
+
+
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjWorkTeamController.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/SjWorkTeamController.java
@ -6,9 +6,7 @@ import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.common.core.web.page.TableDataInfo;
 import com.securitycontrol.common.log.annotation.Log;
 import com.securitycontrol.common.log.enums.OperationType;
-import com.securitycontrol.entity.background.vo.SjMaxDeviceVo;
-import com.securitycontrol.entity.background.vo.SjTeamPeopleVo;
-import com.securitycontrol.entity.background.vo.SjWorkTeamVo;
+import com.securitycontrol.entity.background.vo.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@ -182,4 +180,111 @@ public class SjWorkTeamController extends BaseController {
    public AjaxResult delMaxDevData(@RequestBody SjMaxDeviceVo dto){
        return service.delMaxDevData(dto);
    }
+
+    /**
+     * TODO
+      * @param dto
+     * @return
+     */
+    @GetMapping("getDevUsedList")
+    @Log(title = "数据分析", menu = "数据分析->设备使用记录", grade = OperationType.QUERY_BUSINESS, details = "查询班组信息详情", type = "业务日志")
+    public TableDataInfo getDevUsedList(SjNewDevUsedVo dto) {
+        startPage();
+        List<SjNewDevUsedVo>  list = service.getDevUsedList(dto);
+        return getDataTable(list);
+    }
+    @GetMapping("getFaultList")
+    @Log(title = "数据分析", menu = "数据分析->设备使用记录", grade = OperationType.QUERY_BUSINESS, details = "查询班组信息详情", type = "业务日志")
+    public TableDataInfo getFaultList(SjNewFaultVo vo) {
+        startPage();
+        List<SjNewFaultVo>  list = service.getFaultList(vo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "新增设备使用记录")
+    @PostMapping("addFaultData")
+    @Log(title = "数据分析", menu = "数据分析->大型设备", grade = OperationType.ADD_BUSINESS, details = "新增设备使用记录", type = "业务日志")
+    public AjaxResult addFaultData(@RequestBody SjNewFaultVo vo) {
+        return service.addFaultData(vo);
+    }
+
+    @ApiOperation(value = "新增设备使用记录")
+    @PostMapping("updateFaultData")
+    @Log(title = "数据分析", menu = "数据分析->大型设备", grade = OperationType.ADD_BUSINESS, details = "新增设备使用记录", type = "业务日志")
+    public AjaxResult updateFaultData(@RequestBody SjNewFaultVo vo) {
+        return service.updateFaultData(vo);
+    }
+    @ApiOperation(value = "新增设备使用记录")
+    @PostMapping("delFaultData")
+    @Log(title = "数据分析", menu = "数据分析->大型设备", grade = OperationType.ADD_BUSINESS, details = "新增设备使用记录", type = "业务日志")
+    public AjaxResult delFaultData(@RequestBody SjNewFaultVo vo) {
+        return service.delFaultData(vo);
+    }
+
+
+    @GetMapping("getAsyncWarnList")
+    @Log(title = "数据分析", menu = "数据分析->资源利用率告警分析", grade = OperationType.QUERY_BUSINESS, details = "资源利用率告警分析", type = "业务日志")
+    public TableDataInfo getAsyncWarnList(SjNewZylllWarnVo vo) {
+        startPage();
+        List<SjNewZylllWarnVo>  list = service.getAsyncWarnList(vo);
+        return getDataTable(list);
+    }
+
+
+    @PostMapping("addAsyncWarnList")
+    @Log(title = "数据分析", menu = "数据分析->资源利用率告警分析", grade = OperationType.QUERY_BUSINESS, details = "资源利用率告警分析", type = "业务日志")
+    public AjaxResult addAsyncWarnList(@RequestBody SjNewZylllWarnVo vo) {
+        return service.addAsyncWarnList(vo);
+    }
+
+    @PostMapping("updateAsyncWarnList")
+    @Log(title = "数据分析", menu = "数据分析->资源利用率告警分析", grade = OperationType.QUERY_BUSINESS, details = "资源利用率告警分析", type = "业务日志")
+    public AjaxResult updateAsyncWarnList(@RequestBody SjNewZylllWarnVo vo) {
+        return service.updateAsyncWarnList(vo);
+    }
+
+    @PostMapping("delAsyncWarnList")
+    @Log(title = "数据分析", menu = "数据分析->资源利用率告警分析", grade = OperationType.QUERY_BUSINESS, details = "资源利用率告警分析", type = "业务日志")
+    public AjaxResult delAsyncWarnList(@RequestBody SjNewZylllWarnVo vo) {
+        return service.delAsyncWarnList(vo);
+    }
+
+    @ApiOperation(value = "新增设备使用记录")
+    @PostMapping("addDevUsedData")
+    @Log(title = "数据分析", menu = "数据分析->大型设备", grade = OperationType.ADD_BUSINESS, details = "新增设备使用记录", type = "业务日志")
+    public AjaxResult addDevUsedData(@RequestBody SjNewDevUsedVo vo) {
+        return service.addDevUsedData(vo);
+    }
+
+    @ApiOperation(value = "删除设备使用记录")
+    @PostMapping("delDevUsedData")
+    @Log(title = "数据分析", menu = "数据分析->大型设备", grade = OperationType.ADD_BUSINESS, details = "新增设备使用记录", type = "业务日志")
+    public AjaxResult delDevUsedData(@RequestBody SjNewDevUsedVo vo) {
+        return service.delDevUsedData(vo);
+    }
+    /**
+     * 查询设备数据集合
+     * @param dto
+     * @return
+     */
+    @GetMapping("getDevList")
+    @Log(title = "数据分析", menu = "数据分析->设备使用记录", grade = OperationType.QUERY_BUSINESS, details = "查询班组信息详情", type = "业务日志")
+    public AjaxResult getDevList(SjNewDevUsedVo dto) {
+        return service.getDevList(dto);
+    }
+
+    /**
+     * 查询班组下拉选集合
+     * @param dto
+     * @return
+     */
+    @GetMapping("getTeamList")
+    @Log(title = "数据分析", menu = "数据分析->设备使用记录", grade = OperationType.QUERY_BUSINESS, details = "查询班组信息详情", type = "业务日志")
+    public AjaxResult getTeamList(SjNewDevUsedVo dto) {
+        return service.getTeamList(dto);
+    }
+
+
+
+
 }
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjNewProProgressMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjNewProProgressMapper.java
@ -0,0 +1,73 @@
+package com.securitycontrol.background.mapper;
+
+import com.securitycontrol.entity.background.vo.SjNewProProgressRealVo;
+import com.securitycontrol.entity.background.vo.SjNewProProgressVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SjNewProProgressMapper {
+
+    /**
+     *
+     * @param vo
+     * @return
+     */
+    List<SjNewProProgressVo> getList(SjNewProProgressVo vo);
+
+    /**
+     * 查询管理数据集合
+     * @param vo
+     * @return
+     */
+    List<SjNewProProgressRealVo> getRealList(SjNewProProgressRealVo vo);
+
+    /**
+     * 新增数据
+     * @param vo
+     * @return
+     */
+    Integer addData(SjNewProProgressVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    Integer updateData(SjNewProProgressVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    Integer deleteData(SjNewProProgressVo vo);
+
+    /**
+     * 数据添加
+     * @param vo
+     * @return
+     */
+    Integer addRealData(SjNewProProgressRealVo vo);
+
+    /**
+     * 修改实际进度
+     * @param vo
+     */
+    void updateDataProgress(SjNewProProgressRealVo vo);
+
+    /**
+     * 修改关联数据
+     * @param vo
+     * @return
+     */
+    Integer updateRealData(SjNewProProgressRealVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    Integer deleteRealData(SjNewProProgressRealVo vo);
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjNewWorkerMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjNewWorkerMapper.java
@ -0,0 +1,66 @@
+package com.securitycontrol.background.mapper;
+
+import com.securitycontrol.entity.background.vo.SjNewWorkerAnalysicVo;
+import com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SjNewWorkerMapper {
+    /**
+     * 查询数据集合
+     * @param vo
+     * @return
+     */
+    List<SjNewWorkerAnalysicVo> getList(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 告警数据列表集合
+     * @param vo
+     * @return
+     */
+    List<SjNewWorkerWarnVo> getWarnList(SjNewWorkerWarnVo vo);
+
+    /**
+     * 新增工人效益数据
+     * @param vo
+     * @return
+     */
+    Integer addData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    Integer updateData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    Integer deleteData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 新增预警信息
+     * @param vo
+     * @return
+     */
+    Integer addWarnData(SjNewWorkerWarnVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    Integer updateWarnData(SjNewWorkerWarnVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    Integer delWarnData(SjNewWorkerWarnVo vo);
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjWorkTeamMapper.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/SjWorkTeamMapper.java
@ -1,8 +1,6 @@
 package com.securitycontrol.background.mapper;

-import com.securitycontrol.entity.background.vo.SjMaxDeviceVo;
-import com.securitycontrol.entity.background.vo.SjTeamPeopleVo;
-import com.securitycontrol.entity.background.vo.SjWorkTeamVo;
+import com.securitycontrol.entity.background.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

@ -137,4 +135,95 @@ public interface SjWorkTeamMapper {
     * @return
     */
    SjMaxDeviceVo getMaxDevDetails(SjMaxDeviceVo dto);
+
+    /**
+     * 查询设备使用记录数据
+     * @param dto
+     * @return
+     */
+    List<SjNewDevUsedVo> getDevUsedList(SjNewDevUsedVo dto);
+
+    /**
+     * 查询大型设备下拉选
+     * @param dto
+     * @return
+     */
+    List<SjMaxDeviceVo> getDevList(SjNewDevUsedVo dto);
+
+    /**
+     * 查询班组下拉选
+     * @param dto
+     * @return
+     */
+    List<SjWorkTeamVo> getTeamList(SjNewDevUsedVo dto);
+
+    /**
+     * 新增用户使用记录
+     * @param vo
+     * @return
+     */
+    Integer addDevUsedData(SjNewDevUsedVo vo);
+
+    /**
+     * 删除
+     * @param vo
+     * @return
+     */
+    Integer delDevUsedData(SjNewDevUsedVo vo);
+
+    /**
+     * 查询告警分析
+     * @param vo
+     * @return
+     */
+    List<SjNewZylllWarnVo> getAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 新增告警数据
+     * @param vo
+     * @return
+     */
+    Integer addAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 修改告警数据
+     * @param vo
+     * @return
+     */
+    Integer updateAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 删除告警数据
+     * @param vo
+     * @return
+     */
+    Integer delAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 设备故障记录
+     * @param vo
+     * @return
+     */
+    List<SjNewFaultVo> getFaultList(SjNewFaultVo vo);
+
+    /**
+     * 新增损坏设备记录
+     * @param vo
+     * @return
+     */
+    Integer addFaultData(SjNewFaultVo vo);
+
+    /**
+     * 修改损坏记录
+     * @param vo
+     * @return
+     */
+    Integer updateFaultData(SjNewFaultVo vo);
+
+    /**
+     * 删除损坏记录
+     * @param vo
+     * @return
+     */
+    Integer delFaultData(SjNewFaultVo vo);
 }
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjNewProProgressService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjNewProProgressService.java
@ -0,0 +1,65 @@
+package com.securitycontrol.background.service;
+
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.vo.SjNewProProgressRealVo;
+import com.securitycontrol.entity.background.vo.SjNewProProgressVo;
+
+import java.util.List;
+
+public interface SjNewProProgressService {
+    /**
+     * 分页查询工程进度分析数据
+     * @param vo
+     * @return
+     */
+    List<SjNewProProgressVo> getList(SjNewProProgressVo vo);
+
+    /**
+     * 工序数据集合
+     * @param dto
+     * @return
+     */
+    List<SjNewProProgressRealVo> getRealList(SjNewProProgressRealVo dto);
+
+    /**
+     * 新增施工进度数据
+     * @param vo
+     * @return
+     */
+    AjaxResult addData(SjNewProProgressVo vo);
+
+    /**
+     * 修改施工进度数据
+     * @param vo
+     * @return
+     */
+    AjaxResult updateData(SjNewProProgressVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    AjaxResult deleteData(SjNewProProgressVo vo);
+
+    /**
+     * 新增管理数据
+     * @param vo
+     * @return
+     */
+    AjaxResult addRealData(SjNewProProgressRealVo vo);
+
+    /**
+     * 修改关联
+     * @param vo
+     * @return
+     */
+    AjaxResult updateRealData(SjNewProProgressRealVo vo);
+
+    /**
+     * 删除关联数据
+     * @param vo
+     * @return
+     */
+    AjaxResult deleteRealData(SjNewProProgressRealVo vo);
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjNewWorkerService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjNewWorkerService.java
@ -0,0 +1,65 @@
+package com.securitycontrol.background.service;
+
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.vo.SjNewWorkerAnalysicVo;
+import com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo;
+
+import java.util.List;
+
+public interface SjNewWorkerService {
+    /**
+     * 工人效益分析查询
+     * @param vo
+     * @return
+     */
+    List<SjNewWorkerAnalysicVo> getList(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 告警数据集合
+     * @param vo
+     * @return
+     */
+    List<SjNewWorkerWarnVo> getWarnList(SjNewWorkerWarnVo vo);
+
+    /**
+     * 新增数据接口
+     * @param vo
+     * @return
+     */
+    AjaxResult addData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 修改数据接口
+     * @param vo
+     * @return
+     */
+    AjaxResult updateData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    AjaxResult deleteData(SjNewWorkerAnalysicVo vo);
+
+    /**
+     * 新增预警信息
+     * @param vo
+     * @return
+     */
+    AjaxResult addWarnData(SjNewWorkerWarnVo vo);
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    AjaxResult updateWarnData(SjNewWorkerWarnVo vo);
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    AjaxResult delWarnData(SjNewWorkerWarnVo vo);
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjWorkTeamService.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/SjWorkTeamService.java
@ -1,9 +1,7 @@
 package com.securitycontrol.background.service;

 import com.securitycontrol.common.core.web.domain.AjaxResult;
-import com.securitycontrol.entity.background.vo.SjMaxDeviceVo;
-import com.securitycontrol.entity.background.vo.SjTeamPeopleVo;
-import com.securitycontrol.entity.background.vo.SjWorkTeamVo;
+import com.securitycontrol.entity.background.vo.*;

 import java.util.List;

@ -140,4 +138,95 @@ public interface SjWorkTeamService {
     * @return
     */
    List<SjMaxDeviceVo> getMaxDevList(SjMaxDeviceVo dto);
+
+    /**
+     * 设备使用记录列表查询
+     * @param dto
+     * @return
+     */
+    List<SjNewDevUsedVo> getDevUsedList(SjNewDevUsedVo dto);
+
+    /**
+     * 查询设备数据集合
+     * @param dto
+     * @return
+     */
+    AjaxResult getDevList(SjNewDevUsedVo dto);
+
+    /**
+     * 班组下拉选数据集合
+     * @param dto
+     * @return
+     */
+    AjaxResult getTeamList(SjNewDevUsedVo dto);
+
+    /**
+     * 新增设备使用记录
+     * @param vo
+     * @return
+     */
+    AjaxResult addDevUsedData(SjNewDevUsedVo vo);
+
+    /**
+     * 删除设备使用记录
+     * @param vo
+     * @return
+     */
+    AjaxResult delDevUsedData(SjNewDevUsedVo vo);
+
+    /**
+     * 查询资源利用率数据列表结婚
+     * @param vo
+     * @return
+     */
+    List<SjNewZylllWarnVo> getAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 新增告警信息
+     * @param vo
+     * @return
+     */
+    AjaxResult addAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 修改告警信息
+     * @param vo
+     * @return
+     */
+    AjaxResult updateAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 删除告警信息
+     * @param vo
+     * @return
+     */
+    AjaxResult delAsyncWarnList(SjNewZylllWarnVo vo);
+
+    /**
+     * 查询
+     * @param vo
+     * @return
+     */
+    List<SjNewFaultVo> getFaultList(SjNewFaultVo vo);
+
+    /**
+     * 新增设备损坏记录
+     * @param vo
+     * @return
+     */
+    AjaxResult addFaultData(SjNewFaultVo vo);
+
+    /**
+     * 修改设备损坏记录
+     * @param vo
+     * @return
+     */
+    AjaxResult updateFaultData(SjNewFaultVo vo);
+
+    /**
+     * 删除设备损坏记录
+     * @param vo
+     * @return
+     */
+    AjaxResult delFaultData(SjNewFaultVo vo);
 }
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjNewProProgressServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjNewProProgressServiceImpl.java
@ -0,0 +1,145 @@
+package com.securitycontrol.background.service.impl;
+
+import com.securitycontrol.background.mapper.SjNewProProgressMapper;
+import com.securitycontrol.background.service.SjNewProProgressService;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.vo.SjNewProProgressRealVo;
+import com.securitycontrol.entity.background.vo.SjNewProProgressVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+@Slf4j
+public class SjNewProProgressServiceImpl implements SjNewProProgressService {
+
+    @Autowired
+    private SjNewProProgressMapper mapper;
+
+    @Override
+    public List<SjNewProProgressVo> getList(SjNewProProgressVo vo) {
+        try{
+            return mapper.getList(vo);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<SjNewProProgressRealVo> getRealList(SjNewProProgressRealVo vo) {
+        try{
+            return mapper.getRealList(vo);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * 添加施工进度数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult addData(SjNewProProgressVo vo) {
+        try{
+            Integer num= mapper.addData(vo);
+            if(num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("数据添加失败");
+    }
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult updateData(SjNewProProgressVo vo) {
+        try{
+            Integer num= mapper.updateData(vo);
+            if(num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult deleteData(SjNewProProgressVo vo) {
+        try{
+            Integer num= mapper.deleteData(vo);
+            if(num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+
+    @Override
+    public AjaxResult addRealData(SjNewProProgressRealVo vo) {
+        try{
+            Integer num= mapper.addRealData(vo);
+            if(num>0){
+                mapper.updateDataProgress(vo);
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("数据添加失败");
+    }
+
+    /**
+     *
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult updateRealData(SjNewProProgressRealVo vo) {
+        try{
+            Integer num= mapper.updateRealData(vo);
+            if(num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    /**
+     * 删除关联数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult deleteRealData(SjNewProProgressRealVo vo) {
+        try{
+            Integer num= mapper.deleteRealData(vo);
+            if(num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjNewWorkerServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjNewWorkerServiceImpl.java
@ -0,0 +1,144 @@
+package com.securitycontrol.background.service.impl;
+
+import com.securitycontrol.background.mapper.SjNewWorkerMapper;
+import com.securitycontrol.background.service.SjNewWorkerService;
+import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.entity.background.vo.SjNewWorkerAnalysicVo;
+import com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+public class SjNewWorkerServiceImpl implements SjNewWorkerService {
+
+    @Autowired
+    private SjNewWorkerMapper mapper;
+
+    @Override
+    public List<SjNewWorkerAnalysicVo> getList(SjNewWorkerAnalysicVo vo) {
+        try{
+             return mapper.getList(vo);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<SjNewWorkerWarnVo> getWarnList(SjNewWorkerWarnVo vo) {
+        try{
+            return mapper.getWarnList(vo);
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * 新增数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult addData(SjNewWorkerAnalysicVo vo) {
+        try{
+            Integer num= mapper.addData(vo);
+            if(num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("数据添加失败");
+    }
+
+    /**
+     * 修改数据接口
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult updateData(SjNewWorkerAnalysicVo vo) {
+        try{
+            Integer num= mapper.updateData(vo);
+            if(num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    /**
+     * 删除数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult deleteData(SjNewWorkerAnalysicVo vo) {
+        try{
+            Integer num= mapper.deleteData(vo);
+            if(num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+
+    /**
+     * 新增预警细腻系
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult addWarnData(SjNewWorkerWarnVo vo) {
+        try{
+            Integer num= mapper.addWarnData(vo);
+            if(num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+
+    /**
+     * 修改数据
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult updateWarnData(SjNewWorkerWarnVo vo) {
+        try{
+            Integer num= mapper.updateWarnData(vo);
+            if(num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    @Override
+    public AjaxResult delWarnData(SjNewWorkerWarnVo vo) {
+        try{
+            Integer num= mapper.delWarnData(vo);
+            if(num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.toString(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+}
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjWorkTeamServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/SjWorkTeamServiceImpl.java
@ -5,10 +5,7 @@ import com.securitycontrol.background.mapper.SjWorkTeamMapper;
 import com.securitycontrol.background.service.SjWorkTeamService;
 import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
-import com.securitycontrol.entity.background.vo.SjEfficiencyVo;
-import com.securitycontrol.entity.background.vo.SjMaxDeviceVo;
-import com.securitycontrol.entity.background.vo.SjTeamPeopleVo;
-import com.securitycontrol.entity.background.vo.SjWorkTeamVo;
+import com.securitycontrol.entity.background.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
@ -270,4 +267,190 @@ public class SjWorkTeamServiceImpl implements SjWorkTeamService {
        }
        return Collections.emptyList();
    }
+
+    /**
+     * 设备使用记录查询
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<SjNewDevUsedVo> getDevUsedList(SjNewDevUsedVo dto) {
+        try{
+            return  mapper.getDevUsedList(dto);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public AjaxResult getDevList(SjNewDevUsedVo dto) {
+        try{
+            List<SjMaxDeviceVo>  list= mapper.getDevList(dto);
+            return AjaxResult.success(list);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.success(Collections.emptyList());
+    }
+
+    /**
+     * 班组下拉选集合
+     * @param dto
+     * @return
+     */
+    @Override
+    public AjaxResult getTeamList(SjNewDevUsedVo dto) {
+        try{
+            List<SjWorkTeamVo>  list= mapper.getTeamList(dto);
+            return AjaxResult.success(list);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.success(Collections.emptyList());
+    }
+
+    /**
+     * 新增设备使用记录
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult addDevUsedData(SjNewDevUsedVo vo) {
+        try{
+            Integer num= mapper.addDevUsedData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("新增失败,数据长度过长");
+    }
+
+    /**
+     * 删除设备使用记录
+     * @param vo
+     * @return
+     */
+    @Override
+    public AjaxResult delDevUsedData(SjNewDevUsedVo vo) {
+        try{
+            Integer num= mapper.delDevUsedData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+
+    /**
+     * 新增分析告警
+     * @param vo
+     * @return
+     */
+    @Override
+    public List<SjNewZylllWarnVo> getAsyncWarnList(SjNewZylllWarnVo vo) {
+        try{
+            return  mapper.getAsyncWarnList(vo);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public AjaxResult addAsyncWarnList(SjNewZylllWarnVo vo) {
+        try{
+            Integer num= mapper.addAsyncWarnList(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("添加成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("新增失败,数据长度过长");
+    }
+
+    @Override
+    public AjaxResult updateAsyncWarnList(SjNewZylllWarnVo vo) {
+        try{
+            Integer num= mapper.updateAsyncWarnList(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("修改失败,数据长度过长");
+    }
+
+    @Override
+    public AjaxResult delAsyncWarnList(SjNewZylllWarnVo vo) {
+        try{
+            Integer num= mapper.delAsyncWarnList(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
+
+    /**
+     *
+     * @param vo
+     * @return
+     */
+    @Override
+    public List<SjNewFaultVo> getFaultList(SjNewFaultVo vo) {
+        try{
+            return  mapper.getFaultList(vo);
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return Collections.emptyList();
+    }
+
+    @Override
+    public AjaxResult addFaultData(SjNewFaultVo vo) {
+        try{
+            Integer num= mapper.addFaultData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("新增成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("新增失败");
+    }
+
+    @Override
+    public AjaxResult updateFaultData(SjNewFaultVo vo) {
+        try{
+            Integer num= mapper.updateFaultData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("修改成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    @Override
+    public AjaxResult delFaultData(SjNewFaultVo vo) {
+        try{
+            Integer num= mapper.delFaultData(vo);
+            if(num!=null && num>0){
+                return AjaxResult.success("删除成功");
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+        }
+        return AjaxResult.error("删除失败");
+    }
 }
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewProProgressMapper.xml
@ -0,0 +1,78 @@
+<?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.securitycontrol.background.mapper.SjNewProProgressMapper">
+    <insert id="addData">
+        insert into    sj_new_construction_progress(
+                gx_type, gx, plan_start_time, plan_end_time, in_user,
+            in_device,progress, end_time, status, create_time, update_time, remark
+        )values (#{gxType},#{gx},#{planStartTime},#{planEndTime},#{inUser},
+             #{inDevice},#{progress},#{endTime},now(),#{status},now(),#{remark})
+
+    </insert>
+    <insert id="addRealData">
+        insert into sj_new_construction_progress_real(
+            progress_id, in_time,  plan_progress,
+            progress,  analysis,create_time,  update_time, remark
+        )values (#{progressId},#{inTime},#{planProgress},#{progress},#{analysis},now(),now(),#{remark})
+    </insert>
+    <update id="updateData">
+        update sj_new_construction_progress set
+            gx_type=#{gxType}, gx=#{gx},plan_start_time=#{planStartTime}   ,in_user=#{inUser}  ,
+            in_device=#{inDevice},progress=#{progress}, end_time=#{endTime}, status=#{status},
+             update_time=now(), remark=#{remark}
+        where id=#{id}
+    </update>
+    <update id="updateDataProgress">
+        update  sj_new_construction_progress set progress=#{progress} where id=#{progressId}
+    </update>
+    <update id="updateRealData">
+        update  sj_new_construction_progress_real  set
+                  in_time=#{inTime},  plan_progress=#{planProgress},
+                   progress=#{progress},  analysis=#{analysis},  update_time=now(), remark=#{remark}
+        where id=#{id}
+    </update>
+    <delete id="deleteData">
+        delete  from sj_new_construction_progress where id=#{id}
+    </delete>
+    <delete id="deleteRealData">
+        delete from  sj_new_construction_progress_real where id=#{id}
+    </delete>
+    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjNewProProgressVo">
+        select id, gx_type gxType, gx gx,
+            plan_start_time planStartTime,
+            plan_end_time planEndTime,
+            in_user inUser,
+            in_device inDevice,
+            progress progress,
+            end_time endTime,
+            status status,
+            create_time createTime,
+            update_time updateTime,
+            remark remark
+        from sj_new_construction_progress
+        <where>
+            <if test="gxType!=null and gxType!=''">
+                and gx_type like concat('%',#{gxType},'%')
+            </if>
+            <if test="gx!=null and gx!=''">
+                and gx like concat('%',#{gx},'%')
+            </if>
+        </where>
+    </select>
+    <select id="getRealList" resultType="com.securitycontrol.entity.background.vo.SjNewProProgressRealVo">
+        select id,
+                   progress_id progressId,
+            in_time inTime,
+            plan_progress planProgress,
+            progress progress,
+            analysis analysis,
+            create_time createTime,
+            update_time updateTime,
+            remark
+    from sj_new_construction_progress_real
+     where progress_id=#{progressId}
+        <if test="startTime!=null and startTime!='' and endTime!=null and endTime!=''">
+            and  in_time between #{startTime} and #{endTime}
+        </if>
+    </select>
+</mapper>
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjNewWorkerMapper.xml
@ -0,0 +1,65 @@
+<?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.securitycontrol.background.mapper.SjNewWorkerMapper">
+    <!--新增效益数据-->
+    <insert id="addData">
+        insert into sj_new_worker_analysic(
+            user_name, team_id, team_name, work_content,
+        task_status, plan_start_time, plan_end_time, end_time, is_yq,
+        ya_day, remark, create_time, update_time
+        )values (#{userName},#{teamId},#{teamName},#{workContent},#{taskStatus},#{planStartTime},#{planEndTime},#{endTime},#{isYq}
+            #{yaDay},#{remark},now(),now()
+                        )
+    </insert>
+    <insert id="addWarnData">
+        insert into sj_new_worker_warn(
+                tx_time, tx_type, content,
+        data_type, remark, create_time, measure_data,file_path
+        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),#{measureData},#{filePath})
+    </insert>
+    <update id="updateData">
+        update sj_new_worker_analysic set
+                  user_name=#{userName}, team_id=#{teamId}, team_name=#{teamName}, work_content=#{workContent},
+                  task_status=#{taskStatus}, plan_start_time=#{planStartTime}, plan_end_time=#{planEndTime},
+                  end_time=#{endTime}, is_yq=#{isYq},
+                  ya_day=#{yaDay}, remark=#{remark}, update_time=now()
+        where id=#{id}
+    </update>
+    <update id="updateWarnData">
+        update sj_new_worker_warn set
+              tx_time=#{txTime}, tx_type=#{txType}, content=#{content},
+              data_type=#{dataType}, remark=#{remark}
+        where id=#{id}
+    </update>
+    <delete id="deleteData">
+        delete from sj_new_worker_analysic where id=#{id}
+    </delete>
+    <delete id="delWarnData">
+        delete from sj_new_worker_warn where id=#{id}
+    </delete>
+    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjNewWorkerAnalysicVo">
+        select id,user_name userName,  team_id teamId, team_name teamName, work_content workContent, task_status taskStatus,
+            plan_start_time planStartTime,  plan_end_time planEndTime,  end_time endTime,  is_yq isYq,
+            ya_day yaDay,  remark, create_time createTime,  update_time updateTime
+        from sj_new_worker_analysic
+        <where >
+            <if test="userName!=null and userName!=''">
+                and user_name like concat('%',#{userName},'%')
+            </if>
+            <if test="isYq!=null and isYq!=''">
+                and is_yq=#{isYq}
+            </if>
+        </where>
+    </select>
+    <select id="getWarnList" resultType="com.securitycontrol.entity.background.vo.SjNewWorkerWarnVo">
+        select id,   tx_time txTime, tx_type txType,
+            content content,  data_type dataType,remark remark,
+            create_time createTime,   measure_data measureData,  file_path filePath
+        from sj_new_worker_warn
+        <where >
+            <if test="txType!=null and txType!=''">
+                and tx_type like concat('%',#{txType},'%')
+            </if>
+        </where>
+    </select>
+</mapper>
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/SjWorkTeamMapper.xml
@ -25,6 +25,22 @@
            dev_name,in_time,out_time,used_day
        )values (#{devName},#{inTime},#{outTime},#{usedDay})
    </insert>
+    <insert id="addDevUsedData">
+        insert into  sj_new_used_record(
+            dev_name, used_time,  create_time, remark
+        )values (#{devName},#{usedTime},now(),#{devId})
+    </insert>
+    <insert id="addAsyncWarnList">
+        insert into sj_new_zylll_warn(
+                tx_time, tx_type,content,
+        data_type, remark,  create_time, measure_data,file_path
+        )values (#{txTime},#{txType},#{content},#{dataType},#{remark},now(),#{measureData},#{filePath})
+    </insert>
+    <insert id="addFaultData">
+        insert into sj_new_fault_record (
+            dev_name, time, create_time, remark
+        )values (#{devName},#{faultTime},now(),#{devId})
+    </insert>
    <update id="updateData">
        update   sj_work_team  set  work_type=#{workType},team_name=#{teamName},team_leader=#{teamLeader},leader_phone=#{leaderPhone}
         where id=#{id}
@ -40,6 +56,18 @@
                 used_day=#{usedDay}
        where id=#{id}
    </update>
+    <update id="updateAsyncWarnList">
+        update sj_new_zylll_warn set
+            tx_time=#{txTime}, tx_type=#{txType},content=#{content},
+            data_type=#{dataType}, remark=#{remark}
+        where id=#{id}
+    </update>
+    <update id="updateFaultData">
+        update sj_new_fault_record set  dev_name=#{devName},
+            time=#{faultTime},
+            remark=#{devId}
+        where id=#{id}
+    </update>
    <delete id="delete">
        delete  from   sj_work_team where id=#{id}
    </delete>
@ -52,6 +80,15 @@
    <delete id="delMaxDevData">
        delete    from sj_max_device  where id=#{id}
    </delete>
+    <delete id="delDevUsedData">
+        delete from sj_new_used_record where id=#{id}
+    </delete>
+    <delete id="delAsyncWarnList">
+        delete from sj_new_zylll_warn where id=#{id}
+    </delete>
+    <delete id="delFaultData">
+        delete from sj_new_fault_record where id=#{id}
+    </delete>

    <select id="getList" resultType="com.securitycontrol.entity.background.vo.SjWorkTeamVo">
        select team.id,team.work_type workType,team.team_name teamName,team.team_leader teamLeader,team.leader_phone leaderPhone,IFNULL(people.teamNum,0) teamNum,
@ -157,4 +194,40 @@
        from sj_max_device
         where id=#{id}
    </select>
+    <select id="getDevUsedList" resultType="com.securitycontrol.entity.background.vo.SjNewDevUsedVo">
+        select id, dev_name devName, used_time usedTime,create_time createTime,remark
+        from sj_new_used_record
+    </select>
+    <select id="getDevList" resultType="com.securitycontrol.entity.background.vo.SjMaxDeviceVo">
+        select id,dev_name devName
+        from sj_max_device
+    </select>
+    <select id="getTeamList" resultType="com.securitycontrol.entity.background.vo.SjWorkTeamVo">
+            select id,team_name teamName
+            FROM sj_work_team
+    </select>
+    <select id="getAsyncWarnList" resultType="com.securitycontrol.entity.background.vo.SjNewZylllWarnVo">
+        select id, tx_time txTime,  tx_type txType,
+            content content,  data_type dataType,  remark,
+            create_time createTime, measure_data measureData, file_path filePath
+    FROM sj_new_zylll_warn
+       <where>
+        <if test="keyWord!=null and keyWord!=''">
+            and (
+            tx_type like concat('%',#{keyWord},'%') or
+            content like concat('%',#{keyWord},'%')
+            )
+        </if>
+       </where>
+
+    </select>
+    <select id="getFaultList" resultType="com.securitycontrol.entity.background.vo.SjNewFaultVo">
+        select id,  dev_name devName,time faultTime,create_time createTime,remark
+        from sj_new_fault_record
+        <where>
+            <if test="devName!=null and devName!=''">
+                dev_name like concat('%',#{devName},'%')
+            </if>
+        </where>
+    </select>
 </mapper>
Author	SHA1	Message	Date
haozq	a516390989	Merge remote-tracking branch 'origin/main'	2026-01-22 11:23:31 +08:00
haozq	3171896f6f	数据分析模块开发	2026-01-22 11:23:13 +08:00