diff --git a/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue b/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue new file mode 100644 index 00000000..228f5493 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue @@ -0,0 +1,285 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/ZyHangPointList.vue b/ant-design-vue-jeecg/src/views/hanger/ZyHangPointList.vue new file mode 100644 index 00000000..ce4cb2f1 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/ZyHangPointList.vue @@ -0,0 +1,183 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue new file mode 100644 index 00000000..f8e1ad1d --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue @@ -0,0 +1,225 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal.vue new file mode 100644 index 00000000..ac2423ef --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal__Style#Drawer.vue new file mode 100644 index 00000000..297b3480 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointForm.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointForm.vue new file mode 100644 index 00000000..f31173ae --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointForm.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal.vue new file mode 100644 index 00000000..884b144e --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal__Style#Drawer.vue new file mode 100644 index 00000000..30a01652 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangPointModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue index 14e63ec8..2429657f 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyProductPlanList.vue @@ -313,7 +313,6 @@ export default { getPaiWeiTu(record) { // alert(JSON.stringify(record)); - alert("请稍等，正在开发中。。。") getAction(this.url.paiweitu, record).then((res) => { if (res.success) { console.log("the paiweitu----------" + JSON.stringify(res.result)) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangController.java new file mode 100644 index 00000000..c86750ca --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangController.java @@ -0,0 +1,214 @@ +package org.jeecg.modules.hanger.controller; + + +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.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.WriterException; +import com.google.zxing.client.j2se.MatrixToImageWriter; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.hanger.entity.ZyHang; +import org.jeecg.modules.hanger.service.IZyHangService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.*; + +/** + * @Description: 吊挂表 + * @Author: jeecg-boot + * @Date: 2023-02-02 + * @Version: V1.0 + */ +@Api(tags = "吊挂表") +@RestController +@RequestMapping("/org.jeecg.modules.hanger/zyHang") +@Slf4j +public class ZyHangController extends JeecgController { + @Autowired + private IZyHangService zyHangService; + + /** + * 分页列表查询 + * + * @param zyHang + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "吊挂表-分页列表查询") + @ApiOperation(value = "吊挂表-分页列表查询", notes = "吊挂表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyHang zyHang, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyHang, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyHangService.page(page, queryWrapper); + if (!ObjectUtils.isEmpty(pageList)) { + Map hints = new HashMap(); + //设置UTF-8， 防止中文乱码 + hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); + //设置二维码四周白色区域的大小 + hints.put(EncodeHintType.MARGIN, 1); + //设置二维码的容错性 + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); + //width:图片完整的宽;height:图片完整的高 + //因为要在二维码下方附上文字，所以把图片设置为长方形（高大于宽） + int width = 150; + int height = 150; + //画二维码，记得调用multiFormatWriter.encode()时最后要带上hints参数，不然上面设置无效 + QRCodeWriter qrCodeWriter = new QRCodeWriter(); +// List img = new ArrayList<>(); + String content = ""; + //批量生成二维码 + try { + for (int i = 0; i < pageList.getRecords().size(); i++) { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + content = pageList.getRecords().get(i).getCode(); + BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, width, height, hints); + MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream); + Base64.Encoder encoder = Base64.getEncoder(); + String text = encoder.encodeToString(outputStream.toByteArray()); + pageList.getRecords().get(i).setQrcode("data:image/png;base64," + text); + } + } catch (Exception e) { + log.error("获取吊挂信息-异常-{},{}", e, e.getMessage()); + Result.error("获取数据失败"); + } + } + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyHang + * @return + */ + @AutoLog(value = "吊挂表-添加") + @ApiOperation(value = "吊挂表-添加", notes = "吊挂表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyHang zyHang) { + List list = zyHangService.list(new LambdaQueryWrapper() + .eq(ZyHang::getStatus, "0") + .orderByDesc(ZyHang::getCode)); + String code = ""; + if (ObjectUtils.isEmpty(list)) { + code = "DG1000"; + } else { + String[] dgs = list.get(0).getCode().split("DG"); + int val = new Integer(dgs[1]).intValue() + 1; + code = "DG" + val + ""; + } + zyHang.setCode(code); + zyHang.setStatus("0"); + zyHangService.save(zyHang); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyHang + * @return + */ + @AutoLog(value = "吊挂表-编辑") + @ApiOperation(value = "吊挂表-编辑", notes = "吊挂表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyHang zyHang) { + zyHang.setQrcode(""); + zyHangService.updateById(zyHang); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "吊挂表-通过id删除") + @ApiOperation(value = "吊挂表-通过id删除", notes = "吊挂表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + zyHangService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "吊挂表-批量删除") + @ApiOperation(value = "吊挂表-批量删除", notes = "吊挂表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.zyHangService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "吊挂表-通过id查询") + @ApiOperation(value = "吊挂表-通过id查询", notes = "吊挂表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ZyHang zyHang = zyHangService.getById(id); + if (zyHang == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyHang); + } + + /** + * 导出excel + * + * @param request + * @param zyHang + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyHang zyHang) { + return super.exportXls(request, zyHang, ZyHang.class, "吊挂表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyHang.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java new file mode 100644 index 00000000..44a2db0c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/ZyHangPointController.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.hanger.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.hanger.entity.ZyHangPoint; +import org.jeecg.modules.hanger.service.IZyHangPointService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + +/** + * @Description: 吊挂工位表 + * @Author: jeecg-boot + * @Date: 2023-02-03 + * @Version: V1.0 + */ +@Api(tags = "吊挂工位表") +@RestController +@RequestMapping("/org.jeecg.modules.hanger/zyHangPoint") +@Slf4j +public class ZyHangPointController extends JeecgController { + @Autowired + private IZyHangPointService zyHangPointService; + + /** + * 分页列表查询 + * + * @param zyHangPoint + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "吊挂工位表-分页列表查询") + @ApiOperation(value = "吊挂工位表-分页列表查询", notes = "吊挂工位表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(ZyHangPoint zyHangPoint, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyHangPoint, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = zyHangPointService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param zyHangPoint + * @return + */ + @AutoLog(value = "吊挂工位表-添加") + @ApiOperation(value = "吊挂工位表-添加", notes = "吊挂工位表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody ZyHangPoint zyHangPoint) { + zyHangPointService.save(zyHangPoint); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param zyHangPoint + * @return + */ + @AutoLog(value = "吊挂工位表-编辑") + @ApiOperation(value = "吊挂工位表-编辑", notes = "吊挂工位表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody ZyHangPoint zyHangPoint) { + zyHangPointService.updateById(zyHangPoint); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "吊挂工位表-通过id删除") + @ApiOperation(value = "吊挂工位表-通过id删除", notes = "吊挂工位表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + zyHangPointService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "吊挂工位表-批量删除") + @ApiOperation(value = "吊挂工位表-批量删除", notes = "吊挂工位表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.zyHangPointService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "吊挂工位表-通过id查询") + @ApiOperation(value = "吊挂工位表-通过id查询", notes = "吊挂工位表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ZyHangPoint zyHangPoint = zyHangPointService.getById(id); + if (zyHangPoint == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(zyHangPoint); + } + + /** + * 导出excel + * + * @param request + * @param zyHangPoint + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ZyHangPoint zyHangPoint) { + return super.exportXls(request, zyHangPoint, ZyHangPoint.class, "吊挂工位表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ZyHangPoint.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHang.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHang.java new file mode 100644 index 00000000..ce45211c --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHang.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.hanger.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 吊挂表 + * @Author: jeecg-boot + * @Date: 2023-02-02 + * @Version: V1.0 + */ +@Data +@TableName("zy_hang") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "zy_hang对象", description = "吊挂表") +public class ZyHang implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /** + * 车间 + */ + @Excel(name = "车间", width = 15) + @ApiModelProperty(value = "车间") + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + private String workshopId; + /** + * 品牌 + */ + @Excel(name = "品牌", width = 15) + @ApiModelProperty(value = "品牌") + private String brand; + /** + * 型号 + */ + @Excel(name = "型号", width = 15) + @ApiModelProperty(value = "型号") + private String model; + /** + * 编号 + */ + @Excel(name = "编号", width = 15) + @ApiModelProperty(value = "编号") + private String code; + /** + * 工站数 + */ + @Excel(name = "工站数", width = 15) + @ApiModelProperty(value = "工站数") + private Integer pointnumber; + /** + * 购买时间 + */ + @Excel(name = "购买时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "购买时间") + private Date buydate; + /** + * 经办人 + */ + @Excel(name = "经办人", width = 15) + @ApiModelProperty(value = "经办人") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + private String agent; + /** + * 状态 + */ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + @Dict(dicCode = "devicestatus1") + private String status; + /** + * 二维码 + */ + @Excel(name = "二维码", width = 15) + @ApiModelProperty(value = "二维码") + private String qrcode; + /** + * 维护周期 + */ + @Excel(name = "维护周期", width = 15) + @ApiModelProperty(value = "维护周期") + private Integer maintenancecycle; + /** + * 管理 人 + */ + @Excel(name = "管理人", width = 15) + @ApiModelProperty(value = "管理人") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + private String administrator; + /** + * 上次维护时间 + */ + @Excel(name = "上次维护时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "上次维护时间") + private Date maintenancedate; + /** + * 图片 + */ + @Excel(name = "图片", width = 15) + @ApiModelProperty(value = "图片") + private String img; + /** + * 3d模型 + */ + @Excel(name = "3d模型", width = 15) + @ApiModelProperty(value = "3d模型") + private String img3d; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHangPoint.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHangPoint.java new file mode 100644 index 00000000..eb0d0f24 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/ZyHangPoint.java @@ -0,0 +1,81 @@ +package org.jeecg.modules.hanger.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 吊挂工位表 + * @Author: jeecg-boot + * @Date: 2023-02-03 + * @Version: V1.0 + */ +@Data +@TableName("zy_hang_point") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "zy_hang_point对象", description = "吊挂工位表") +public class ZyHangPoint implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /** + * 吊挂编号 + */ + @Excel(name = "吊挂编号", width = 15) + @ApiModelProperty(value = "吊挂编号") + private String code; + /** + * 工站编号 + */ + @Excel(name = "工站编号", width = 15) + @ApiModelProperty(value = "工站编号") + private String point; + /** + * 工位id + */ + @Excel(name = "工位id", width = 15) + @ApiModelProperty(value = "工位id") + private String stationId; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangMapper.java new file mode 100644 index 00000000..769d78bd --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangMapper.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.hanger.entity.ZyHang; + +/** + * @Description: 吊挂表 + * @Author: jeecg-boot + * @Date: 2023-02-02 + * @Version: V1.0 + */ +public interface ZyHangMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangPointMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangPointMapper.java new file mode 100644 index 00000000..045a7fc2 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/ZyHangPointMapper.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.hanger.entity.ZyHangPoint; + +/** + * @Description: 吊挂工位表 + * @Author: jeecg-boot + * @Date: 2023-02-03 + * @Version: V1.0 + */ +public interface ZyHangPointMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java new file mode 100644 index 00000000..054f8193 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangPointService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.hanger.entity.ZyHangPoint; + +/** + * @Description: 吊挂工位表 + * @Author: jeecg-boot + * @Date: 2023-02-03 + * @Version: V1.0 + */ +public interface IZyHangPointService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangService.java new file mode 100644 index 00000000..8b12290b --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IZyHangService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.service; + + +import org.jeecg.modules.hanger.entity.ZyHang; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 吊挂表 + * @Author: jeecg-boot + * @Date: 2023-02-02 + * @Version: V1.0 + */ +public interface IZyHangService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java new file mode 100644 index 00000000..e6e580a3 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangPointServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.hanger.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.hanger.entity.ZyHangPoint; +import org.jeecg.modules.hanger.mapper.ZyHangPointMapper; +import org.jeecg.modules.hanger.service.IZyHangPointService; +import org.springframework.stereotype.Service; + +/** + * @Description: 吊挂工位表 + * @Author: jeecg-boot + * @Date: 2023-02-03 + * @Version: V1.0 + */ +@Service +public class ZyHangPointServiceImpl extends ServiceImpl implements IZyHangPointService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangServiceImpl.java new file mode 100644 index 00000000..ba2daec4 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/ZyHangServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.hanger.service.impl; + +import org.jeecg.modules.hanger.entity.ZyHang; +import org.jeecg.modules.hanger.mapper.ZyHangMapper; +import org.jeecg.modules.hanger.service.IZyHangService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 吊挂表 + * @Author: jeecg-boot + * @Date: 2023-02-02 + * @Version: V1.0 + */ +@Service +public class ZyHangServiceImpl extends ServiceImpl implements IZyHangService { + +}