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("è®¡ç®æåï¼"); } } 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); } } 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; } 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; } 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); } 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); } 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> 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> 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); } 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); } 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; } } 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; } } 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; } 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; }