diff --git a/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue new file mode 100644 index 00000000..41d12dc2 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/HangRecordList.vue @@ -0,0 +1,187 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue new file mode 100644 index 00000000..e92dcd14 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/HangerManage.vue @@ -0,0 +1,495 @@ + + + diff --git a/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue b/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue index 228f5493..7c7b7de2 100644 --- a/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue +++ b/ant-design-vue-jeecg/src/views/hanger/ZyHangList.vue @@ -45,10 +45,6 @@
新增 导出 - - - @@ -117,6 +113,8 @@ 编辑 + 管理 + 删除 @@ -146,6 +144,14 @@ export default { return { description: '吊挂表管理页面', // 表头 + labelCol: { + xs: {span: 12}, + sm: {span: 5}, + }, + wrapperCol: { + xs: {span: 12}, + sm: {span: 16}, + }, columns: [ { title: '#', @@ -250,36 +256,18 @@ export default { } }, created() { - this.getSuperFieldList(); - }, - computed: { - importExcelUrl: function () { - return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; - }, + // this.getSuperFieldList(); }, + computed: {}, methods: { - initDictConfig() { + jumpPage1(record) { + this.$router.push({ + path: '/src/views/hanger/HangerManage', + query: { // 路由携带参数 + 'id': record.id, + }, + }); }, - getSuperFieldList() { - let fieldList = []; - fieldList.push({type: 'string', value: 'brand', text: '品牌', dictCode: ''}) - fieldList.push({type: 'string', value: 'model', text: '型号', dictCode: ''}) - fieldList.push({type: 'string', value: 'code', text: '编号', dictCode: ''}) - fieldList.push({type: 'int', value: 'pointnumber', text: '工站数', dictCode: ''}) - fieldList.push({type: 'string', value: 'buydate', text: '购买时间', dictCode: ''}) - fieldList.push({type: 'string', value: 'agent', text: '经办人', dictCode: ''}) - fieldList.push({type: 'string', value: 'status', text: '状态', dictCode: ''}) - fieldList.push({type: 'string', value: 'qrcode', text: '二维码', dictCode: ''}) - fieldList.push({type: 'int', value: 'maintenancecycle', text: '维护周期', dictCode: ''}) - fieldList.push({type: 'string', value: 'administrator', text: '管理 人', dictCode: ''}) - fieldList.push({type: 'string', value: 'maintenancedate', text: '上次维护时间', dictCode: ''}) - fieldList.push({type: 'string', value: 'img', text: '图片', dictCode: ''}) - fieldList.push({type: 'string', value: 'img3d', text: '3d模型', dictCode: ''}) - this.superFieldList = fieldList - } } } - - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordForm.vue b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordForm.vue new file mode 100644 index 00000000..74648793 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordForm.vue @@ -0,0 +1,150 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal.vue b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal.vue new file mode 100644 index 00000000..aaf0c7b6 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal__Style#Drawer.vue b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal__Style#Drawer.vue new file mode 100644 index 00000000..abd63686 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/hanger/modules/HangRecordModal__Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ 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 index 78055be1..149883e5 100644 --- a/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue +++ b/ant-design-vue-jeecg/src/views/hanger/modules/ZyHangForm.vue @@ -109,7 +109,7 @@ export default { return { // enterprisesManager: "sys_user,realname,id", model:{ - status:1, + status:0, }, labelCol: { xs: { span: 24 }, @@ -121,6 +121,10 @@ export default { }, confirmLoading: false, validatorRules: { + workshopId: [ + { required: true,message: "车间不能为空"}, + { pattern: /^.{0,36}$/, message: '长度过长!'}, + ], brand: [ { required: false}, { pattern: /^.{0,36}$/, message: '长度过长!'}, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java new file mode 100644 index 00000000..6dff3325 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/controller/HangRecordController.java @@ -0,0 +1,155 @@ +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.HangRecord; +import org.jeecg.modules.hanger.service.IHangRecordService; +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-06 + * @Version: V1.0 + */ +@Api(tags = "吊挂运行记录表") +@RestController +@RequestMapping("/org.jeecg.modules.hanger/hangRecord") +@Slf4j +public class HangRecordController extends JeecgController { + @Autowired + private IHangRecordService hangRecordService; + + /** + * 分页列表查询 + * + * @param hangRecord + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "吊挂运行记录表-分页列表查询") + @ApiOperation(value = "吊挂运行记录表-分页列表查询", notes = "吊挂运行记录表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(HangRecord hangRecord, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(hangRecord, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = hangRecordService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param hangRecord + * @return + */ + @AutoLog(value = "吊挂运行记录表-添加") + @ApiOperation(value = "吊挂运行记录表-添加", notes = "吊挂运行记录表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody HangRecord hangRecord) { + hangRecordService.save(hangRecord); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param hangRecord + * @return + */ + @AutoLog(value = "吊挂运行记录表-编辑") + @ApiOperation(value = "吊挂运行记录表-编辑", notes = "吊挂运行记录表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody HangRecord hangRecord) { + hangRecordService.updateById(hangRecord); + 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) { + hangRecordService.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.hangRecordService.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) { + HangRecord hangRecord = hangRecordService.getById(id); + if (hangRecord == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(hangRecord); + } + + /** + * 导出excel + * + * @param request + * @param hangRecord + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HangRecord hangRecord) { + return super.exportXls(request, hangRecord, HangRecord.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, HangRecord.class); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java new file mode 100644 index 00000000..f4eea4fc --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/entity/HangRecord.java @@ -0,0 +1,111 @@ +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-06 + * @Version: V1.0 + */ +@Data +@TableName("hang_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "hang_record对象", description = "吊挂运行记录表") +public class HangRecord 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 hangCode; + /** + * 工站编号 + */ + @Excel(name = "工站编号", width = 15) + @ApiModelProperty(value = "工站编号") + private String point; + /** + * 工单编号 + */ + @Excel(name = "工单编号", width = 15) + @ApiModelProperty(value = "工单编号") + private String orderCode; + /** + * 生产开始时间 + */ + @Excel(name = "生产开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "生产开始时间") + private Date workTime; + /** + * 生产结束时间 + */ + @Excel(name = "生产结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "生产结束时间") + private Date offTime; + /** + * 时长 + */ + @Excel(name = "时长", width = 15) + @ApiModelProperty(value = "时长") + private Integer duration; + /** + * 状态 + */ + @Excel(name = "状态", width = 15) + @ApiModelProperty(value = "状态") + @Dict(dicCode = "hang_record_status") + private Integer status; +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/HangRecordMapper.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/HangRecordMapper.java new file mode 100644 index 00000000..5744b32a --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/mapper/HangRecordMapper.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.hanger.entity.HangRecord; + +/** + * @Description: 吊挂运行记录表 + * @Author: jeecg-boot + * @Date: 2023-02-06 + * @Version: V1.0 + */ +public interface HangRecordMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java new file mode 100644 index 00000000..7599dca0 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/IHangRecordService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.hanger.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.hanger.entity.HangRecord; + +/** + * @Description: 吊挂运行记录表 + * @Author: jeecg-boot + * @Date: 2023-02-06 + * @Version: V1.0 + */ +public interface IHangRecordService extends IService { + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.java new file mode 100644 index 00000000..9c222347 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/hanger/service/impl/HangRecordServiceImpl.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.HangRecord; +import org.jeecg.modules.hanger.mapper.HangRecordMapper; +import org.jeecg.modules.hanger.service.IHangRecordService; +import org.springframework.stereotype.Service; + +/** + * @Description: 吊挂运行记录表 + * @Author: jeecg-boot + * @Date: 2023-02-06 + * @Version: V1.0 + */ +@Service +public class HangRecordServiceImpl extends ServiceImpl implements IHangRecordService { + +}