diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigItemMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigItemMapper.java new file mode 100644 index 0000000..5a1ab41 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigItemMapper.java @@ -0,0 +1,7 @@ +package jnpf.mapper; + +import jnpf.model.eqpatrol.EqPatrolConfigItemEntity; + +public interface EqPatrolConfigItemMapper extends com.baomidou.mybatisplus.core.mapper.BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigMapper.java new file mode 100644 index 0000000..83ef4ef --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/EqPatrolConfigMapper.java @@ -0,0 +1,9 @@ +package jnpf.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.eqpatrol.EqPatrolConfigEntity; + +public interface EqPatrolConfigMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigItemService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigItemService.java new file mode 100644 index 0000000..444b5ca --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigItemService.java @@ -0,0 +1,8 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.eqpatrol.EqPatrolConfigItemEntity; + +public interface EqPatrolConfigItemService extends IService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigService.java new file mode 100644 index 0000000..cbc2377 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/EqPatrolConfigService.java @@ -0,0 +1,26 @@ +package jnpf.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.eqpatrol.EqPatrolConfigEntity; +import jnpf.model.eqpatrol.EqPatrolConfigForm; +import jnpf.model.eqpatrol.EqPatrolConfigPagination; + +import java.util.List; + +public interface EqPatrolConfigService extends IService { + + List getList(EqPatrolConfigPagination pagination); + + EqPatrolConfigEntity getInfo(Integer id); + + void create(EqPatrolConfigEntity entity); + + boolean update(Integer id, EqPatrolConfigEntity entity); + + void delete(EqPatrolConfigEntity entity); + + String checkForm(EqPatrolConfigForm form, int i); + + void saveOrUpdate(EqPatrolConfigForm form, Integer id, boolean isSave) throws Exception; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigItemServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigItemServiceImpl.java new file mode 100644 index 0000000..cf429da --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigItemServiceImpl.java @@ -0,0 +1,12 @@ +package jnpf.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.EqPatrolConfigItemMapper; +import jnpf.model.eqpatrol.EqPatrolConfigItemEntity; +import jnpf.service.EqPatrolConfigItemService; +import org.springframework.stereotype.Service; + +@Service +public class EqPatrolConfigItemServiceImpl extends ServiceImpl implements EqPatrolConfigItemService { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigServiceImpl.java new file mode 100644 index 0000000..2154014 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/EqPatrolConfigServiceImpl.java @@ -0,0 +1,147 @@ +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.service.EqPatrolConfigItemService; +import jnpf.mapper.EqPatrolConfigMapper; +import jnpf.model.eqpatrol.*; +import jnpf.service.EqPatrolConfigService; +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; + +@Service +public class EqPatrolConfigServiceImpl extends ServiceImpl implements EqPatrolConfigService { + + @Autowired + private EqPatrolConfigItemService eqPatrolConfigItemService; + + @Override + public List getList(EqPatrolConfigPagination pagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (ObjectUtil.isNotEmpty(pagination.getEqCode())) { + wrapper.like(EqPatrolConfigEntity::getEqCode, pagination.getEqCode()); + } + if (ObjectUtil.isNotEmpty(pagination.getEqName())) { + wrapper.like(EqPatrolConfigEntity::getEqName, pagination.getEqName()); + } + if (ObjectUtil.isNotEmpty(pagination.getDeptId())) { + wrapper.eq(EqPatrolConfigEntity::getDeptId, pagination.getDeptId()); + } + if (ObjectUtil.isNotEmpty(pagination.getUserId())) { + wrapper.eq(EqPatrolConfigEntity::getUserId, pagination.getUserId()); + } + if (ObjectUtil.isNotEmpty(pagination.getEnabledStatus())) { + wrapper.eq(EqPatrolConfigEntity::getEnabledStatus, pagination.getEnabledStatus()); + } + if (ObjectUtil.isNotEmpty(pagination.getKeyword())) { + String keyword = pagination.getKeyword(); + wrapper.and(w -> w.like(EqPatrolConfigEntity::getEqCode, keyword) + .or() + .like(EqPatrolConfigEntity::getEqName, keyword)); + } + + wrapper.eq(EqPatrolConfigEntity::getDeleteMark, 0); + wrapper.orderByDesc(EqPatrolConfigEntity::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 EqPatrolConfigEntity getInfo(Integer id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(EqPatrolConfigEntity::getId, id); + queryWrapper.lambda().eq(EqPatrolConfigEntity::getDeleteMark, 0); + return this.getOne(queryWrapper); + } + + @Override + public void create(EqPatrolConfigEntity entity) { + this.save(entity); + } + + @Override + public boolean update(Integer id, EqPatrolConfigEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(EqPatrolConfigEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + @Override + public String checkForm(EqPatrolConfigForm form, int i) { + boolean isUp = ObjectUtil.isNotEmpty(form.getId()); + String countRecover = ""; + if (ObjectUtil.isNotEmpty(form.getEqCode())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EqPatrolConfigEntity::getEqCode, form.getEqCode()); + if (isUp) { + wrapper.ne(EqPatrolConfigEntity::getId, form.getId()); + } + long count = this.count(wrapper); + if (count > 0) { + countRecover += "该设备已存在巡检配置,请确认!"; + } + } + + return countRecover; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void saveOrUpdate(EqPatrolConfigForm form, Integer id, boolean isSave) throws Exception { + EqPatrolConfigEntity entity = getInfo(id); + if (entity == null) { + entity = new EqPatrolConfigEntity(); + } + 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++) { + EqPatrolConfigItemForm itemForm = form.getItemList().get(i); + EqPatrolConfigItemEntity itemEntity = new EqPatrolConfigItemEntity(); + BeanUtils.copyProperties(itemForm, itemEntity); + itemEntity.setEqPatrolId(mainId); + newItemList.add(itemEntity); + } + } + + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(EqPatrolConfigItemEntity::getEqPatrolId, mainId); + eqPatrolConfigItemService.remove(deleteWrapper); + + if (!newItemList.isEmpty()) { + eqPatrolConfigItemService.saveBatch(newItemList); + } + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqPatrolConfigController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqPatrolConfigController.java new file mode 100644 index 0000000..1ef6beb --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/EqPatrolConfigController.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.eqpatrol.EqPatrolConfigEntity; +import jnpf.model.eqpatrol.EqPatrolConfigForm; +import jnpf.model.eqpatrol.EqPatrolConfigItemEntity; +import jnpf.model.eqpatrol.EqPatrolConfigPagination; +import jnpf.service.EqPatrolConfigItemService; +import jnpf.service.EqPatrolConfigService; +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 = "EqPatrolConfig") +@RestController +@RequestMapping("/api/example/eqpatrolconfig") +public class EqPatrolConfigController { + + @Autowired + private EqPatrolConfigService eqPatrolConfigService; + + @Autowired + private EqPatrolConfigItemService eqPatrolConfigItemService; + + @Operation(summary = "获取配置列表") + @PostMapping("/getList") + public ActionResult getList(@RequestBody EqPatrolConfigPagination pagination) { + List list = eqPatrolConfigService.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) { + EqPatrolConfigEntity entity = eqPatrolConfigService.getInfo(id); + if (entity == null) { + return ActionResult.fail("该设备巡检配置不存在,请刷新界面!"); + } + if (entity != null) { + Map result = JsonUtil.entityToMap(entity); + + List itemList = eqPatrolConfigItemService.lambdaQuery() + .eq(EqPatrolConfigItemEntity::getEqPatrolId, id) + .orderByAsc(EqPatrolConfigItemEntity::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 EqPatrolConfigForm form) { + String errorMsg = eqPatrolConfigService.checkForm(form, 0); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + try { + eqPatrolConfigService.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 EqPatrolConfigForm form) { + form.setId(id); + String errorMsg = eqPatrolConfigService.checkForm(form, 1); + if (StringUtil.isNotEmpty(errorMsg)) { + return ActionResult.fail(errorMsg); + } + EqPatrolConfigEntity entity = eqPatrolConfigService.getInfo(id); + if (entity != null) { + try { + eqPatrolConfigService.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) { + EqPatrolConfigEntity entity = eqPatrolConfigService.getInfo(id); + if (entity != null) { + eqPatrolConfigService.delete(entity); + return ActionResult.success("删除成功"); + } + return ActionResult.fail("删除失败,数据不存在"); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigEntity.java new file mode 100644 index 0000000..e470a2b --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigEntity.java @@ -0,0 +1,78 @@ +package jnpf.model.eqpatrol; + + + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; + +@Data +@TableName("tba_eq_patrol_config") +public class EqPatrolConfigEntity { + + @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("cycle_unit") + private String cycleUnit; + + @TableField("cycle_value") + private Integer cycleValue; + + @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; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigForm.java new file mode 100644 index 0000000..2152f46 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigForm.java @@ -0,0 +1,63 @@ +package jnpf.model.eqpatrol; + +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; + +@Data +public class EqPatrolConfigForm { + + @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; + + @Schema(description = "周期(1 小时 2 班 3 天)") + private String cycleUnit; + + @Schema(description = "周期值") + private Integer cycleValue; + + @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 = "状态(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/eqpatrol/EqPatrolConfigItemEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigItemEntity.java new file mode 100644 index 0000000..c3b9d1e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigItemEntity.java @@ -0,0 +1,67 @@ +package jnpf.model.eqpatrol; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; + +@Data +@TableName("tba_eq_patrol_config_item") +public class EqPatrolConfigItemEntity { + + @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_patrol_id") + private Integer eqPatrolId; + + @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/eqpatrol/EqPatrolConfigItemForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigItemForm.java new file mode 100644 index 0000000..9ae77aa --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigItemForm.java @@ -0,0 +1,35 @@ +package jnpf.model.eqpatrol; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class EqPatrolConfigItemForm { + + @Schema(description = "主键") + private Integer id; + + @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/eqpatrol/EqPatrolConfigPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigPagination.java new file mode 100644 index 0000000..3571675 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/eqpatrol/EqPatrolConfigPagination.java @@ -0,0 +1,30 @@ +package jnpf.model.eqpatrol; + +import io.swagger.v3.oas.annotations.media.Schema; +import jnpf.base.Pagination; +import lombok.Data; + +@Data +public class EqPatrolConfigPagination extends Pagination { + + @Schema(description = "数据类型") + private String dataType; + + @Schema(description = "设备编码") + private String eqCode; + + @Schema(description = "设备名称") + private String eqName; + + @Schema(description = "责任部门id") + private String deptId; + + @Schema(description = "责任人id") + private String userId; + + @Schema(description = "状态(1启用 2未启用)") + private Integer enabledStatus; + + @Schema(description = "关键词") + private String keyword; +} 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 bcd129f..94b26a8 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 @@ -16,6 +16,8 @@ export const dictMaps = { mainType: { '1': '点检', '2': '保养', '3': '润滑' }, // 周期单位 cycleUnit: { '1': '班', '2': '日', '3': '月', '4': '季度', '5': '年' }, + + cycleUnit2: { '1': '小时', '2': '班', '3': '天',}, }; // 根据映射自动生成下拉选项(使用id和fullName字段) @@ -42,5 +44,6 @@ export const enabledStatusOptions = dictOptions.enabledStatus; export const ordTypeOptions = dictOptions.ordType; export const mainTypeOptions = dictOptions.mainType; export const cycleUnitOptions = dictOptions.cycleUnit; +export const cycleUnitOptions2 = dictOptions.cycleUnit2; 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 index 69828d8..1e42080 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/detail.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/detail.vue @@ -49,12 +49,12 @@ - + - + @@ -81,7 +81,7 @@ - + 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 index 972da44..7026f7a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/eqmainconfig/form.vue @@ -74,7 +74,7 @@ - + @@ -82,8 +82,8 @@ - - + + @@ -122,12 +122,12 @@ - + - + + + @@ -119,6 +123,10 @@ export default { getEquipmentTypeLabel(value) { return getLabel('eqType', value); }, + + getEquipmentStatusLabel(value) { + return getLabel('eqStatus', value); + }, handleRowClick(row) { this.selectedId = row.id; },