From 24471f4d6978b6dfe23b74298942e7639f3474c2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 20 May 2022 18:17:36 +0800
Subject: [PATCH] 溯源码修改，采收修改
---
src/main/java/org/springblade/modules/traceability/entity/Traceability.java | 53 +++++++++++++++++---------
/dev/null | 15 -------
src/main/java/org/springblade/modules/recovery/entity/Recovery.java | 5 ++
3 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
index af0d347..02a70bf 100644
--- a/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
+++ b/src/main/java/org/springblade/modules/recovery/entity/Recovery.java
@@ -81,4 +81,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 溯源码编号
+ */
+ private String code;
+
}
diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityDetailController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityDetailController.java
deleted file mode 100644
index 0e43ba9..0000000
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityDetailController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.springblade.modules.traceability.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.traceability.entity.TraceabilityDetail;
-import org.springblade.modules.traceability.service.TraceabilityDetailService;
-import org.springblade.modules.traceability.vo.TraceabilityDetailVO;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * 溯源码详细表控制器
- * @since 2022-05-19
- * @author zhongrj
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/traceabilityDetail")
-public class TraceabilityDetailController extends BladeController {
-
- private final TraceabilityDetailService traceabilityDetailService;
-
- /**
- * 详情
- */
- @GetMapping("/detail")
- @ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入traceabilityDetail")
- public R<TraceabilityDetail> detail(TraceabilityDetail traceabilityDetail) {
- TraceabilityDetail detail = traceabilityDetailService.getOne(Condition.getQueryWrapper(traceabilityDetail));
- return R.data(detail);
- }
-
- /**
- * 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入traceabilityDetail")
- public R<IPage<TraceabilityDetail>> list(TraceabilityDetail traceabilityDetail, Query query) {
- IPage<TraceabilityDetail> pages = traceabilityDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(traceabilityDetail));
- return R.data(pages);
- }
-
- /**
- * 自定义分页
- */
- @GetMapping("/page")
- @ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入traceabilityDetail")
- public R<IPage<TraceabilityDetailVO>> page(TraceabilityDetailVO traceabilityDetail, Query query) {
- IPage<TraceabilityDetailVO> pages = traceabilityDetailService.selectTraceabilityDetailPage(Condition.getPage(query), traceabilityDetail);
- return R.data(pages);
- }
-
- /**
- * 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入traceabilityDetail")
- public R save(@Valid @RequestBody TraceabilityDetail traceabilityDetail) {
- return R.status(traceabilityDetailService.save(traceabilityDetail));
- }
-
- /**
- * 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入traceabilityDetail")
- public R update(@Valid @RequestBody TraceabilityDetail traceabilityDetail) {
- return R.status(traceabilityDetailService.updateById(traceabilityDetail));
- }
-
- /**
- * 新增或修改
- */
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入traceabilityDetail")
- public R submit(@Valid @RequestBody TraceabilityDetail traceabilityDetail) {
- return R.status(traceabilityDetailService.saveOrUpdate(traceabilityDetail));
- }
-
-
- /**
- * 删除
- */
- @PostMapping("/remove")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "逻辑删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(traceabilityDetailService.removeByIds(Func.toLongList(ids)));
- }
-
-}
diff --git a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
index eb62b8a..5123024 100644
--- a/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
+++ b/src/main/java/org/springblade/modules/traceability/entity/Traceability.java
@@ -27,6 +27,41 @@
private Integer id;
/**
+ * 商品名称
+ */
+ private String productName;
+
+ /**
+ * 联系电话
+ */
+ private String phone;
+
+ /**
+ * 产地
+ */
+ private String place;
+
+
+ /**
+ * 合格证编号
+ */
+ private String certificationCode;
+
+
+ /**
+ * 承诺依据 0:委托检测 1:自我检测 2:内部质量控制 3:自我承诺
+ */
+ private String according;
+
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
* 溯源码编号
*/
private String code;
@@ -40,23 +75,5 @@
* 是否打印（0：是 1：否）
*/
private String print;
-
-
- /**
- * 溯源码图片url
- */
- private String url;
-
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 采收id(溯源id)
- */
- private Integer recoveryId;
}
diff --git a/src/main/java/org/springblade/modules/traceability/entity/TraceabilityDetail.java b/src/main/java/org/springblade/modules/traceability/entity/TraceabilityDetail.java
deleted file mode 100644
index 0430ee2..0000000
--- a/src/main/java/org/springblade/modules/traceability/entity/TraceabilityDetail.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.springblade.modules.traceability.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 lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 溯源码详细表实体类
- * @since 2022-05-19
- * @author zhongrj
- */
-@Data
-@TableName("sys_traceability_detail")
-public class TraceabilityDetail implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键id
- */
- @TableId(value = "id",type = IdType.AUTO)
- private Integer id;
-
- /**
- * 溯源码id
- */
- private Integer traceabilityId;
-
- /**
- * 商品名称
- */
- private String productName;
-
- /**
- * 联系电话
- */
- private String phone;
-
- /**
- * 产地
- */
- private String place;
-
-
- /**
- * 合格证编号
- */
- private String certificationCode;
-
-
- /**
- * 承诺依据 0:委托检测 1:自我检测 2:内部质量控制 3:自我承诺
- */
- private String according;
-
-
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.java b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.java
deleted file mode 100644
index 6027faa..0000000
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.springblade.modules.traceability.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
-import org.springblade.modules.traceability.entity.TraceabilityDetail;
-import org.springblade.modules.traceability.vo.TraceabilityDetailVO;
-
-import java.util.List;
-
-/**
- * 溯源码详细表Mapper 接口
- * @since 2022-05-19
- * @author zhongrj
- */
-public interface TraceabilityDetailMapper extends BaseMapper<TraceabilityDetail> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param traceabilityDetail
- * @return
- */
- List<TraceabilityDetailVO> selectTraceabilityDetailPage(@Param("page") IPage page, @Param("traceabilityDetail") TraceabilityDetailVO traceabilityDetail);
-
-}
diff --git a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.xml b/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.xml
deleted file mode 100644
index 8ee03e3..0000000
--- a/src/main/java/org/springblade/modules/traceability/mapper/TraceabilityDetailMapper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.modules.traceability.mapper.TraceabilityDetailMapper">
-
- <!--自定义查询溯源码详细分页数据-->
- <select id="selectTraceabilityDetailPage" resultType="org.springblade.modules.traceability.vo.TraceabilityDetailVO">
- select * from sys_traceability_detail
- where 1=1
- </select>
-</mapper>
diff --git a/src/main/java/org/springblade/modules/traceability/service/TraceabilityDetailService.java b/src/main/java/org/springblade/modules/traceability/service/TraceabilityDetailService.java
deleted file mode 100644
index 59fc31a..0000000
--- a/src/main/java/org/springblade/modules/traceability/service/TraceabilityDetailService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-
-package org.springblade.modules.traceability.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.modules.traceability.entity.TraceabilityDetail;
-import org.springblade.modules.traceability.vo.TraceabilityDetailVO;
-
-import java.util.List;
-
-/**
- * 溯源码详细表服务类
- * @since 2022-05-19
- * @author zhongrj
- */
-public interface TraceabilityDetailService extends IService<TraceabilityDetail> {
-
- /**
- * 自定义分页
- *
- * @param page
- * @param traceabilityDetail
- * @return
- */
- IPage<TraceabilityDetailVO> selectTraceabilityDetailPage(IPage<TraceabilityDetailVO> page, TraceabilityDetailVO traceabilityDetail);
-}
diff --git a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityDetailServiceImpl.java b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityDetailServiceImpl.java
deleted file mode 100644
index 5c2e4dd..0000000
--- a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityDetailServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.springblade.modules.traceability.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.modules.traceability.entity.TraceabilityDetail;
-import org.springblade.modules.traceability.mapper.TraceabilityDetailMapper;
-import org.springblade.modules.traceability.service.TraceabilityDetailService;
-import org.springblade.modules.traceability.vo.TraceabilityDetailVO;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 溯源码详细表服务实现类
- * @since 2022-05-19
- * @author zhongrj
- */
-@Service
-public class TraceabilityDetailServiceImpl extends ServiceImpl<TraceabilityDetailMapper, TraceabilityDetail> implements TraceabilityDetailService {
-
- /**
- * 自定义分页
- * @param page
- * @param traceabilityDetail
- * @return
- */
- @Override
- public IPage<TraceabilityDetailVO> selectTraceabilityDetailPage(IPage<TraceabilityDetailVO> page, TraceabilityDetailVO traceabilityDetail) {
- return page.setRecords(baseMapper.selectTraceabilityDetailPage(page, traceabilityDetail));
- }
-}
diff --git a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityDetailVO.java b/src/main/java/org/springblade/modules/traceability/vo/TraceabilityDetailVO.java
deleted file mode 100644
index 4fc9137..0000000
--- a/src/main/java/org/springblade/modules/traceability/vo/TraceabilityDetailVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.springblade.modules.traceability.vo;
-
-import lombok.Data;
-import org.springblade.modules.traceability.entity.TraceabilityDetail;
-
-/**
- * 溯源码详细表VO
- * @since 2022-05-19
- * @author zhongrj
- */
-@Data
-public class TraceabilityDetailVO extends TraceabilityDetail {
- private static final long serialVersionUID = 1L;
-
-}
--
Gitblit v1.9.3