diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigItemMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigItemMapper.java new file mode 100644 index 0000000..cedccf2 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigItemMapper.java @@ -0,0 +1,11 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.eqmain.EqMainConfigItemEntity; + +/** + * 设备点检/保养配置子表 Mapper + */ +public interface EqMainConfigItemMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigMapper.java new file mode 100644 index 0000000..8b49676 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqMainConfigMapper.java @@ -0,0 +1,11 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.eqmain.EqMainConfigEntity; + +/** + * 设备点检/保养配置 Mapper + */ +public interface EqMainConfigMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigItemService.java new file mode 100644 index 0000000..9c2d8c7 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigItemService.java @@ -0,0 +1,11 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.eqmain.EqMainConfigItemEntity; + +/** + * 设备点检/保养配置子表 Service + */ +public interface EqMainConfigItemService extends IService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigService.java new file mode 100644 index 0000000..ad9ce43 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqMainConfigService.java @@ -0,0 +1,66 @@ +package jnpf.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.eqmain.EqMainConfigEntity; +import jnpf.model.eqmain.EqMainConfigForm; +import jnpf.model.eqmain.EqMainConfigPagination; + +import java.util.List; + +/** + * 设备点检/保养配置 Service + */ +public interface EqMainConfigService extends IService { + + /** + * 列表查询 + * @param pagination 分页参数 + * @return 列表数据 + */ + List getList(EqMainConfigPagination pagination); + + /** + * 详情查询(包含子表) + * @param id 主键 + * @return 实体对象 + */ + EqMainConfigEntity getInfo(Integer id); + + /** + * 新增 + * @param entity 实体对象 + */ + void create(EqMainConfigEntity entity); + + /** + * 修改 + * @param id 主键 + * @param entity 实体对象 + * @return 是否成功 + */ + boolean update(Integer id, EqMainConfigEntity entity); + + /** + * 删除 + * @param entity 实体对象 + */ + void delete(EqMainConfigEntity entity); + + /** + * 验证表单 + * @param form 表单对象 + * @param i 0新增-1修改 + * @return 错误信息 + */ + String checkForm(EqMainConfigForm form, int i); + + /** + * 保存或更新(包含子表) + * @param form 表单对象 + * @param id 主键 + * @param isSave 是否新增 + * @throws Exception 异常 + */ + void saveOrUpdate(EqMainConfigForm form, Integer id, boolean isSave) throws Exception; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigController.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigController.java new file mode 100644 index 0000000..c1a7b27 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigController.java @@ -0,0 +1,119 @@ +package jnpf.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.model.eqmain.EqMainConfigEntity; +import jnpf.model.eqmain.EqMainConfigForm; +import jnpf.model.eqmain.EqMainConfigItemEntity; +import jnpf.model.eqmain.EqMainConfigPagination; +import jnpf.service.EqMainConfigItemService; +import jnpf.service.EqMainConfigService; +import jnpf.util.JsonUtil; +import jnpf.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 设备点检/保养配置 控制类 + */ +@Tag(name = "设备点检保养配置", description = "EqMainConfig") +@RestController +@RequestMapping("/api/example/eqmainconfig") +public class EqMainConfigController { + + @Autowired + private EqMainConfigService eqMainConfigService; + + @Autowired + private EqMainConfigItemService eqMainConfigItemService; + + @Operation(summary = "获取配置列表") + @PostMapping("/getList") + public ActionResult getList(@RequestBody EqMainConfigPagination pagination) { + List list = eqMainConfigService.getList(pagination); + List> realList = list.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList()); + + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(pagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + @Operation(summary = "获取配置详情(含子表)") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") Integer id) { + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + Map result = JsonUtil.entityToMap(entity); + + List itemList = eqMainConfigItemService.lambdaQuery() + .eq(EqMainConfigItemEntity::getEqMainId, id) + .orderByAsc(EqMainConfigItemEntity::getSeqNo) + .list(); + result.put("itemList", itemList.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList())); + + return ActionResult.success(result); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "新建配置") + @PostMapping + public ActionResult create(@RequestBody @Valid EqMainConfigForm form) { + String errorMsg = eqMainConfigService.checkForm(form, 0); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + try { + eqMainConfigService.saveOrUpdate(form, null, true); + return ActionResult.success("新建成功"); + } catch (Exception e) { + return ActionResult.fail("新建数据失败:" + e.getMessage()); + } + } + + @Operation(summary = "更新配置") + @PutMapping("/{id}") + public ActionResult update(@PathVariable("id") Integer id, @RequestBody @Valid EqMainConfigForm form) { + form.setId(id); + String errorMsg = eqMainConfigService.checkForm(form, 1); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + try { + eqMainConfigService.saveOrUpdate(form, id, false); + return ActionResult.success("更新成功"); + } catch (Exception e) { + return ActionResult.fail("更新数据失败:" + e.getMessage()); + } + } else { + return ActionResult.fail("更新失败,数据不存在"); + } + } + + @Operation(summary = "删除配置") + @DeleteMapping("/{id}") + public ActionResult delete(@PathVariable("id") Integer id) { + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + eqMainConfigService.delete(entity); + return ActionResult.success("删除成功"); + } + return ActionResult.fail("删除失败,数据不存在"); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigItemServiceImpl.java new file mode 100644 index 0000000..8e2ce33 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigItemServiceImpl.java @@ -0,0 +1,16 @@ + +package jnpf.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.EqMainConfigItemMapper; +import jnpf.model.eqmain.EqMainConfigItemEntity; +import jnpf.service.EqMainConfigItemService; +import org.springframework.stereotype.Service; + +/** + * 设备点检/保养配置子表 ServiceImpl + */ +@Service +public class EqMainConfigItemServiceImpl extends ServiceImpl implements EqMainConfigItemService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigServiceImpl.java new file mode 100644 index 0000000..414c66a --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqMainConfigServiceImpl.java @@ -0,0 +1,159 @@ +package jnpf.service.impl; + + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.EqMainConfigMapper; +import jnpf.model.eqmain.*; +import jnpf.service.EqMainConfigItemService; +import jnpf.service.EqMainConfigService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 设备点检/保养配置 ServiceImpl + */ +@Service +public class EqMainConfigServiceImpl extends ServiceImpl implements EqMainConfigService { + + @Autowired + private EqMainConfigItemService eqMainConfigItemService; + + @Override + public List getList(EqMainConfigPagination pagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (ObjectUtil.isNotEmpty(pagination.getEqCode())) { + wrapper.like(EqMainConfigEntity::getEqCode, pagination.getEqCode()); + } + if (ObjectUtil.isNotEmpty(pagination.getEqName())) { + wrapper.like(EqMainConfigEntity::getEqName, pagination.getEqName()); + } + if (ObjectUtil.isNotEmpty(pagination.getMainName())) { + wrapper.like(EqMainConfigEntity::getMainName, pagination.getMainName()); + } + if (ObjectUtil.isNotEmpty(pagination.getMainType())) { + wrapper.eq(EqMainConfigEntity::getMainType, pagination.getMainType()); + } + if (ObjectUtil.isNotEmpty(pagination.getDeptId())) { + wrapper.eq(EqMainConfigEntity::getDeptId, pagination.getDeptId()); + } + if (ObjectUtil.isNotEmpty(pagination.getUserId())) { + wrapper.eq(EqMainConfigEntity::getUserId, pagination.getUserId()); + } + if (ObjectUtil.isNotEmpty(pagination.getEnabledStatus())) { + wrapper.eq(EqMainConfigEntity::getEnabledStatus, pagination.getEnabledStatus()); + } + if (ObjectUtil.isNotEmpty(pagination.getKeyword())) { + String keyword = pagination.getKeyword(); + wrapper.and(w -> w.like(EqMainConfigEntity::getEqCode, keyword) + .or() + .like(EqMainConfigEntity::getEqName, keyword) + .or() + .like(EqMainConfigEntity::getMainName, keyword)); + } + + wrapper.eq(EqMainConfigEntity::getDeleteMark, 0); + wrapper.orderByDesc(EqMainConfigEntity::getId); + + if ("0".equals(pagination.getDataType())) { + Page page = new Page<>(pagination.getCurrentPage(), pagination.getPageSize()); + IPage configIPage = this.page(page, wrapper); + pagination.setData(configIPage.getRecords(), configIPage.getTotal()); + return configIPage.getRecords(); + } else { + return this.list(wrapper); + } + } + + @Override + public EqMainConfigEntity getInfo(Integer id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EqMainConfigEntity::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public void create(EqMainConfigEntity entity) { + this.save(entity); + } + + @Override + public boolean update(Integer id, EqMainConfigEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(EqMainConfigEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + @Override + public String checkForm(EqMainConfigForm form, int i) { + boolean isUp = ObjectUtil.isNotEmpty(form.getId()); + String countRecover = ""; + + if (ObjectUtil.isNotEmpty(form.getEqCode())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EqMainConfigEntity::getEqCode, form.getEqCode()); + wrapper.eq(EqMainConfigEntity::getMainType, form.getMainType()); + if (isUp) { + wrapper.ne(EqMainConfigEntity::getId, form.getId()); + } + long count = this.count(wrapper); + if (count > 0) { + countRecover += "该设备、类型已存在保养配置,请确认!"; + } + } + + return countRecover; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveOrUpdate(EqMainConfigForm form, Integer id, boolean isSave) throws Exception { + EqMainConfigEntity entity = getInfo(id); + if (entity == null) { + entity = new EqMainConfigEntity(); + } + BeanUtils.copyProperties(form, entity); + + if (isSave) { + this.save(entity); + } else { + this.updateById(entity); + } + + Integer mainId = entity.getId(); + + List newItemList = new ArrayList<>(); + if (form.getItemList() != null && !form.getItemList().isEmpty()) { + for (int i = 0; i < form.getItemList().size(); i++) { + EqMainConfigItemForm itemForm = form.getItemList().get(i); + EqMainConfigItemEntity itemEntity = new EqMainConfigItemEntity(); + BeanUtils.copyProperties(itemForm, itemEntity); + itemEntity.setEqMainId(mainId); + newItemList.add(itemEntity); + } + } + + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(EqMainConfigItemEntity::getEqMainId, mainId); + eqMainConfigItemService.remove(deleteWrapper); + + if (!newItemList.isEmpty()) { + eqMainConfigItemService.saveBatch(newItemList); + } + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqMainConfigController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqMainConfigController.java new file mode 100644 index 0000000..bc01da6 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqMainConfigController.java @@ -0,0 +1,120 @@ +package jnpf.controller; + + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jnpf.base.ActionResult; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.model.eqmain.EqMainConfigEntity; +import jnpf.model.eqmain.EqMainConfigForm; +import jnpf.model.eqmain.EqMainConfigItemEntity; +import jnpf.model.eqmain.EqMainConfigPagination; +import jnpf.service.EqMainConfigItemService; +import jnpf.service.EqMainConfigService; +import jnpf.util.JsonUtil; +import jnpf.util.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 设备点检/保养配置 控制类 + */ +@Tag(name = "设备点检保养配置", description = "EqMainConfig") +@RestController +@RequestMapping("/api/example/eqmainconfig") +public class EqMainConfigController { + + @Autowired + private EqMainConfigService eqMainConfigService; + + @Autowired + private EqMainConfigItemService eqMainConfigItemService; + + @Operation(summary = "获取配置列表") + @PostMapping("/getList") + public ActionResult getList(@RequestBody EqMainConfigPagination pagination) { + List list = eqMainConfigService.getList(pagination); + List> realList = list.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList()); + + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(pagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + @Operation(summary = "获取配置详情(含子表)") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") Integer id) { + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + Map result = JsonUtil.entityToMap(entity); + + List itemList = eqMainConfigItemService.lambdaQuery() + .eq(EqMainConfigItemEntity::getEqMainId, id) + .orderByAsc(EqMainConfigItemEntity::getSeqNo) + .list(); + result.put("itemList", itemList.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList())); + + return ActionResult.success(result); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "新建配置") + @PostMapping + public ActionResult create(@RequestBody @Valid EqMainConfigForm form) { + String errorMsg = eqMainConfigService.checkForm(form, 0); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + try { + eqMainConfigService.saveOrUpdate(form, null, true); + return ActionResult.success("新建成功"); + } catch (Exception e) { + return ActionResult.fail("新建数据失败:" + e.getMessage()); + } + } + + @Operation(summary = "更新配置") + @PutMapping("/{id}") + public ActionResult update(@PathVariable("id") Integer id, @RequestBody @Valid EqMainConfigForm form) { + form.setId(id); + String errorMsg = eqMainConfigService.checkForm(form, 1); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + try { + eqMainConfigService.saveOrUpdate(form, id, false); + return ActionResult.success("更新成功"); + } catch (Exception e) { + return ActionResult.fail("更新数据失败:" + e.getMessage()); + } + } else { + return ActionResult.fail("更新失败,数据不存在"); + } + } + + @Operation(summary = "删除配置") + @DeleteMapping("/{id}") + public ActionResult delete(@PathVariable("id") Integer id) { + EqMainConfigEntity entity = eqMainConfigService.getInfo(id); + if (entity != null) { + eqMainConfigService.delete(entity); + return ActionResult.success("删除成功"); + } + return ActionResult.fail("删除失败,数据不存在"); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigEntity.java new file mode 100644 index 0000000..cb1d512 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigEntity.java @@ -0,0 +1,88 @@ +package jnpf.model.eqmain; + + + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 设备点检/保养配置主表 + */ +@Data +@TableName("tba_eq_main_config") +public class EqMainConfigEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField(value = "enabled_status", updateStrategy = FieldStrategy.IGNORED) + private Integer enabledStatus; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("eq_id") + private Integer eqId; + + @TableField("eq_code") + private String eqCode; + + @TableField("eq_name") + private String eqName; + + @TableField("main_name") + private String mainName; + + @TableField("main_type") + private String mainType; + + @TableField("cycle_unit") + private String cycleUnit; + + @TableField("plan_start_dtime") + private Date planStartDtime; + + @TableField("dept_id") + private String deptId; + + @TableField("dept_name") + private String deptName; + + @TableField("user_id") + private String userId; + + @TableField("user_name") + private String userName; + + @TableField("main_post") + private String mainPost; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigForm.java new file mode 100644 index 0000000..eff4077 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigForm.java @@ -0,0 +1,75 @@ + +package jnpf.model.eqmain; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import java.util.Date; +import java.util.List; + +/** + * 设备点检/保养配置 Form + */ +@Data +public class EqMainConfigForm { + + @Schema(description = "主键") + private Integer id; + + @NotBlank(message = "设备编码不能为空") + @Schema(description = "设备编码") + private String eqCode; + + @NotBlank(message = "设备名称不能为空") + @Schema(description = "设备名称") + private String eqName; + + @Schema(description = "设备id") + private Integer eqId; + + @NotBlank(message = "方案名称不能为空") + @Schema(description = "方案名称") + private String mainName; + + @Schema(description = "类型(1 点检 2 保养 3润滑)") + private String mainType; + + @Schema(description = "周期(1 班 2 日 3 月 4 季度 5 年 )") + private String cycleUnit; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @Schema(description = "下次执行时间") + private Date planStartDtime; + + @Schema(description = "责任部门id") + private String deptId; + + @Schema(description = "责任部门名称") + private String deptName; + + @Schema(description = "责任人id") + private String userId; + + @Schema(description = "责任人") + private String userName; + + @Schema(description = "负责岗位") + private String mainPost; + + @Schema(description = "状态(1启用 2未启用)") + private Integer enabledStatus; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "流程ID") + private String flowId; + + @Schema(description = "流程任务ID") + private String flowTaskId; + + @Schema(description = "子表数据") + private List itemList; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemEntity.java new file mode 100644 index 0000000..57974d6 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemEntity.java @@ -0,0 +1,71 @@ +package jnpf.model.eqmain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 设备点检/保养配置子表 + */ +@Data +@TableName("tba_eq_main_config_item") +public class EqMainConfigItemEntity { + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField(value = "enabled_status", updateStrategy = FieldStrategy.IGNORED) + private Integer enabledStatus; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("eq_main_id") + private Integer eqMainId; + + @TableField("item_name") + private String itemName; + + @TableField("check_part") + private String checkPart; + + @TableField("check_method") + private String checkMethod; + + @TableField("qualified_stand") + private String qualifiedStand; + + @TableField("check_tool") + private String checkTool; + + @TableField("seq_no") + private Integer seqNo; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemForm.java new file mode 100644 index 0000000..fd6d860 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigItemForm.java @@ -0,0 +1,41 @@ +package jnpf.model.eqmain; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 设备点检/保养配置子表 Form + */ +@Data +public class EqMainConfigItemForm { + + @Schema(description = "主键") + private Integer id; + + @Schema(description = "主表id") + private Integer eqMainId; + + @Schema(description = "保养项目") + private String itemName; + + @Schema(description = "检查/保养部位") + private String checkPart; + + @Schema(description = "检查/保养方法") + private String checkMethod; + + @Schema(description = "标准/要求") + private String qualifiedStand; + + @Schema(description = "所需工具") + private String checkTool; + + @Schema(description = "项目序号") + private Integer seqNo; + + @Schema(description = "状态(1启用 2未启用)") + private Integer enabledStatus; + + @Schema(description = "备注") + private String remark; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigPagination.java new file mode 100644 index 0000000..0065402 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqmain/EqMainConfigPagination.java @@ -0,0 +1,39 @@ +package jnpf.model.eqmain; + +import io.swagger.v3.oas.annotations.media.Schema; +import jnpf.base.Pagination; +import lombok.Data; + +/** + * 设备点检/保养配置 Pagination + */ +@Data +public class EqMainConfigPagination extends Pagination { + + @Schema(description = "数据类型") + private String dataType; + + @Schema(description = "设备编码") + private String eqCode; + + @Schema(description = "设备名称") + private String eqName; + + @Schema(description = "方案名称") + private String mainName; + + @Schema(description = "类型(1 点检 2 保养 3润滑)") + private String mainType; + + @Schema(description = "责任部门id") + private Integer deptId; + + @Schema(description = "责任人id") + private Integer userId; + + @Schema(description = "状态(1启用 2未启用)") + private Integer enabledStatus; + + @Schema(description = "关键词") + private String keyword; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineForm.java index daf8df2..439241a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineForm.java @@ -59,9 +59,9 @@ public class MachineForm { private String flowTaskId; @Schema(description = "所属产线id") - private Long belgLineId; + private String belgLineId; @Schema(description = "所属工序id") - private Long belgProcId; + private String belgProcId; } diff --git a/jnpf-java-boot/jnpf-web/src/views/example/common/dict.js b/jnpf-java-boot/jnpf-web/src/views/example/common/dict.js index a44359c..bcd129f 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/common/dict.js +++ b/jnpf-java-boot/jnpf-web/src/views/example/common/dict.js @@ -12,6 +12,10 @@ export const dictMaps = { enabledStatus: { '1': '启用', '2': '未启用' }, // 订单类型 ordType: { '1': '备库订单', '2': '销售订单' }, + // 设备维护类型 + mainType: { '1': '点检', '2': '保养', '3': '润滑' }, + // 周期单位 + cycleUnit: { '1': '班', '2': '日', '3': '月', '4': '季度', '5': '年' }, }; // 根据映射自动生成下拉选项(使用id和fullName字段) @@ -36,5 +40,7 @@ export function getLabel(type, value) { export const paramTypeOptions = dictOptions.paramType; export const enabledStatusOptions = dictOptions.enabledStatus; export const ordTypeOptions = dictOptions.ordType; +export const mainTypeOptions = dictOptions.mainType; +export const cycleUnitOptions = dictOptions.cycleUnit; diff --git a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/api.js b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/api.js new file mode 100644 index 0000000..99bbee3 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/api.js @@ -0,0 +1,68 @@ +import request from '@/utils/request' +import { getDataInterfaceRes } from '@/api/systemData/dataInterface' + +// 获取设备列表 +export function getEquipmentList(data) { + return request({ + url: '/api/example/equipment/getList', + method: 'post', + data + }) +} + +// 获取配置列表 +export function getEqMainConfigList(data) { + return request({ + url: '/api/example/eqmainconfig/getList', + method: 'post', + data + }) +} + +// 获取配置详情 +export function getEqMainConfigInfo(id) { + return request({ + url: `/api/example/eqmainconfig/${id}`, + method: 'get' + }) +} + +// 新建配置 +export function createEqMainConfig(data) { + return request({ + url: '/api/example/eqmainconfig', + method: 'post', + data + }) +} + +// 更新配置 +export function updateEqMainConfig(id, data) { + return request({ + url: `/api/example/eqmainconfig/${id}`, + method: 'put', + data + }) +} + +// 删除配置 +export function deleteEqMainConfig(id) { + return request({ + url: `/api/example/eqmainconfig/${id}`, + method: 'delete' + }) +} + +// 获取部门列表(使用数据接口) +export function getDeptList() { + return getDataInterfaceRes('811583643129479301') +} + +// 获取人员列表(通过部门ID) +export function getUserList(deptId) { + return request({ + url: `/api/example/exampleOrder/getByDeptId/${deptId}`, + method: 'get' + }) +} + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/detail.vue b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/detail.vue new file mode 100644 index 0000000..0e9c419 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/detail.vue @@ -0,0 +1,173 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/form.vue new file mode 100644 index 0000000..e963f2e --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/form.vue @@ -0,0 +1,467 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/index.vue new file mode 100644 index 0000000..7ed3bc6 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/index.vue @@ -0,0 +1,219 @@ + + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/equipment/select.vue b/jnpf-java-boot/jnpf-web/src/views/example/equipment/select.vue new file mode 100644 index 0000000..0714a61 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/equipment/select.vue @@ -0,0 +1,153 @@ + + + + +