From ad7474b151b11acf9f09c15a131e871a50fec4d5 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期一, 16 十月 2023 19:04:17 +0800 Subject: [PATCH] 保养计划 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanDetailServiceImpl.java | 33 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanDetailService.java | 33 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java | 32 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java | 14 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java | 74 +++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlanDetail.java | 66 +++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanDetailMapper.xml | 36 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java | 3 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanDetailMapper.java | 43 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java | 44 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 349 ++++++++++++++++++++++++++ 12 files changed, 729 insertions(+), 3 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java new file mode 100644 index 0000000..6f6b6c6 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java @@ -0,0 +1,349 @@ +package org.jeecg.modules.eam.controller; + +import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.query.QueryGenerator; +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.jeecg.common.api.vo.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.springframework.web.servlet.ModelAndView; +import java.util.Arrays; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail; +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; +import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService; +import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanDetailService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + /** + * @Description: 淇濆吇璁″垝 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +@Api(tags="淇濆吇璁″垝") +@RestController +@RequestMapping("/eam/equipmentMaintenancePlan") +@Slf4j +public class EquipmentMaintenancePlanController extends JeecgController<EquipmentMaintenancePlan, IEquipmentMaintenancePlanService> { + + @Autowired + private IEquipmentMaintenancePlanService equipmentMaintenancePlanService; + + @Autowired + private IEquipmentMaintenancePlanDetailService equipmentMaintenancePlanDetailService; + + + /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/ + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * @param equipmentMaintenancePlan + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "淇濆吇璁″垝-鍒嗛〉鍒楄〃鏌ヨ") + @ApiOperation(value="淇濆吇璁″垝-鍒嗛〉鍒楄〃鏌ヨ", notes="淇濆吇璁″垝-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<IPage<EquipmentMaintenancePlan>> queryPageList(EquipmentMaintenancePlan equipmentMaintenancePlan, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EquipmentMaintenancePlan> queryWrapper = QueryGenerator.initQueryWrapper(equipmentMaintenancePlan, req.getParameterMap()); + Page<EquipmentMaintenancePlan> page = new Page<EquipmentMaintenancePlan>(pageNo, pageSize); + IPage<EquipmentMaintenancePlan> pageList = equipmentMaintenancePlanService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * @param equipmentMaintenancePlan + * @return + */ + @AutoLog(value = "淇濆吇璁″垝-娣诲姞") + @ApiOperation(value="淇濆吇璁″垝-娣诲姞", notes="淇濆吇璁″垝-娣诲姞") + @PostMapping(value = "/add") + @Transactional(rollbackFor = {Exception.class}) + public Result<String> add(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlan.setStatus("created"); + List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList(); + equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size()); + equipmentMaintenancePlan.setDelFlag(CommonConstant.DEL_FLAG_0); + equipmentMaintenancePlanService.save(equipmentMaintenancePlan); + for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){ + equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId()); + } + equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * @param equipmentMaintenancePlan + * @return + */ + @AutoLog(value = "淇濆吇璁″垝-缂栬緫") + @ApiOperation(value="淇濆吇璁″垝-缂栬緫", notes="淇濆吇璁″垝-缂栬緫") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_equipment_maintenance_plan:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + @Transactional(rollbackFor = {Exception.class}) + public Result<String> edit(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlanDetailService.remove(new QueryWrapper<EquipmentMaintenancePlanDetail>().eq("plan_id",equipmentMaintenancePlan.getId())); + List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlan.getEquipmentMaintenancePlanDetailList(); + equipmentMaintenancePlan.setEquipNo(equipmentMaintenancePlanDetails.size()); + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){ + equipmentMaintenancePlanDetail.setPlanId(equipmentMaintenancePlan.getId()); + } + equipmentMaintenancePlanDetailService.saveBatch(equipmentMaintenancePlanDetails); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * @param id + * @return + */ + @AutoLog(value = "淇濆吇璁″垝-閫氳繃id鍒犻櫎") + @ApiOperation(value="淇濆吇璁″垝-閫氳繃id鍒犻櫎", notes="淇濆吇璁″垝-閫氳繃id鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_equipment_maintenance_plan:delete") + @DeleteMapping(value = "/delete") + @Transactional(rollbackFor = {Exception.class}) + public Result<String> delete(@RequestParam(name="id",required=true) String id) { + equipmentMaintenancePlanDetailService.remove(new QueryWrapper<EquipmentMaintenancePlanDetail>().eq("plan_id",id)); + equipmentMaintenancePlanService.delMain(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + @AutoLog(value = "淇濆吇璁″垝-鎵归噺鍒犻櫎") + @ApiOperation(value="淇濆吇璁″垝-鎵归噺鍒犻櫎", notes="淇濆吇璁″垝-鎵归噺鍒犻櫎") + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_equipment_maintenance_plan:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.equipmentMaintenancePlanService.delBatchMain(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛!"); + } + + /** + * 瀵煎嚭 + * @return + */ + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_equipment_maintenance_plan:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EquipmentMaintenancePlan equipmentMaintenancePlan) { + return super.exportXls(request, equipmentMaintenancePlan, EquipmentMaintenancePlan.class, "淇濆吇璁″垝"); + } + + /** + * 瀵煎叆 + * @return + */ + //@RequiresPermissions("org.jeecg.modules.mdc:mom_eam_equipment_maintenance_plan:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EquipmentMaintenancePlan.class); + } + + + /*---------------------------------涓昏〃澶勭悊-end-------------------------------------*/ + @PutMapping("submit") + public Result<?> submit(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlan.setStatus("submitted"); + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + return Result.OK("鎿嶄綔鎴愬姛"); + } + @PutMapping("audit") + public Result<?> audit(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlan.setStatus("passed"); + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + return Result.OK("鎿嶄綔鎴愬姛"); + } + @PutMapping("reject") + public Result<?> reject(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlan.setStatus("rejected"); + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + return Result.OK("鎿嶄綔鎴愬姛"); + } + @PutMapping("distrbute") + public Result<?> distrbute(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + equipmentMaintenancePlan.setStatus("distributed"); + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + return Result.OK("鎿嶄綔鎴愬姛"); + } + + /*--------------------------------瀛愯〃澶勭悊-淇濆吇璁″垝鏄庣粏-begin----------------------------------------------*/ + /** + * 閫氳繃涓昏〃ID鏌ヨ + * @return + */ + //@AutoLog(value = "淇濆吇璁″垝鏄庣粏-閫氳繃涓昏〃ID鏌ヨ") + @ApiOperation(value="淇濆吇璁″垝鏄庣粏-閫氳繃涓昏〃ID鏌ヨ", notes="淇濆吇璁″垝鏄庣粏-閫氳繃涓昏〃ID鏌ヨ") + @GetMapping(value = "/listEquipmentMaintenancePlanDetailByMainId") + public Result<IPage<EquipmentMaintenancePlanDetail>> listEquipmentMaintenancePlanDetailByMainId(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EquipmentMaintenancePlanDetail> queryWrapper = QueryGenerator.initQueryWrapper(equipmentMaintenancePlanDetail, req.getParameterMap()); + Page<EquipmentMaintenancePlanDetail> page = new Page<EquipmentMaintenancePlanDetail>(pageNo, pageSize); + IPage<EquipmentMaintenancePlanDetail> pageList = equipmentMaintenancePlanDetailService.pageList(page,equipmentMaintenancePlanDetail.getPlanId()); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * @param equipmentMaintenancePlanDetail + * @return + */ + @AutoLog(value = "淇濆吇璁″垝鏄庣粏-娣诲姞") + @ApiOperation(value="淇濆吇璁″垝鏄庣粏-娣诲姞", notes="淇濆吇璁″垝鏄庣粏-娣诲姞") + @PostMapping(value = "/addEquipmentMaintenancePlanDetail") + public Result<String> addEquipmentMaintenancePlanDetail(@RequestBody EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail) { + equipmentMaintenancePlanDetailService.save(equipmentMaintenancePlanDetail); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * @param equipmentMaintenancePlanDetail + * @return + */ + @AutoLog(value = "淇濆吇璁″垝鏄庣粏-缂栬緫") + @ApiOperation(value="淇濆吇璁″垝鏄庣粏-缂栬緫", notes="淇濆吇璁″垝鏄庣粏-缂栬緫") + @RequestMapping(value = "/editEquipmentMaintenancePlanDetail", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<String> editEquipmentMaintenancePlanDetail(@RequestBody EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail) { + equipmentMaintenancePlanDetailService.updateById(equipmentMaintenancePlanDetail); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * @param id + * @return + */ + @AutoLog(value = "淇濆吇璁″垝鏄庣粏-閫氳繃id鍒犻櫎") + @ApiOperation(value="淇濆吇璁″垝鏄庣粏-閫氳繃id鍒犻櫎", notes="淇濆吇璁″垝鏄庣粏-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/deleteEquipmentMaintenancePlanDetail") + public Result<String> deleteEquipmentMaintenancePlanDetail(@RequestParam(name="id",required=true) String id) { + equipmentMaintenancePlanDetailService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * @param ids + * @return + */ + @AutoLog(value = "淇濆吇璁″垝鏄庣粏-鎵归噺鍒犻櫎") + @ApiOperation(value="淇濆吇璁″垝鏄庣粏-鎵归噺鍒犻櫎", notes="淇濆吇璁″垝鏄庣粏-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatchEquipmentMaintenancePlanDetail") + public Result<String> deleteBatchEquipmentMaintenancePlanDetail(@RequestParam(name="ids",required=true) String ids) { + this.equipmentMaintenancePlanDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛!"); + } + + /** + * 瀵煎嚭 + * @return + */ + @RequestMapping(value = "/exportEquipmentMaintenancePlanDetail") + public ModelAndView exportEquipmentMaintenancePlanDetail(HttpServletRequest request, EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail) { + // Step.1 缁勮鏌ヨ鏉′欢 + QueryWrapper<EquipmentMaintenancePlanDetail> queryWrapper = QueryGenerator.initQueryWrapper(equipmentMaintenancePlanDetail, request.getParameterMap()); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + // Step.2 鑾峰彇瀵煎嚭鏁版嵁 + List<EquipmentMaintenancePlanDetail> pageList = equipmentMaintenancePlanDetailService.list(queryWrapper); + List<EquipmentMaintenancePlanDetail> exportList = null; + + // 杩囨护閫変腑鏁版嵁 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List<String> selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + + // Step.3 AutoPoi 瀵煎嚭Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //姝ゅ璁剧疆鐨刦ilename鏃犳晥,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓� + mv.addObject(NormalExcelConstants.FILE_NAME, "淇濆吇璁″垝鏄庣粏"); + mv.addObject(NormalExcelConstants.CLASS, EquipmentMaintenancePlanDetail.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("淇濆吇璁″垝鏄庣粏鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "淇濆吇璁″垝鏄庣粏")); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + + /** + * 瀵煎叆 + * @return + */ + @RequestMapping(value = "/importEquipmentMaintenancePlanDetail/{mainId}") + public Result<?> importEquipmentMaintenancePlanDetail(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); + for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { + // 鑾峰彇涓婁紶鏂囦欢瀵硅薄 + MultipartFile file = entity.getValue(); + ImportParams params = new ImportParams(); + params.setTitleRows(2); + params.setHeadRows(1); + params.setNeedSave(true); + try { + List<EquipmentMaintenancePlanDetail> list = ExcelImportUtil.importExcel(file.getInputStream(), EquipmentMaintenancePlanDetail.class, params); + for (EquipmentMaintenancePlanDetail temp : list) { + temp.setPlanId(mainId); + } + long start = System.currentTimeMillis(); + equipmentMaintenancePlanDetailService.saveBatch(list); + log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣"); + return Result.OK("鏂囦欢瀵煎叆鎴愬姛锛佹暟鎹鏁帮細" + list.size()); + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error("鏂囦欢瀵煎叆澶辫触:" + e.getMessage()); + } finally { + try { + file.getInputStream().close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + return Result.error("鏂囦欢瀵煎叆澶辫触锛�"); + } + + /*--------------------------------瀛愯〃澶勭悊-淇濆吇璁″垝鏄庣粏-end----------------------------------------------*/ + + + + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java index 1899651..bab6efc 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java @@ -364,7 +364,4 @@ } return null; } - - - } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java new file mode 100644 index 0000000..440184b --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlan.java @@ -0,0 +1,74 @@ +package org.jeecg.modules.eam.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; +import org.jeecgframework.poi.excel.annotation.Excel; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @Description: 淇濆吇璁″垝 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +@Data +@TableName("mom_eam_equipment_maintenance_plan") +@ApiModel(value="mom_eam_equipment_maintenance_plan瀵硅薄", description="淇濆吇璁″垝") +public class EquipmentMaintenancePlan implements Serializable { + private static final long serialVersionUID = 1L; + + /**涓婚敭ID*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭ID") + private java.lang.String id; + /**璁″垝鍗曞彿*/ + @Excel(name = "璁″垝鍗曞彿", width = 15) + @ApiModelProperty(value = "璁″垝鍗曞彿") + private java.lang.String num; + /**璁″垝鍗曠被鍨嬶紙鏁版嵁瀛楀吀锛歮aintenance_plan_type锛�*/ + @Excel(name = "璁″垝鍗曠被鍨嬶紙鏁版嵁瀛楀吀锛歮aintenance_plan_type锛�", width = 15) + @ApiModelProperty(value = "璁″垝鍗曠被鍨嬶紙鏁版嵁瀛楀吀锛歮aintenance_type锛�") + @Dict(dicCode = "maintenance_type") + private java.lang.String type; + /**璁″垝鍗曠姸鎬�(鏁版嵁瀛楀吀锛歮aintenance_plan_type)*/ + @Excel(name = "璁″垝鍗曠姸鎬�(鏁版嵁瀛楀吀锛歮aintenance_plan_type)", width = 15) + @ApiModelProperty(value = "璁″垝鍗曠姸鎬�(鏁版嵁瀛楀吀:plan_status)") + @Dict(dicCode = "plan_status") + private java.lang.String status; + /**璁惧鏁伴噺*/ + @Excel(name = "璁惧鏁伴噺", width = 15) + @ApiModelProperty(value = "璁惧鏁伴噺") + private java.lang.Integer equipNo; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**delFlag*/ + @Excel(name = "delFlag", width = 15) + @ApiModelProperty(value = "delFlag") + @TableLogic + private java.lang.Integer delFlag; + @TableField(exist = false) + private List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetailList; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlanDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlanDetail.java new file mode 100644 index 0000000..ccdf9d5 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentMaintenancePlanDetail.java @@ -0,0 +1,66 @@ +package org.jeecg.modules.eam.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.*; +import org.jeecg.common.aspect.annotation.Dict; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.UnsupportedEncodingException; + +/** + * @Description: 淇濆吇璁″垝鏄庣粏 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +@Data +@TableName("mom_eam_equipment_maintenance_plan_detail") +@ApiModel(value="mom_eam_equipment_maintenance_plan_detail瀵硅薄", description="淇濆吇璁″垝鏄庣粏") +public class EquipmentMaintenancePlanDetail implements Serializable { + private static final long serialVersionUID = 1L; + + /**涓婚敭ID*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭ID") + private java.lang.String id; + /**璁″垝鍗昳d*/ + @ApiModelProperty(value = "璁″垝鍗昳d") + private java.lang.String planId; + /**淇濆吇鏍囧噯id*/ + @Excel(name = "淇濆吇鏍囧噯id", width = 15) + @ApiModelProperty(value = "淇濆吇鏍囧噯id") + private java.lang.String standardId; + /**璁″垝寮�濮嬫椂闂�*/ + @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�") + private java.util.Date planStartTime; + /**璁″垝缁撴潫鏃堕棿*/ + @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") + @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿") + private java.util.Date planEndTime; + + @TableField(exist = false) + private String standardNum; + + @TableField(exist = false) + private String equipmentId; + + @TableField(exist = false) + private String equipmentNum; + + @TableField(exist = false) + private String equipmentName; + + @TableField(exist = false) + private String model; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanDetailMapper.java new file mode 100644 index 0000000..ded59b0 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanDetailMapper.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** + * @Description: 淇濆吇璁″垝鏄庣粏 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +public interface EquipmentMaintenancePlanDetailMapper extends BaseMapper<EquipmentMaintenancePlanDetail> { + + /** + * 閫氳繃涓昏〃id鍒犻櫎瀛愯〃鏁版嵁 + * + * @param mainId 涓昏〃id + * @return boolean + */ + public boolean deleteByMainId(@Param("mainId") String mainId); + + /** + * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁 + * + * @param mainId 涓昏〃id + * @return List<EquipmentMaintenancePlanDetail> + */ + public List<EquipmentMaintenancePlanDetail> selectByMainId(@Param("mainId") String mainId); + + /** + * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁 + * + * @param mainId 涓昏〃id + * @param page + * @return List<EquipmentMaintenancePlanDetail> + */ + public List<EquipmentMaintenancePlanDetail> pageList(Page<EquipmentMaintenancePlanDetail> page, @Param("mainId") String mainId); + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java new file mode 100644 index 0000000..7e16b8d --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.mapper; + +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 淇濆吇璁″垝 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +public interface EquipmentMaintenancePlanMapper extends BaseMapper<EquipmentMaintenancePlan> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanDetailMapper.xml new file mode 100644 index 0000000..8a11063 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanDetailMapper.xml @@ -0,0 +1,36 @@ +<?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.EquipmentMaintenancePlanDetailMapper"> + + <delete id="deleteByMainId" parameterType="java.lang.String"> + DELETE + FROM mom_eam_equipment_maintenance_plan_detail + WHERE + plan_id = #{mainId} + </delete> + + <select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail"> + SELECT * + FROM mom_eam_equipment_maintenance_plan_detail + WHERE + plan_id = #{mainId} + </select> + + <select id="pageList" resultType="org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail"> + select + t1.id id, + t1.standard_id standardId, + t1.plan_start_time planStartTime, + t1.plan_end_time planEndTime, + t2.num standardNum, + t2.equipment_id equipmentId, + t3.num equipmentNum, + t3.name equipmentName, + t3.model model + from mom_eam_equipment_maintenance_plan_detail t1 + left join (select * from mom_eam_maintenance_standard where del_flag = 0) t2 + on t1.standard_id = t2.id + left join mom_eam_equipment t3 on t2.equipment_id = t3.id + where t1.plan_id = #{mainId} + </select> +</mapper> diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml new file mode 100644 index 0000000..a3d86a5 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.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.EquipmentMaintenancePlanMapper"> + +</mapper> diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanDetailService.java new file mode 100644 index 0000000..2cdc5e0 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanDetailService.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.eam.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 淇濆吇璁″垝鏄庣粏 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +public interface IEquipmentMaintenancePlanDetailService extends IService<EquipmentMaintenancePlanDetail> { + + /** + * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁 + * + * @param mainId + * @return List<EquipmentMaintenancePlanDetail> + */ + public List<EquipmentMaintenancePlanDetail> selectByMainId(String mainId); + + + /** + * 閫氳繃涓昏〃id鏌ヨ瀛愯〃鏁版嵁 + * + * @param mainId + * @param page, + * @return List<EquipmentMaintenancePlanDetail> + */ + public Page<EquipmentMaintenancePlanDetail> pageList(Page<EquipmentMaintenancePlanDetail> page,String mainId); +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java new file mode 100644 index 0000000..bc47d5b --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java @@ -0,0 +1,32 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.io.Serializable; +import java.util.Collection; + +/** + * @Description: 淇濆吇璁″垝 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +public interface IEquipmentMaintenancePlanService extends IService<EquipmentMaintenancePlan> { + + /** + * 鍒犻櫎涓�瀵瑰 + * + * @param id + */ + public void delMain (String id); + + /** + * 鎵归噺鍒犻櫎涓�瀵瑰 + * + * @param idList + */ + public void delBatchMain (Collection<? extends Serializable> idList); + + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanDetailServiceImpl.java new file mode 100644 index 0000000..3012304 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanDetailServiceImpl.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.eam.service.impl; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail; +import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanDetailMapper; +import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanDetailService; +import org.springframework.stereotype.Service; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description: 淇濆吇璁″垝鏄庣粏 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +@Service +public class EquipmentMaintenancePlanDetailServiceImpl extends ServiceImpl<EquipmentMaintenancePlanDetailMapper, EquipmentMaintenancePlanDetail> implements IEquipmentMaintenancePlanDetailService { + + @Autowired + private EquipmentMaintenancePlanDetailMapper equipmentMaintenancePlanDetailMapper; + + @Override + public List<EquipmentMaintenancePlanDetail> selectByMainId(String mainId) { + return equipmentMaintenancePlanDetailMapper.selectByMainId(mainId); + } + + @Override + public Page<EquipmentMaintenancePlanDetail> pageList(Page<EquipmentMaintenancePlanDetail> page, String mainId) { + return page.setRecords(baseMapper.pageList(page,mainId)); + } +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java new file mode 100644 index 0000000..5ccf97d --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java @@ -0,0 +1,44 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; +import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanDetailMapper; +import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanMapper; +import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import java.io.Serializable; +import java.util.Collection; + +/** + * @Description: 淇濆吇璁″垝 + * @Author: jeecg-boot + * @Date: 2023-10-16 + * @Version: V1.0 + */ +@Service +public class EquipmentMaintenancePlanServiceImpl extends ServiceImpl<EquipmentMaintenancePlanMapper, EquipmentMaintenancePlan> implements IEquipmentMaintenancePlanService { + + @Autowired + private EquipmentMaintenancePlanMapper equipmentMaintenancePlanMapper; + @Autowired + private EquipmentMaintenancePlanDetailMapper equipmentMaintenancePlanDetailMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public void delMain(String id) { + equipmentMaintenancePlanDetailMapper.deleteByMainId(id); + equipmentMaintenancePlanMapper.deleteById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delBatchMain(Collection<? extends Serializable> idList) { + for(Serializable id:idList) { + equipmentMaintenancePlanDetailMapper.deleteByMainId(id.toString()); + equipmentMaintenancePlanMapper.deleteById(id); + } + } + +} -- Gitblit v1.9.3