diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamMapper.java new file mode 100644 index 0000000..1b1e109 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamMapper.java @@ -0,0 +1,8 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.machine.MachineParamEntity; + +public interface MachineParamMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProcParamMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProcParamMapper.java new file mode 100644 index 0000000..c84b1f9 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/ProcParamMapper.java @@ -0,0 +1,9 @@ +package jnpf.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.proc.ProcParamEntity; + +public interface ProcParamMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamService.java new file mode 100644 index 0000000..6782665 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamService.java @@ -0,0 +1,27 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.machine.MachineParamEntity; +import jnpf.model.machine.MachineParamForm; +import jnpf.model.machine.MachineParamPagination; + +import java.util.List; + +public interface MachineParamService extends IService { + + List getList(MachineParamPagination machineParamPagination); + + MachineParamEntity getInfo(String id); + + void delete(MachineParamEntity entity); + + void create(MachineParamEntity entity); + + boolean update(String id, MachineParamEntity entity); + + String checkForm(MachineParamForm form, int type); + + void saveOrUpdate(MachineParamForm machineParamForm, String id, boolean isSave) throws Exception; + + List getSelectList(String selectKey); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProcParamService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProcParamService.java new file mode 100644 index 0000000..8c3fe6e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/ProcParamService.java @@ -0,0 +1,28 @@ +package jnpf.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.proc.ProcParamEntity; +import jnpf.model.proc.ProcParamForm; +import jnpf.model.proc.ProcParamPagination; + +import java.util.List; + +public interface ProcParamService extends IService { + + List getList(ProcParamPagination procParamPagination); + + ProcParamEntity getInfo(String id); + + void delete(ProcParamEntity entity); + + void create(ProcParamEntity entity); + + boolean update(String id, ProcParamEntity entity); + + String checkForm(ProcParamForm form, int type); + + void saveOrUpdate(ProcParamForm procParamForm, String id, boolean isSave) throws Exception; + + List getSelectList(String selectKey); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java new file mode 100644 index 0000000..cfcbf53 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java @@ -0,0 +1,155 @@ +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.MachineParamMapper; +import jnpf.model.machine.MachineParamEntity; +import jnpf.model.machine.MachineParamForm; +import jnpf.model.machine.MachineParamPagination; +import jnpf.service.MachineParamService; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class MachineParamServiceImpl extends ServiceImpl implements MachineParamService { + + @Resource + private UserProvider userProvider; + + @Resource + private MachineParamService self; + + @Override + public List getList(MachineParamPagination machineParamPagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (StringUtil.isNotEmpty(machineParamPagination.getProcCd())) { + wrapper.like(MachineParamEntity::getProcCd, machineParamPagination.getProcCd()); + } + if (StringUtil.isNotEmpty(machineParamPagination.getProcName())) { + wrapper.like(MachineParamEntity::getProcName, machineParamPagination.getProcName()); + } + if (StringUtil.isNotEmpty(machineParamPagination.getMatCode())) { + wrapper.like(MachineParamEntity::getMatCode, machineParamPagination.getMatCode()); + } + if (StringUtil.isNotEmpty(machineParamPagination.getMatName())) { + wrapper.like(MachineParamEntity::getMatName, machineParamPagination.getMatName()); + } + if (StringUtil.isNotEmpty(machineParamPagination.getMachineCd())) { + wrapper.like(MachineParamEntity::getMachineCd, machineParamPagination.getMachineCd()); + } + if (StringUtil.isNotEmpty(machineParamPagination.getMachineName())) { + wrapper.like(MachineParamEntity::getMachineName, machineParamPagination.getMachineName()); + } + if (ObjectUtil.isNotEmpty(machineParamPagination.getEnabledStatus())) { + wrapper.eq(MachineParamEntity::getEnabledStatus, machineParamPagination.getEnabledStatus()); + } + + wrapper.eq(MachineParamEntity::getDeleteMark, 0); + wrapper.orderByDesc(MachineParamEntity::getCreatorTime); + + if ("0".equals(machineParamPagination.getDataType())) { + Page page = new Page<>(machineParamPagination.getCurrentPage(), machineParamPagination.getPageSize()); + IPage result = this.page(page, wrapper); + return machineParamPagination.setData(result.getRecords(), result.getTotal()); + } else { + return this.list(wrapper); + } + } + + @Override + public MachineParamEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(MachineParamEntity::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public void create(MachineParamEntity entity) { + this.save(entity); + } + + @Override + public boolean update(String id, MachineParamEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(MachineParamEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + @Override + public String checkForm(MachineParamForm form, int type) { + boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id = ""; + String countRecover = ""; + if (isUp) { + id = form.getId(); + } + + if (ObjectUtil.isNotEmpty(form.getProcCd()) && ObjectUtil.isNotEmpty(form.getMatCode()) + && ObjectUtil.isNotEmpty(form.getMachineCd())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MachineParamEntity::getProcCd, form.getProcCd()); + wrapper.eq(MachineParamEntity::getMatCode, form.getMatCode()); + wrapper.eq(MachineParamEntity::getMachineCd, form.getMachineCd()); + if (isUp) { + wrapper.ne(MachineParamEntity::getId, id); + } + long count = this.count(wrapper); + if (count > 0) { + countRecover += "该工序、物料、机台的配置已存在，请重新选择！"; + } + } + + return countRecover; + } + + @Override + @Transactional + public void saveOrUpdate(MachineParamForm machineParamForm, String id, boolean isSave) throws Exception { + if (isSave) { + MachineParamEntity entity = new MachineParamEntity(); + BeanUtils.copyProperties(machineParamForm, entity); + entity.setId(null); + this.save(entity); + } else { + MachineParamEntity entity = getInfo(id); + if (entity == null) { + throw new Exception("数据不存在"); + } else { + BeanUtils.copyProperties(machineParamForm, entity); + this.updateById(entity); + } + } + } + + @Override + public List getSelectList(String selectKey) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MachineParamEntity::getDeleteMark, 0); + wrapper.eq(MachineParamEntity::getEnabledStatus, 1); + + if (StringUtil.isNotEmpty(selectKey)) { + wrapper.and(w -> w.like(MachineParamEntity::getMachineCd, selectKey) + .or() + .like(MachineParamEntity::getMachineName, selectKey)); + } + + wrapper.orderByDesc(MachineParamEntity::getCreatorTime); + return this.list(wrapper); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcParamServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcParamServiceImpl.java new file mode 100644 index 0000000..56f504d --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProcParamServiceImpl.java @@ -0,0 +1,146 @@ +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.ProcParamMapper; +import jnpf.model.proc.ProcParamEntity; +import jnpf.model.proc.ProcParamForm; +import jnpf.model.proc.ProcParamPagination; +import jnpf.service.ProcParamService; +import jnpf.util.StringUtil; +import jnpf.util.UserProvider; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class ProcParamServiceImpl extends ServiceImpl implements ProcParamService { + + @Resource + private UserProvider userProvider; + + @Resource + private ProcParamService self; + + @Override + public List getList(ProcParamPagination procParamPagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (StringUtil.isNotEmpty(procParamPagination.getProcCd())) { + wrapper.like(ProcParamEntity::getProcCd, procParamPagination.getProcCd()); + } + if (StringUtil.isNotEmpty(procParamPagination.getProcName())) { + wrapper.like(ProcParamEntity::getProcName, procParamPagination.getProcName()); + } + if (StringUtil.isNotEmpty(procParamPagination.getProcParamName())) { + wrapper.like(ProcParamEntity::getProcParamName, procParamPagination.getProcParamName()); + } + if (StringUtil.isNotEmpty(procParamPagination.getProcParamType())) { + wrapper.eq(ProcParamEntity::getProcParamType, procParamPagination.getProcParamType()); + } + if (ObjectUtil.isNotEmpty(procParamPagination.getEnabledStatus())) { + wrapper.eq(ProcParamEntity::getEnabledStatus, procParamPagination.getEnabledStatus()); + } + + wrapper.eq(ProcParamEntity::getDeleteMark, 0); + wrapper.orderByDesc(ProcParamEntity::getCreatorTime); + + if ("0".equals(procParamPagination.getDataType())) { + Page page = new Page<>(procParamPagination.getCurrentPage(), procParamPagination.getPageSize()); + IPage result = this.page(page, wrapper); + return procParamPagination.setData(result.getRecords(), result.getTotal()); + } else { + return this.list(wrapper); + } + } + + @Override + public ProcParamEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ProcParamEntity::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public void create(ProcParamEntity entity) { + this.save(entity); + } + + @Override + public boolean update(String id, ProcParamEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(ProcParamEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + @Override + public String checkForm(ProcParamForm form, int type) { + boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id = ""; + String countRecover = ""; + if (isUp) { + id = form.getId(); + } + if (ObjectUtil.isNotEmpty(form.getProcCd()) && ObjectUtil.isNotEmpty(form.getProcParamName())) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcParamEntity::getProcCd, form.getProcCd()); + wrapper.eq(ProcParamEntity::getProcParamName, form.getProcParamName()); + if (isUp) { + wrapper.ne(ProcParamEntity::getId, id); + } + long count = this.count(wrapper); + if (count > 0) { + countRecover += "工序（" + form.getProcName() + "）+参数名称（" + form.getProcParamName() + "）已存在，请确认！"; + } + } + + return countRecover; + } + + @Override + @Transactional + public void saveOrUpdate(ProcParamForm procParamForm, String id, boolean isSave) throws Exception { + if (isSave) { + ProcParamEntity entity = new ProcParamEntity(); + BeanUtils.copyProperties(procParamForm, entity); + entity.setId(null); + this.save(entity); + } else { + ProcParamEntity entity = getInfo(id); + if (entity == null) { + throw new Exception("数据不存在"); + } else { + BeanUtils.copyProperties(procParamForm, entity); + this.updateById(entity); + } + } + } + + @Override + public List getSelectList(String selectKey) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcParamEntity::getDeleteMark, 0); + wrapper.eq(ProcParamEntity::getEnabledStatus, 1); + + if (StringUtil.isNotEmpty(selectKey)) { + wrapper.and(w -> w.like(ProcParamEntity::getProcParamName, selectKey) + .or() + .like(ProcParamEntity::getProcCd, selectKey)); + } + + wrapper.orderByDesc(ProcParamEntity::getCreatorTime); + return this.list(wrapper); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java new file mode 100644 index 0000000..92dd329 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java @@ -0,0 +1,129 @@ +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.machine.MachineParamEntity; +import jnpf.model.machine.MachineParamForm; +import jnpf.model.machine.MachineParamPagination; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; +import jnpf.service.MachineParamService; +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.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Tag(name = "机台工艺参数配置", description = "MachineParam") +@RestController +@RequestMapping("/api/example/machineparam") +public class MachineParamController { + + @Autowired + private MachineParamService machineParamService; + + @Autowired + private UserService userService; + + @Operation(summary = "获取机台工艺参数列表") + @PostMapping("/getList") + public ActionResult getList(@RequestBody MachineParamPagination machineParamPagination) { + List list = machineParamService.getList(machineParamPagination); + list.forEach(item -> { + UserEntity userEntity = userService.getById(item.getCreatorUserId()); + if (userEntity != null) { + item.setCreateUserName(userEntity.getRealName()); + } + }); + List> realList = list.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList()); + + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(machineParamPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + @Operation(summary = "获取机台工艺参数详情") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id) { + MachineParamEntity entity = machineParamService.getInfo(id); + if (entity != null) { + return ActionResult.success(JsonUtil.entityToMap(entity)); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "新建机台工艺参数") + @PostMapping + public ActionResult create(@RequestBody @Valid MachineParamForm machineParamForm) { + String b = machineParamService.checkForm(machineParamForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + try { + machineParamService.saveOrUpdate(machineParamForm, "", true); + return ActionResult.success("新建成功"); + } catch (Exception e) { + return ActionResult.fail("新建数据失败：" + e.getMessage()); + } + } + + @Operation(summary = "更新机台工艺参数") + @PutMapping("/{id}") + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid MachineParamForm machineParamForm) { + machineParamForm.setId(id); + String b = machineParamService.checkForm(machineParamForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + MachineParamEntity entity = machineParamService.getInfo(id); + if (entity != null) { + try { + machineParamService.saveOrUpdate(machineParamForm, 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") String id) { + MachineParamEntity entity = machineParamService.getInfo(id); + if (entity != null) { + machineParamService.delete(entity); + return ActionResult.success("删除成功"); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "获取机台工艺参数下拉框") + @GetMapping("/getSelect") + public ActionResult getSelect(@RequestParam(value = "selectKey", required = false) String selectKey) { + List list = machineParamService.getSelectList(selectKey); + List> result = list.stream() + .map(entity -> { + Map map = new HashMap<>(3); + map.put("id", entity.getId()); + map.put("code", entity.getMachineCd()); + map.put("name", entity.getMachineName()); + return map; + }) + .collect(Collectors.toList()); + return ActionResult.success(result); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java new file mode 100644 index 0000000..a7c28b2 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java @@ -0,0 +1,130 @@ +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.proc.ProcParamEntity; +import jnpf.model.proc.ProcParamForm; +import jnpf.model.proc.ProcParamPagination; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; +import jnpf.service.ProcParamService; +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.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Tag(name = "工序工艺参数配置", description = "ProcParam") +@RestController +@RequestMapping("/api/example/procparam") +public class ProcParamController { + + @Autowired + private ProcParamService procParamService; + + @Autowired + private UserService userService; + + @Operation(summary = "获取工序工艺参数列表") + @PostMapping("/getList") + public ActionResult getList(@RequestBody ProcParamPagination procParamPagination) { + List list = procParamService.getList(procParamPagination); + list.forEach(item -> { + UserEntity userEntity = userService.getById(item.getCreatorUserId()); + if (userEntity != null) { + item.setCreateUserName(userEntity.getRealName()); + } + }); + List> realList = list.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList()); + + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(procParamPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + + @Operation(summary = "获取工序工艺参数详情") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id) { + ProcParamEntity entity = procParamService.getInfo(id); + if (entity != null) { + return ActionResult.success(JsonUtil.entityToMap(entity)); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "新建工序工艺参数") + @PostMapping + public ActionResult create(@RequestBody @Valid ProcParamForm procParamForm) { + String b = procParamService.checkForm(procParamForm, 0); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + try { + procParamService.saveOrUpdate(procParamForm, "", true); + return ActionResult.success("新建成功"); + } catch (Exception e) { + return ActionResult.fail("新建数据失败：" + e.getMessage()); + } + } + + @Operation(summary = "更新工序工艺参数") + @PutMapping("/{id}") + public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid ProcParamForm procParamForm) { + procParamForm.setId(id); + String b = procParamService.checkForm(procParamForm, 1); + if (StringUtil.isNotEmpty(b)) { + return ActionResult.fail(b); + } + ProcParamEntity entity = procParamService.getInfo(id); + if (entity != null) { + try { + procParamService.saveOrUpdate(procParamForm, 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") String id) { + ProcParamEntity entity = procParamService.getInfo(id); + if (entity != null) { + procParamService.delete(entity); + return ActionResult.success("删除成功"); + } + return ActionResult.fail("数据不存在"); + } + + @Operation(summary = "获取工序工艺参数下拉框") + @GetMapping("/getSelect") + public ActionResult getSelect(@RequestParam(value = "selectKey", required = false) String selectKey) { + List list = procParamService.getSelectList(selectKey); + List> result = list.stream() + .map(entity -> { + Map map = new HashMap<>(3); + map.put("id", entity.getId()); + map.put("code", entity.getProcParamName()); + map.put("name", entity.getProcParamName()); + return map; + }) + .collect(Collectors.toList()); + return ActionResult.success(result); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java new file mode 100644 index 0000000..018e490 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java @@ -0,0 +1,79 @@ +package jnpf.model.machine; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; + +@Data +@TableName("tba_machine_param") +public class MachineParamEntity { + + @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", updateStrategy = FieldStrategy.IGNORED) + private String flowId; + + @TableField(value = "f_flow_task_id", updateStrategy = FieldStrategy.IGNORED) + private String flowTaskId; + + @TableField("proc_cd") + private String procCd; + + @TableField(value = "enabled_status", updateStrategy = FieldStrategy.IGNORED) + private String enabledStatus; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("proc_id") + private Integer procId; + + @TableField("proc_name") + private String procName; + + @TableField("mat_code") + private String matCode; + + @TableField("mat_name") + private String matName; + + @TableField("mate_id") + private Integer mateId; + + @TableField("spec") + private String spec; + + @TableField("machine_cd") + private String machineCd; + + @TableField("machine_name") + private String machineName; + + @TableField("machine_id") + private Integer machineId; + + @TableField(exist = false) + private String createUserName; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java new file mode 100644 index 0000000..f0efb96 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java @@ -0,0 +1,57 @@ +package jnpf.model.machine; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import javax.validation.constraints.NotBlank; + +@Data +public class MachineParamForm { + + @Schema(description = "主键") + private String id; + + @NotBlank(message = "工序编码不能为空") + @Schema(description = "工序编码") + private String procCd; + + @Schema(description = "状态(1启用 2 未启用)") + private String enabledStatus; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "工序id") + private Integer procId; + + @Schema(description = "工序名称") + private String procName; + + @NotBlank(message = "物料编码不能为空") + @Schema(description = "物料编码") + private String matCode; + + @Schema(description = "物料名称") + private String matName; + + @Schema(description = "物料id") + private Integer mateId; + + @Schema(description = "规格型号") + private String spec; + + @NotBlank(message = "机台编码不能为空") + @Schema(description = "机台编码") + private String machineCd; + + @Schema(description = "机台名称") + private String machineName; + + @Schema(description = "机台id") + private Integer machineId; + + @Schema(description = "流程ID") + private String flowId; + + @Schema(description = "流程任务ID") + private String flowTaskId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamPagination.java new file mode 100644 index 0000000..ba18d61 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamPagination.java @@ -0,0 +1,48 @@ +package jnpf.model.machine; + +import jnpf.base.Pagination; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class MachineParamPagination extends Pagination { + + @Schema(description = "selectKey") + private String selectKey; + + @Schema(description = "json") + private String json; + + @Schema(description = "数据类型") + private String dataType; + + @Schema(description = "特殊查询json") + private String superQueryJson; + + @Schema(description = "模块id") + private String moduleId; + + @Schema(description = "菜单id") + private String menuId; + + @Schema(description = "工序编码") + private String procCd; + + @Schema(description = "工序名称") + private String procName; + + @Schema(description = "物料编码") + private String matCode; + + @Schema(description = "物料名称") + private String matName; + + @Schema(description = "机台编码") + private String machineCd; + + @Schema(description = "机台名称") + private String machineName; + + @Schema(description = "状态(1启用 2 未启用)") + private String enabledStatus; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamEntity.java new file mode 100644 index 0000000..4679bfb --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamEntity.java @@ -0,0 +1,68 @@ +package jnpf.model.proc; + + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; + +@Data +@TableName("tba_proc_param") +public class ProcParamEntity { + + @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", updateStrategy = FieldStrategy.IGNORED) + private String flowId; + + @TableField(value = "f_flow_task_id", updateStrategy = FieldStrategy.IGNORED) + private String flowTaskId; + + @TableField("proc_cd") + private String procCd; + + @TableField("proc_name") + private String procName; + + @TableField(value = "enabled_status", updateStrategy = FieldStrategy.IGNORED) + private String enabledStatus; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("proc_id") + private Integer procId; + + @TableField("proc_param_name") + private String procParamName; + + @TableField("proc_param_unit") + private String procParamUnit; + + @TableField("proc_param_type") + private String procParamType; + + @TableField(exist = false) + private String createUserName; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamForm.java new file mode 100644 index 0000000..2843c5e --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamForm.java @@ -0,0 +1,44 @@ +package jnpf.model.proc; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import javax.validation.constraints.NotBlank; + +@Data +public class ProcParamForm { + + @Schema(description = "主键") + private String id; + + @NotBlank(message = "工序编码不能为空") + @Schema(description = "工序编码") + private String procCd; + + @Schema(description = "工序名称") + private String procName; + + @Schema(description = "状态(1启用 2 未启用)") + private String enabledStatus; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "工序id") + private Integer procId; + + @NotBlank(message = "参数名称不能为空") + @Schema(description = "参数名称") + private String procParamName; + + @Schema(description = "参数单位") + private String procParamUnit; + + @Schema(description = "参数类别(1 温度 2压力 3 时间 4速度)") + private String procParamType; + + @Schema(description = "流程ID") + private String flowId; + + @Schema(description = "流程任务ID") + private String flowTaskId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamPagination.java new file mode 100644 index 0000000..d21dcd4 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcParamPagination.java @@ -0,0 +1,43 @@ + +package jnpf.model.proc; + +import jnpf.base.Pagination; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class ProcParamPagination extends Pagination { + + @Schema(description = "selectKey") + private String selectKey; + + @Schema(description = "json") + private String json; + + @Schema(description = "数据类型") + private String dataType; + + @Schema(description = "特殊查询json") + private String superQueryJson; + + @Schema(description = "模块id") + private String moduleId; + + @Schema(description = "菜单id") + private String menuId; + + @Schema(description = "工序编码") + private String procCd; + + @Schema(description = "工序名称") + private String procName; + + @Schema(description = "参数名称") + private String procParamName; + + @Schema(description = "参数类别(1 温度 2压力 3 时间 4速度)") + private String procParamType; + + @Schema(description = "状态(1启用 2 未启用)") + private String enabledStatus; +} 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 dfa7255..3df2ea6 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 @@ -6,17 +6,32 @@ export const dictMaps = { proStatus: { '0': '正常', '1': '部分转生产', '2': '全部转生产' }, // 行状态 orderItemStatus: { '0': '正常', '1': '部分转产', '2': '全部转产', '9': '关闭' }, + // 参数类别 + paramType: { '1': '温度', '2': '压力', '3': '时间', '4': '速度' }, + // 启用状态 + enabledStatus: { '1': '启用', '2': '未启用' }, }; -// 根据映射自动生成下拉选项 +// 根据映射自动生成下拉选项（使用id和fullName字段） export const dictOptions = {}; +export const dictProps = { label: "fullName", value: "id" }; + for (const key in dictMaps) { const map = dictMaps[key]; - dictOptions[key] = Object.entries(map).map(([enCode, fullName]) => ({ enCode, fullName })); + // id保持为字符串类型，与字典映射的键类型保持一致 + dictOptions[key] = Object.entries(map).map(([id, fullName]) => ({ id, fullName })); } // 获取显示名称 export function getLabel(type, value) { const map = dictMaps[type]; - return map ? (map[value] || value) : value; + if (!map) return value; + // 确保value是字符串类型，以便正确匹配字典映射 + return map[String(value)] || value; } + +// 快捷导出常用选项 +export const paramTypeOptions = dictOptions.paramType; +export const enabledStatusOptions = dictOptions.enabledStatus; + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue new file mode 100644 index 0000000..280b638 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue @@ -0,0 +1,265 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/index.vue new file mode 100644 index 0000000..dbc88ee --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/index.vue @@ -0,0 +1,196 @@ + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue new file mode 100644 index 0000000..7cf8004 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue @@ -0,0 +1,231 @@ +NEW_FILE_CODE + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/example/procparam/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/procparam/index.vue new file mode 100644 index 0000000..8d93692 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/example/procparam/index.vue @@ -0,0 +1,203 @@ +NEW_FILE_CODE + + +