lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamReportRepairController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,152 @@ package org.jeecg.modules.eam.controller; import java.util.Arrays; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.modules.eam.entity.EamReportRepair; import org.jeecg.modules.eam.request.EamReportRepairQuery; import org.jeecg.modules.eam.service.IEamReportRepairService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** * @Description: æ éæ¥ä¿® * @Author: Lius * @Date: 2025-04-01 */ @Slf4j @Api(tags = "æ éæ¥ä¿®") @RestController @RequestMapping("/eam/eamReportRepair") public class EamReportRepairController extends JeecgController<EamReportRepair, IEamReportRepairService> { @Resource private IEamReportRepairService eamReportRepairService; /** * å页å表æ¥è¯¢ * * @param eamReportRepairQuery * @param pageNo * @param pageSize * @return */ @AutoLog(value = "æ éæ¥ä¿®-å页å表æ¥è¯¢") @ApiOperation(value = "æ éæ¥ä¿®-å页å表æ¥è¯¢", notes = "æ éæ¥ä¿®-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<?> queryPageList(EamReportRepairQuery eamReportRepairQuery, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { Page<EamReportRepair> page = new Page<EamReportRepair>(pageNo, pageSize); IPage<EamReportRepair> pageList = eamReportRepairService.pageList(page, eamReportRepairQuery); return Result.OK(pageList); } /** * æ·»å * * @param eamReportRepair * @return */ @AutoLog(value = "æ éæ¥ä¿®-æ·»å ") @ApiOperation(value = "æ éæ¥ä¿®-æ·»å ", notes = "æ éæ¥ä¿®-æ·»å ") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamReportRepair eamReportRepair) { // eamReportRepair.setReportStatus(); eamReportRepairService.save(eamReportRepair); return Result.OK("æ·»å æåï¼"); } /** * ç¼è¾ * * @param eamReportRepair * @return */ @AutoLog(value = "æ éæ¥ä¿®-ç¼è¾") @ApiOperation(value = "æ éæ¥ä¿®-ç¼è¾", notes = "æ éæ¥ä¿®-ç¼è¾") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamReportRepair eamReportRepair) { eamReportRepairService.updateById(eamReportRepair); 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) { eamReportRepairService.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.eamReportRepairService.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) { EamReportRepair eamReportRepair = eamReportRepairService.getById(id); return Result.OK(eamReportRepair); } /** * 导åºexcel * * @param request * @param eamReportRepair */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, EamReportRepair eamReportRepair) { return super.exportXls(request, eamReportRepair, EamReportRepair.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, EamReportRepair.class); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,102 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @Description: æ éæ¥ä¿® * @Author: Lius * @Date: 2025-04-01 */ @Data @TableName("eam_report_repair") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value = "eam_report_repair对象", description = "æ éæ¥ä¿®") public class EamReportRepair extends JeecgEntity implements Serializable { private static final long serialVersionUID = 3966250456529614720L; /** * å 餿 è®° */ @Excel(name = "å 餿 è®°", width = 15) @ApiModelProperty(value = "å 餿 è®°") @Dict(dicCode = "del_flag") private Integer delFlag; /** * æ éå¼å§æ¶é´ */ @ApiModelProperty(value = "æ éå¼å§æ¶é´") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultStartTime; /** * æ¯å¦åæº */ @Excel(name = "æ¯å¦åæº", width = 15) @ApiModelProperty(value = "æ¯å¦åæº") @Dict(dicCode = "breakdown_flag") private String breakdownFlag; /** * 设å¤ID */ @Excel(name = "设å¤ID", width = 15) @ApiModelProperty(value = "设å¤ID") private String equipmentId; /** * æ éç®ç§° */ @Excel(name = "æ éç®ç§°", width = 15) @ApiModelProperty(value = "æ éç®ç§°") private String faultName; /** * æ éåç±» */ @Excel(name = "æ éåç±»", width = 15) @ApiModelProperty(value = "æ éåç±»") @Dict(dicCode = "fault_reason_category") private String faultType; /** * æ éæè¿° */ @Excel(name = "æ éæè¿°", width = 15) @ApiModelProperty(value = "æ éæè¿°") private String faultDescription; /** * æ¥ä¿®ç¶æ */ @Excel(name = "æ¥ä¿®ç¶æ", width = 15) @ApiModelProperty(value = "æ¥ä¿®ç¶æ") @Dict(dicCode = "report_repair_status") private String reportStatus; /** * ç §çæä»¶ids;id以éå·åé */ @Excel(name = "ç §ç", width = 15) @ApiModelProperty(value = "ç §ç") private String imageFiles; /** * 夿³¨ */ @Excel(name = "夿³¨", width = 15) @ApiModelProperty(value = "夿³¨") private String remark; @TableField(exist = false) @ApiModelProperty(value = "设å¤åç§°") private String equipmentName; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamReportRepairMapper.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package org.jeecg.modules.eam.mapper; 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.eam.entity.EamReportRepair; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.eam.request.EamReportRepairQuery; import java.util.List; /** * @Description: æ éæ¥ä¿® * @Author: Lius * @Date: 2025-04-01 */ public interface EamReportRepairMapper extends BaseMapper<EamReportRepair> { /** * å页å表 * * @param page * @param eamReportRepairQuery * @param equipmentIds * @return */ IPage<EamReportRepair> pageList(Page<EamReportRepair> page, @Param("eamReportRepair") EamReportRepairQuery eamReportRepairQuery, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,48 @@ <?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.EamReportRepairMapper"> <select id="pageList" resultType="org.jeecg.modules.eam.entity.EamReportRepair"> SELECT t1.*, t2.equipment_name FROM eam_report_repair t1 LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.equipment_code <where> <choose> <when test="equipmentIds != null and equipmentIds.size() > 0 "> AND t1.equipment_id IN <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=","> {equipmentId} </foreach> </when> <otherwise> EXISTS ( SELECT 1 FROM mdc_user_production t3 WHERE t3.user_id = #{userId} AND t3.pro_id= t2.org_id ) </otherwise> </choose> <if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''"> AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%') </if> <if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''"> AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%') </if> <if test="eamReportRepair.breakdownFlag != null and eamReportRepair.breakdownFlag != ''"> AND t1.breakdown_flag = #{ eamReportRepair.breakdownFlag } </if> <if test="eamReportRepair.faultType != null and eamReportRepair.faultType != ''"> AND t1.fault_type = #{ eamReportRepair.faultType } </if> <if test="eamReportRepair.reportStatus != null and eamReportRepair.reportStatus != ''"> AND t1.report_status = #{ eamReportRepair.reportStatus } </if> <if test="eamReportRepair.faultName != null and eamReportRepair.faultName != ''"> AND t1.fault_name = #{ eamReportRepair.faultName } </if> <if test="eamReportRepair.startTime != null and eamReportRepair.startTime != '' and eamReportRepair.endTime != null and eamReportRepair.endTime != ''"> AND t1.fault_start_time BETWEEN #{ eamReportRepair.startTime } AND #{ eamReportRepair.endTime } </if> </where> ORDER BY t1.fault_start_time DESC </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,37 @@ package org.jeecg.modules.eam.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.modules.eam.entity.EamReportRepair; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @Author: Lius * @CreateTime: 2025-04-03 * @Description: */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value="请æ±å¯¹è±¡", description="è®¾å¤æ¥ä¿®") public class EamReportRepairQuery extends EamReportRepair implements Serializable { private static final long serialVersionUID = -7111580122226167877L; @ApiModelProperty(value = "å¼å§æ¶é´") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date startTime; @ApiModelProperty(value = "ç»ææ¶é´") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamReportRepairService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package org.jeecg.modules.eam.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.eam.entity.EamReportRepair; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.eam.request.EamReportRepairQuery; /** * @Description: æ éæ¥ä¿® * @Author: Lius * @Date: 2025-04-01 */ public interface IEamReportRepairService extends IService<EamReportRepair> { /** * å页å表 * @param page * @param eamReportRepairQuery * @return */ IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,49 @@ package org.jeecg.modules.eam.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.eam.entity.EamReportRepair; import org.jeecg.modules.eam.mapper.EamReportRepairMapper; import org.jeecg.modules.eam.request.EamReportRepairQuery; import org.jeecg.modules.eam.service.IEamReportRepairService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.ArrayList; import java.util.Arrays; import java.util.List; /** * @Description: æ éæ¥ä¿® * @Author: Lius * @Date: 2025-04-01 */ @Service public class EamReportRepairServiceImpl extends ServiceImpl<EamReportRepairMapper, EamReportRepair> implements IEamReportRepairService { /** * å页å表 * * @param page * @param eamReportRepairQuery * @return */ @Override public IPage<EamReportRepair> pageList(Page<EamReportRepair> page, EamReportRepairQuery eamReportRepairQuery) { //ç¨æ·æ°æ®æé LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { return page; } List<String> equipmentIds = new ArrayList<>(); if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) { //éæ©äºè®¾å¤ï¼æ ¹æ®è®¾å¤idè¿æ»¤è®¾å¤ equipmentIds = Arrays.asList(sysUser.getEquipmentIds().split(",")); } return this.baseMapper.pageList(page, eamReportRepairQuery, sysUser.getId(), equipmentIds); } }