From 1a075513907e055a4a5e0affe1f2a2832734de7e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 22 一月 2025 14:03:23 +0800
Subject: [PATCH] 故障停机和维修时长维护功能
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcRepairInfoMapper.xml | 30 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java | 96 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java | 47 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java | 176 ++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.xml | 30 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java | 47 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java | 37 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java | 20 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java | 163 +++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java | 26 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java | 36 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java | 86 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.java | 25 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcRepairInfoVo.java | 20 +
14 files changed, 839 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
new file mode 100644
index 0000000..957c33a
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcDownTimeController.java
@@ -0,0 +1,176 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+import org.jeecg.modules.mdc.service.IMdcDownTimeService;
+import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 璁惧鏁呴殰鍋滄満鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Slf4j
+@Api(tags = "璁惧鏁呴殰鍋滄満鏃堕暱琛�")
+@RestController
+@RequestMapping("/mdc/mdcDownTime")
+public class MdcDownTimeController extends JeecgController<MdcDownTime, IMdcDownTimeService> {
+
+ @Resource
+ private IMdcDownTimeService mdcDownTimeService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcDownTimeVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcDownTimeVo mdcDownTimeVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcDownTime> page = new Page<MdcDownTime>(pageNo, pageSize);
+ IPage<MdcDownTime> pageList = mdcDownTimeService.pageList(userId, page, mdcDownTimeVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcDownTimeVo
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-娣诲姞")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-娣诲姞", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcDownTimeVo mdcDownTimeVo) {
+ if (StringUtils.isBlank(mdcDownTimeVo.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcDownTimeService.addDownTime(mdcDownTimeVo);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcDownTime
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-缂栬緫")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-缂栬緫", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcDownTime mdcDownTime) {
+ mdcDownTimeService.updateById(mdcDownTime);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鍒犻櫎", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcDownTimeService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鎵归噺鍒犻櫎", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcDownTimeService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鏌ヨ", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcDownTime mdcDownTime = mdcDownTimeService.getById(id);
+ return Result.OK(mdcDownTime);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcDownTime
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcDownTime mdcDownTime) {
+ return super.exportXls(request, mdcDownTime, MdcDownTime.class, "璁惧鏁呴殰鍋滄満鏃堕暱琛�");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcDownTime.class);
+ }
+
+ /**
+ * 璁＄畻MTBF
+ *
+ * @return
+ */
+ @AutoLog(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-璁＄畻MTBF")
+ @ApiOperation(value = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-璁＄畻MTBF", notes = "璁惧鏁呴殰鍋滄満鏃堕暱琛�-璁＄畻MTBF")
+ @PostMapping(value = "/computeMtbf")
+ public Result<?> computeMtbf() {
+
+ return Result.OK("璁＄畻鎴愬姛锛�");
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
new file mode 100644
index 0000000..adc1ca4
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcRepairInfoController.java
@@ -0,0 +1,163 @@
+package org.jeecg.modules.mdc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.mdc.entity.MdcRepairInfo;
+import org.jeecg.modules.mdc.service.IMdcRepairInfoService;
+import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 璁惧缁翠慨鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Slf4j
+@Api(tags = "璁惧缁翠慨鏃堕暱琛�")
+@RestController
+@RequestMapping("/mdc/mdcRepairInfo")
+public class MdcRepairInfoController extends JeecgController<MdcRepairInfo, IMdcRepairInfoService> {
+
+ @Resource
+ private IMdcRepairInfoService mdcRepairInfoService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mdcRepairInfoVo
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁惧缁翠慨鏃堕暱琛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(MdcRepairInfoVo mdcRepairInfoVo,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ Page<MdcRepairInfo> page = new Page<MdcRepairInfo>(pageNo, pageSize);
+ IPage<MdcRepairInfo> pageList = mdcRepairInfoService.pageList(userId, page, mdcRepairInfoVo, req);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-娣诲姞")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-娣诲姞", notes = "璁惧缁翠慨鏃堕暱琛�-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody MdcRepairInfoVo mdcRepairInfoVo) {
+ if (StringUtils.isBlank(mdcRepairInfoVo.getEquipmentIds())) {
+ return Result.error("鏈�夋嫨璁惧锛岃鎺掓煡锛�");
+ }
+ boolean result = mdcRepairInfoService.addRepair(mdcRepairInfoVo);
+ if (!result) {
+ return Result.error("娣诲姞澶辫触锛�");
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param mdcRepairInfo
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-缂栬緫")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-缂栬緫", notes = "璁惧缁翠慨鏃堕暱琛�-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody MdcRepairInfo mdcRepairInfo) {
+ mdcRepairInfoService.updateById(mdcRepairInfo);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鍒犻櫎", notes = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ mdcRepairInfoService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-鎵归噺鍒犻櫎", notes = "璁惧缁翠慨鏃堕暱琛�-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.mdcRepairInfoService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鏌ヨ", notes = "璁惧缁翠慨鏃堕暱琛�-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ MdcRepairInfo mdcRepairInfo = mdcRepairInfoService.getById(id);
+ return Result.OK(mdcRepairInfo);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param mdcRepairInfo
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, MdcRepairInfo mdcRepairInfo) {
+ return super.exportXls(request, mdcRepairInfo, MdcRepairInfo.class, "璁惧缁翠慨鏃堕暱琛�");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, MdcRepairInfo.class);
+ }
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java
new file mode 100644
index 0000000..907be2f
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDownTime.java
@@ -0,0 +1,47 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 璁惧鏁呴殰鍋滄満鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Data
+@TableName("mdc_down_time")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_down_time瀵硅薄", description = "璁惧鏁呴殰鍋滄満鏃堕暱琛�")
+public class MdcDownTime extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -3997182721419590527L;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private String equipmentId;
+ /**
+ * 鏃ユ湡
+ */
+ @Excel(name = "鏃ユ湡", width = 15)
+ @ApiModelProperty(value = "鏃ユ湡")
+ private String theDate;
+ /**
+ * 鏁呴殰鍋滄満鏃堕暱(min)
+ */
+ @Excel(name = "鏁呴殰鍋滄満鏃堕暱(min)", width = 15)
+ @ApiModelProperty(value = "鏁呴殰鍋滄満鏃堕暱(min)")
+ private Integer downLong;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java
new file mode 100644
index 0000000..29b6a52
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcRepairInfo.java
@@ -0,0 +1,47 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 璁惧缁翠慨鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Data
+@TableName("mdc_repair_info")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_repair_info瀵硅薄", description = "璁惧缁翠慨鏃堕暱琛�")
+public class MdcRepairInfo extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -3713968527082564762L;
+
+ /**
+ * 璁惧缂栧彿
+ */
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private java.lang.String equipmentId;
+ /**
+ * 鏃ユ湡
+ */
+ @Excel(name = "鏃ユ湡", width = 15)
+ @ApiModelProperty(value = "鏃ユ湡")
+ private java.lang.String theDate;
+ /**
+ * 缁翠慨鏃堕暱(min)
+ */
+ @Excel(name = "缁翠慨鏃堕暱(min)", width = 15)
+ @ApiModelProperty(value = "缁翠慨鏃堕暱(min)")
+ private java.lang.Integer repairLong;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java
new file mode 100644
index 0000000..fedf22d
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDownTimeMapper.java
@@ -0,0 +1,26 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+
+/**
+ * @Description: 璁惧鏁呴殰鍋滄満鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+public interface MdcDownTimeMapper extends BaseMapper<MdcDownTime> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param page
+ * @param mdcDownTimeVo
+ * @return
+ */
+ IPage<MdcDownTime> pageList(Page<MdcDownTime> page, @Param("mdcDownTimeVo") MdcDownTimeVo mdcDownTimeVo);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.java
new file mode 100644
index 0000000..5ec663f
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcRepairInfoMapper.java
@@ -0,0 +1,25 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.mdc.entity.MdcRepairInfo;
+import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+
+/**
+ * @Description: 璁惧缁翠慨鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+public interface MdcRepairInfoMapper extends BaseMapper<MdcRepairInfo> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param page
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ IPage<MdcRepairInfo> pageList(Page<MdcRepairInfo> page, @Param("mdcRepairInfoVo") MdcRepairInfoVo mdcRepairInfoVo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.xml
new file mode 100644
index 0000000..aa4344b
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDownTimeMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcDownTimeMapper">
+
+ <!--鍒嗛〉鍒楄〃-->
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcDownTime">
+ SELECT
+ *
+ FROM
+ mdc_down_time
+ <where>
+ <if test="mdcDownTimeVo.equipmentId != null and mdcDownTimeVo.equipmentId != ''">
+ AND equipment_id = #{ mdcDownTimeVo.equipmentId }
+ </if>
+ <if test="mdcDownTimeVo.startTime != null and mdcDownTimeVo.startTime != ''">
+ AND the_date >= #{ mdcDownTimeVo.startTime }
+ </if>
+ <if test="mdcDownTimeVo.endTime != null and mdcDownTimeVo.endTime != ''">
+ AND the_date <= #{mdcDownTimeVo.endTime }
+ </if>
+ <if test="mdcDownTimeVo.equipmentIdList != null and mdcDownTimeVo.equipmentIdList.size() > 0 ">
+ AND equipment_id IN
+ <foreach collection="mdcDownTimeVo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ </where>
+ ORDER BY the_date DESC, equipment_id ASC
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcRepairInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcRepairInfoMapper.xml
new file mode 100644
index 0000000..8531fc7
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcRepairInfoMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcRepairInfoMapper">
+
+ <!--鍒嗛〉鍒楄〃-->
+ <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcRepairInfo">
+ SELECT
+ *
+ FROM
+ mdc_repair_info
+ <where>
+ <if test="mdcRepairInfoVo.equipmentId != null and mdcRepairInfoVo.equipmentId != ''">
+ AND equipment_id = #{ mdcRepairInfoVo.equipmentId }
+ </if>
+ <if test="mdcRepairInfoVo.startTime != null and mdcRepairInfoVo.startTime != ''">
+ AND the_date >= #{ mdcRepairInfoVo.startTime }
+ </if>
+ <if test="mdcRepairInfoVo.endTime != null and mdcRepairInfoVo.endTime != ''">
+ AND the_date <= #{mdcRepairInfoVo.endTime }
+ </if>
+ <if test="mdcRepairInfoVo.equipmentIdList != null and mdcRepairInfoVo.equipmentIdList.size() > 0 ">
+ AND equipment_id IN
+ <foreach collection="mdcRepairInfoVo.equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
+ #{ id }
+ </foreach>
+ </if>
+ </where>
+ ORDER BY the_date DESC, equipment_id ASC
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java
new file mode 100644
index 0000000..151eaf8
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcDownTimeService.java
@@ -0,0 +1,36 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 璁惧鏁呴殰鍋滄満鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+public interface IMdcDownTimeService extends IService<MdcDownTime> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param userId
+ * @param page
+ * @param mdcDownTimeVo
+ * @param req
+ * @return
+ */
+ IPage<MdcDownTime> pageList(String userId, Page<MdcDownTime> page, MdcDownTimeVo mdcDownTimeVo, HttpServletRequest req);
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcDownTimeVo
+ * @return
+ */
+ boolean addDownTime(MdcDownTimeVo mdcDownTimeVo);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
new file mode 100644
index 0000000..40baab0
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcRepairInfoService.java
@@ -0,0 +1,37 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcRepairInfo;
+import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 璁惧缁翠慨鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+public interface IMdcRepairInfoService extends IService<MdcRepairInfo> {
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param mdcRepairInfoVo
+ * @param req
+ * @return
+ */
+ IPage<MdcRepairInfo> pageList(String userId, Page<MdcRepairInfo> page, MdcRepairInfoVo mdcRepairInfoVo, HttpServletRequest req);
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo);
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
new file mode 100644
index 0000000..9c05682
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDownTimeServiceImpl.java
@@ -0,0 +1,86 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+import org.jeecg.modules.mdc.mapper.MdcDownTimeMapper;
+import org.jeecg.modules.mdc.service.IMdcDownTimeService;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.vo.MdcDownTimeVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 璁惧鏁呴殰鍋滄満鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Service
+public class MdcDownTimeServiceImpl extends ServiceImpl<MdcDownTimeMapper, MdcDownTime> implements IMdcDownTimeService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ @Override
+ public IPage<MdcDownTime> pageList(String userId, Page<MdcDownTime> page, MdcDownTimeVo mdcDownTimeVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcDownTimeVo.getParentId()) && StringUtils.isEmpty(mdcDownTimeVo.getEquipmentId())) {
+ if ("2".equals(mdcDownTimeVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDownTimeVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDownTimeVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcDownTimeVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcDownTimeVo.setEquipmentIdList(Collections.singletonList(mdcDownTimeVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcDownTimeVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
+ mdcDownTimeVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcDownTimeVo.getEquipmentIdList() == null || mdcDownTimeVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcDownTimeVo);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcDownTimeVo
+ * @return
+ */
+ @Override
+ public boolean addDownTime(MdcDownTimeVo mdcDownTimeVo) {
+ String[] equipmentIdList = mdcDownTimeVo.getEquipmentIds().split(",");
+ List<MdcDownTime> downTimeList = new ArrayList<>();
+ for (String equipmentId : equipmentIdList) {
+ MdcDownTime mdcDownTime = new MdcDownTime();
+ BeanUtils.copyProperties(mdcDownTimeVo, mdcDownTime);
+ mdcDownTime.setEquipmentId(equipmentId);
+ downTimeList.add(mdcDownTime);
+ }
+ this.saveBatch(downTimeList);
+ return true;
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
new file mode 100644
index 0000000..3acd269
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcRepairInfoServiceImpl.java
@@ -0,0 +1,96 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+import org.jeecg.modules.mdc.entity.MdcRepairInfo;
+import org.jeecg.modules.mdc.mapper.MdcRepairInfoMapper;
+import org.jeecg.modules.mdc.service.IMdcEquipmentService;
+import org.jeecg.modules.mdc.service.IMdcRepairInfoService;
+import org.jeecg.modules.mdc.vo.MdcRepairInfoVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @Description: 璁惧缁翠慨鏃堕暱琛�
+ * @Author: Lius
+ * @Date: 2025-01-22
+ */
+@Service
+public class MdcRepairInfoServiceImpl extends ServiceImpl<MdcRepairInfoMapper, MdcRepairInfo> implements IMdcRepairInfoService {
+
+ @Resource
+ private IMdcEquipmentService mdcEquipmentService;
+
+ /**
+ * 鍒嗛〉鍒楄〃
+ *
+ * @param userId
+ * @param page
+ * @param mdcRepairInfoVo
+ * @param req
+ * @return
+ */
+ @Override
+ public IPage<MdcRepairInfo> pageList(String userId, Page<MdcRepairInfo> page, MdcRepairInfoVo mdcRepairInfoVo, HttpServletRequest req) {
+ List<String> equipmentIds = new ArrayList<>();
+ if (StringUtils.isNotEmpty(mdcRepairInfoVo.getParentId()) && StringUtils.isEmpty(mdcRepairInfoVo.getEquipmentId())) {
+ if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcRepairInfoVo.getParentId());
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcRepairInfoVo.getParentId());
+ }
+ } else if (StringUtils.isNotEmpty(mdcRepairInfoVo.getEquipmentId())) {
+ //鍗曞彴璁惧淇℃伅
+ mdcRepairInfoVo.setEquipmentIdList(Collections.singletonList(mdcRepairInfoVo.getEquipmentId()));
+ } else {
+ //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ if ("2".equals(mdcRepairInfoVo.getTypeTree())) {
+ //閮ㄩ棬灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
+ } else {
+ //浜х嚎灞傜骇
+ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
+ }
+ }
+
+ if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
+ mdcRepairInfoVo.setEquipmentIdList(equipmentIds);
+ }
+
+ if (mdcRepairInfoVo.getEquipmentIdList() == null || mdcRepairInfoVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+ return this.baseMapper.pageList(page, mdcRepairInfoVo);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param mdcRepairInfoVo
+ * @return
+ */
+ @Override
+ public boolean addRepair(MdcRepairInfoVo mdcRepairInfoVo) {
+ String[] equipmentIdList = mdcRepairInfoVo.getEquipmentIds().split(",");
+ List<MdcRepairInfo> repairInfoList = new ArrayList<>();
+ for (String equipmentId : equipmentIdList) {
+ MdcRepairInfo mdcRepairInfo = new MdcRepairInfo();
+ BeanUtils.copyProperties(mdcRepairInfoVo, mdcRepairInfo);
+ mdcRepairInfo.setEquipmentId(equipmentId);
+ repairInfoList.add(mdcRepairInfo);
+ }
+ this.saveBatch(repairInfoList);
+ return true;
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java
new file mode 100644
index 0000000..48ca67d
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcDownTimeVo.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcDownTime;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2025/1/22 10:00
+ */
+@Data
+public class MdcDownTimeVo extends MdcDownTime {
+ private String startTime;
+ private String endTime;
+ private String parentId;
+ private String typeTree;
+ private List<String> equipmentIdList;
+ private String equipmentIds;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcRepairInfoVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcRepairInfoVo.java
new file mode 100644
index 0000000..a3d6714
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/MdcRepairInfoVo.java
@@ -0,0 +1,20 @@
+package org.jeecg.modules.mdc.vo;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcRepairInfo;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2025/1/22 10:14
+ */
+@Data
+public class MdcRepairInfoVo extends MdcRepairInfo {
+ private String startTime;
+ private String endTime;
+ private String parentId;
+ private String typeTree;
+ private List<String> equipmentIdList;
+ private String equipmentIds;
+}
--
Gitblit v1.9.3