From 0e3e7f43c38cf2627750329b288d93921218786d Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期三, 30 八月 2023 18:46:44 +0800 Subject: [PATCH] 生产故障间隔时间报表功能,积木报表完成 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java | 99 ++++++++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java | 14 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java | 18 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java | 161 ++++++++++++++++++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java | 14 ++ 6 files changed, 311 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java new file mode 100644 index 0000000..58abbaf --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/FaultIntervalTimeController.java @@ -0,0 +1,161 @@ +package org.jeecg.modules.eam.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.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.modules.eam.entity.FaultIntervalTime; +import org.jeecg.modules.eam.service.IFaultIntervalTimeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: mom_eam_fault_interval_time + * @Author: jeecg-boot + * @Date: 2023-08-30 + * @Version: V1.0 + */ +@Api(tags="mom_eam_fault_interval_time") +@RestController +@RequestMapping("/eam/faultIntervalTime") +@Slf4j +public class FaultIntervalTimeController extends JeecgController<FaultIntervalTime, IFaultIntervalTimeService> { + @Autowired + private IFaultIntervalTimeService faultIntervalTimeService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param faultIntervalTime + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "mom_eam_fault_interval_time-鍒嗛〉鍒楄〃鏌ヨ") + @ApiOperation(value="mom_eam_fault_interval_time-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_fault_interval_time-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<IPage<FaultIntervalTime>> queryPageList(FaultIntervalTime faultIntervalTime, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<FaultIntervalTime> queryWrapper = QueryGenerator.initQueryWrapper(faultIntervalTime, req.getParameterMap()); + Page<FaultIntervalTime> page = new Page<FaultIntervalTime>(pageNo, pageSize); + IPage<FaultIntervalTime> pageList = faultIntervalTimeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param faultIntervalTime + * @return + */ + @AutoLog(value = "mom_eam_fault_interval_time-娣诲姞") + @ApiOperation(value="mom_eam_fault_interval_time-娣诲姞", notes="mom_eam_fault_interval_time-娣诲姞") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_fault_interval_time:add") + @PostMapping(value = "/add") + public Result<String> add(@RequestBody FaultIntervalTime faultIntervalTime) { + faultIntervalTimeService.save(faultIntervalTime); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param faultIntervalTime + * @return + */ + @AutoLog(value = "mom_eam_fault_interval_time-缂栬緫") + @ApiOperation(value="mom_eam_fault_interval_time-缂栬緫", notes="mom_eam_fault_interval_time-缂栬緫") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_fault_interval_time:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<String> edit(@RequestBody FaultIntervalTime faultIntervalTime) { + faultIntervalTimeService.updateById(faultIntervalTime); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "mom_eam_fault_interval_time-閫氳繃id鍒犻櫎") + @ApiOperation(value="mom_eam_fault_interval_time-閫氳繃id鍒犻櫎", notes="mom_eam_fault_interval_time-閫氳繃id鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_fault_interval_time:delete") + @DeleteMapping(value = "/delete") + public Result<String> delete(@RequestParam(name="id",required=true) String id) { + faultIntervalTimeService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "mom_eam_fault_interval_time-鎵归噺鍒犻櫎") + @ApiOperation(value="mom_eam_fault_interval_time-鎵归噺鍒犻櫎", notes="mom_eam_fault_interval_time-鎵归噺鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_fault_interval_time:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.faultIntervalTimeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛!"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + //@AutoLog(value = "mom_eam_fault_interval_time-閫氳繃id鏌ヨ") + @ApiOperation(value="mom_eam_fault_interval_time-閫氳繃id鏌ヨ", notes="mom_eam_fault_interval_time-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<FaultIntervalTime> queryById(@RequestParam(name="id",required=true) String id) { + FaultIntervalTime faultIntervalTime = faultIntervalTimeService.getById(id); + if(faultIntervalTime==null) { + return Result.error("鏈壘鍒板搴旀暟鎹�"); + } + return Result.OK(faultIntervalTime); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param faultIntervalTime + */ + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_fault_interval_time:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, FaultIntervalTime faultIntervalTime) { + return super.exportXls(request, faultIntervalTime, FaultIntervalTime.class, "mom_eam_fault_interval_time"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + //@RequiresPermissions("mom_eam_fault_interval_time:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, FaultIntervalTime.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java new file mode 100644 index 0000000..f219d33 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/FaultIntervalTime.java @@ -0,0 +1,99 @@ +package org.jeecg.modules.eam.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: mom_eam_fault_interval_time + * @Author: jeecg-boot + * @Date: 2023-08-30 + * @Version: V1.0 + */ +@Data +@TableName("mom_eam_fault_interval_time") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="mom_eam_fault_interval_time瀵硅薄", description="mom_eam_fault_interval_time") +public class FaultIntervalTime implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**equipmentId*/ + @Excel(name = "equipmentId", width = 15) + @ApiModelProperty(value = "equipmentId") + private String equipmentId; + /**monthValue*/ + @Excel(name = "monthValue", width = 15) + @ApiModelProperty(value = "monthValue") + private String monthValue; + /**yearValue*/ + @Excel(name = "yearValue", width = 15) + @ApiModelProperty(value = "yearValue") + private String yearValue; + /**yearMonth*/ + @Excel(name = "yearMonth", width = 15) + @ApiModelProperty(value = "yearMonth") + private String yearMonth; + /**totalAvailableTime*/ + @Excel(name = "totalAvailableTime", width = 15) + @ApiModelProperty(value = "totalAvailableTime") + private String totalAvailableTime; + /**noFaultTime*/ + @Excel(name = "noFaultTime", width = 15) + @ApiModelProperty(value = "noFaultTime") + private String noFaultTime; + /**faultTime*/ + @Excel(name = "faultTime", width = 15) + @ApiModelProperty(value = "faultTime") + private String faultTime; + /**repairTime*/ + @Excel(name = "repairTime", width = 15) + @ApiModelProperty(value = "repairTime") + private String repairTime; + /**faultNumber*/ + @Excel(name = "faultNumber", width = 15) + @ApiModelProperty(value = "faultNumber") + private String faultNumber; + /**averageRepairTime*/ + @Excel(name = "averageRepairTime", width = 15) + @ApiModelProperty(value = "averageRepairTime") + private String averageRepairTime; + /**averageFaultIntervalTime*/ + @Excel(name = "averageFaultIntervalTime", width = 15) + @ApiModelProperty(value = "averageFaultIntervalTime") + private String averageFaultIntervalTime; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "createTime") + private Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private Date updateTime; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java new file mode 100644 index 0000000..1d7d6d6 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/FaultIntervalTimeMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.eam.entity.FaultIntervalTime; + +/** + * @Description: mom_eam_fault_interval_time + * @Author: jeecg-boot + * @Date: 2023-08-30 + * @Version: V1.0 + */ +public interface FaultIntervalTimeMapper extends BaseMapper<FaultIntervalTime> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml new file mode 100644 index 0000000..6307560 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultIntervalTimeMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.FaultIntervalTimeMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java new file mode 100644 index 0000000..bdb595b --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IFaultIntervalTimeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.eam.entity.FaultIntervalTime; + +/** + * @Description: mom_eam_fault_interval_time + * @Author: jeecg-boot + * @Date: 2023-08-30 + * @Version: V1.0 + */ +public interface IFaultIntervalTimeService extends IService<FaultIntervalTime> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java new file mode 100644 index 0000000..6a9b8ed --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/FaultIntervalTimeServiceImpl.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.eam.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.eam.entity.FaultIntervalTime; +import org.jeecg.modules.eam.mapper.FaultIntervalTimeMapper; +import org.jeecg.modules.eam.service.IFaultIntervalTimeService; +import org.springframework.stereotype.Service; + +/** + * @Description: mom_eam_fault_interval_time + * @Author: jeecg-boot + * @Date: 2023-08-30 + * @Version: V1.0 + */ +@Service +public class FaultIntervalTimeServiceImpl extends ServiceImpl<FaultIntervalTimeMapper, FaultIntervalTime> implements IFaultIntervalTimeService { + +} -- Gitblit v1.9.3