diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryCompanyRecordController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryCompanyRecordController.java new file mode 100644 index 000000000..72e55a56c --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/WineryCompanyRecordController.java @@ -0,0 +1,193 @@ +package com.ruoyi.winery.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + +import java.util.List; +import java.util.Arrays; + +import com.ruoyi.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.winery.domain.WineryCompanyRecord; +import com.ruoyi.winery.service.IWineryCompanyRecordService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 酒庄厂家登记记录Controller + * + * @author ruoyi + * @date 2020-12-18 + */ +@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RestController +@RequestMapping("/winery/winery_company_record") +public class WineryCompanyRecordController extends BaseController { + + private final IWineryCompanyRecordService iWineryCompanyRecordService; + + /** + * 查询酒庄厂家登记记录列表 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:list')") + @GetMapping("/list") + public TableDataInfo list(WineryCompanyRecord wineryCompanyRecord) { + startPage(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(wineryCompanyRecord); + if (StringUtils.isNotBlank(wineryCompanyRecord.getStatus())) { + lqw.eq(WineryCompanyRecord::getStatus, wineryCompanyRecord.getStatus()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getOpenid())) { + lqw.eq(WineryCompanyRecord::getOpenid, wineryCompanyRecord.getOpenid()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getEmail())) { + lqw.eq(WineryCompanyRecord::getEmail, wineryCompanyRecord.getEmail()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getPersonName())) { + lqw.like(WineryCompanyRecord::getPersonName, wineryCompanyRecord.getPersonName()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getMobile())) { + lqw.eq(WineryCompanyRecord::getMobile, wineryCompanyRecord.getMobile()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getWineryName())) { + lqw.like(WineryCompanyRecord::getWineryName, wineryCompanyRecord.getWineryName()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getBuildTime())) { + lqw.eq(WineryCompanyRecord::getBuildTime, wineryCompanyRecord.getBuildTime()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getRegion())) { + lqw.eq(WineryCompanyRecord::getRegion, wineryCompanyRecord.getRegion()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getAddress())) { + lqw.eq(WineryCompanyRecord::getAddress, wineryCompanyRecord.getAddress()); + } + if (wineryCompanyRecord.getWineryArea() != null) { + lqw.eq(WineryCompanyRecord::getWineryArea, wineryCompanyRecord.getWineryArea()); + } + if (wineryCompanyRecord.getBuildArea() != null) { + lqw.eq(WineryCompanyRecord::getBuildArea, wineryCompanyRecord.getBuildArea()); + } + if (wineryCompanyRecord.getWineryStatus() != null) { + lqw.eq(WineryCompanyRecord::getWineryStatus, wineryCompanyRecord.getWineryStatus()); + } + if (wineryCompanyRecord.getPlantArea() != null) { + lqw.eq(WineryCompanyRecord::getPlantArea, wineryCompanyRecord.getPlantArea()); + } + if (wineryCompanyRecord.getPlantWeight() != null) { + lqw.eq(WineryCompanyRecord::getPlantWeight, wineryCompanyRecord.getPlantWeight()); + } + if (wineryCompanyRecord.getSoilType() != null) { + lqw.eq(WineryCompanyRecord::getSoilType, wineryCompanyRecord.getSoilType()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getRedVariety())) { + lqw.eq(WineryCompanyRecord::getRedVariety, wineryCompanyRecord.getRedVariety()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getWhiteVariety())) { + lqw.eq(WineryCompanyRecord::getWhiteVariety, wineryCompanyRecord.getWhiteVariety()); + } + if (wineryCompanyRecord.getIrrigationType() != null) { + lqw.eq(WineryCompanyRecord::getIrrigationType, wineryCompanyRecord.getIrrigationType()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getFermentationProcess())) { + lqw.eq(WineryCompanyRecord::getFermentationProcess, wineryCompanyRecord.getFermentationProcess()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getContainer())) { + lqw.eq(WineryCompanyRecord::getContainer, wineryCompanyRecord.getContainer()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getClarificationMethod())) { + lqw.eq(WineryCompanyRecord::getClarificationMethod, wineryCompanyRecord.getClarificationMethod()); + } + if (wineryCompanyRecord.getAnnualOutput() != null) { + lqw.eq(WineryCompanyRecord::getAnnualOutput, wineryCompanyRecord.getAnnualOutput()); + } + if (wineryCompanyRecord.getStock() != null) { + lqw.eq(WineryCompanyRecord::getStock, wineryCompanyRecord.getStock()); + } + if (wineryCompanyRecord.getBucketCount() != null) { + lqw.eq(WineryCompanyRecord::getBucketCount, wineryCompanyRecord.getBucketCount()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getMainPrice())) { + lqw.eq(WineryCompanyRecord::getMainPrice, wineryCompanyRecord.getMainPrice()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getSalesMode())) { + lqw.eq(WineryCompanyRecord::getSalesMode, wineryCompanyRecord.getSalesMode()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getAwards())) { + lqw.eq(WineryCompanyRecord::getAwards, wineryCompanyRecord.getAwards()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getAwardInformation())) { + lqw.eq(WineryCompanyRecord::getAwardInformation, wineryCompanyRecord.getAwardInformation()); + } + if (StringUtils.isNotBlank(wineryCompanyRecord.getSlogan())) { + lqw.eq(WineryCompanyRecord::getSlogan, wineryCompanyRecord.getSlogan()); + } + List list = iWineryCompanyRecordService.list(lqw); + return getDataTable(list); + } + + /** + * 导出酒庄厂家登记记录列表 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:export')") + @Log(title = "酒庄厂家登记记录", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(WineryCompanyRecord wineryCompanyRecord) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(wineryCompanyRecord); + List list = iWineryCompanyRecordService.list(lqw); + ExcelUtil util = new ExcelUtil(WineryCompanyRecord.class); + return util.exportExcel(list, "winery_company_record"); + } + + /** + * 获取酒庄厂家登记记录详细信息 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return AjaxResult.success(iWineryCompanyRecordService.getById(id)); + } + + /** + * 新增酒庄厂家登记记录 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:add')") + @Log(title = "酒庄厂家登记记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WineryCompanyRecord wineryCompanyRecord) { + return toAjax(iWineryCompanyRecordService.save(wineryCompanyRecord) ? 1 : 0); + } + + /** + * 修改酒庄厂家登记记录 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:edit')") + @Log(title = "酒庄厂家登记记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WineryCompanyRecord wineryCompanyRecord) { + return toAjax(iWineryCompanyRecordService.updateById(wineryCompanyRecord) ? 1 : 0); + } + + /** + * 删除酒庄厂家登记记录 + */ + @PreAuthorize("@ss.hasPermi('winery:winery_company_record:remove')") + @Log(title = "酒庄厂家登记记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(iWineryCompanyRecordService.removeByIds(Arrays.asList(ids)) ? 1 : 0); + } +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryCompanyRecord.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryCompanyRecord.java new file mode 100644 index 000000000..b257d33ad --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/WineryCompanyRecord.java @@ -0,0 +1,163 @@ +package com.ruoyi.winery.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.winery.enums.IrrigationTypeEnum; +import com.ruoyi.winery.enums.SoilTypeEnum; +import com.ruoyi.winery.enums.WineryStatusEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.Accessors; +import com.ruoyi.common.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 酒庄厂家登记记录对象 winery_company_record + * + * @author ruoyi + * @date 2020-12-18 + */ +@Data +@ToString +@EqualsAndHashCode +@NoArgsConstructor +@Accessors(chain = true) +@TableName("winery_company_record") +public class WineryCompanyRecord implements Serializable { + +private static final long serialVersionUID=1L; + + + /** id */ + @TableId(value = "id") + private String id; + + /** 状态 */ + @Excel(name = "状态") + private String status; + + /** 创建时间 */ + private Date createTime; + + /** 更新时间 */ + private Date updateTime; + + /** 创建者openid */ + @Excel(name = "创建者openid") + private String openid; + + /** 联系邮箱 */ + @Excel(name = "联系邮箱") + private String email; + + /** 联系人姓名 */ + @Excel(name = "联系人姓名") + private String personName; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String mobile; + + /** 酒庄名称 */ + @Excel(name = "酒庄名称") + private String wineryName; + + /** 建立时间 */ + @Excel(name = "建立时间") + private String buildTime; + + /** 酒庄地址(区) */ + @Excel(name = "酒庄地址" , readConverterExp = "区=") + private String region; + + /** 酒庄地址(具体) */ + @Excel(name = "酒庄地址" , readConverterExp = "具=体") + private String address; + + /** 总面积 */ + @Excel(name = "总面积") + private Long wineryArea; + + /** 建筑面积 */ + @Excel(name = "建筑面积") + private Long buildArea; + + /** 酒庄现状 */ + @Excel(name = "酒庄现状") + private WineryStatusEnum wineryStatus; + + /** 面积(亩) */ + @Excel(name = "面积" , readConverterExp = "亩=") + private Long plantArea; + + /** 产量(斤) */ + @Excel(name = "产量" , readConverterExp = "斤=") + private Long plantWeight; + + /** 土壤类型 */ + @Excel(name = "土壤类型") + private SoilTypeEnum soilType; + + /** 红葡萄品种 */ + @Excel(name = "红葡萄品种") + private String redVariety; + + /** 白葡萄品种 */ + @Excel(name = "白葡萄品种") + private String whiteVariety; + + /** 灌溉方式 */ + @Excel(name = "灌溉方式") + private IrrigationTypeEnum irrigationType; + + /** 发酵工艺 */ + @Excel(name = "发酵工艺") + private String fermentationProcess; + + /** 热化容器 */ + @Excel(name = "热化容器") + private String container; + + /** 澄清方式 */ + @Excel(name = "澄清方式") + private String clarificationMethod; + + /** 年产量 */ + @Excel(name = "年产量") + private Long annualOutput; + + /** 库存 */ + @Excel(name = "库存") + private Long stock; + + /** 酒桶数量 */ + @Excel(name = "酒桶数量") + private Long bucketCount; + + /** 主要产品定价 */ + @Excel(name = "主要产品定价") + private String mainPrice; + + /** 销售方式 */ + @Excel(name = "销售方式") + private String salesMode; + + /** 获奖种类 */ + @Excel(name = "获奖种类") + private String awards; + + /** 获奖信息 */ + @Excel(name = "获奖信息") + private String awardInformation; + + /** 征集口号 */ + @Excel(name = "征集口号") + private String slogan; +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/enums/IrrigationTypeEnum.java b/hope-winery/src/main/java/com/ruoyi/winery/enums/IrrigationTypeEnum.java new file mode 100644 index 000000000..987ea46c2 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/enums/IrrigationTypeEnum.java @@ -0,0 +1,45 @@ +package com.ruoyi.winery.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +/** + * 灌溉方式状态枚举 + * + * @author tottimctj + */ +@Getter +public enum IrrigationTypeEnum { + + /** + * 数据当前状态 + */ + OVERFLOWING("OVERFLOWING", "漫灌"), + SPRINKLER("SPRINKLER", "喷灌"), + DRIP("DRIP", "滴灌"); + + + @EnumValue + private final String value; + + @JsonValue + private final String desc; + + IrrigationTypeEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + + public static IrrigationTypeEnum parseEnum(String desc) { + + if (desc.equals(OVERFLOWING.desc)) { + return OVERFLOWING; + } else if (desc.equals(SPRINKLER.desc)) { + return SPRINKLER; + } else { + return DRIP; + } + } + +} \ No newline at end of file diff --git a/hope-winery/src/main/java/com/ruoyi/winery/enums/SoilTypeEnum.java b/hope-winery/src/main/java/com/ruoyi/winery/enums/SoilTypeEnum.java new file mode 100644 index 000000000..ae36c3a4a --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/enums/SoilTypeEnum.java @@ -0,0 +1,47 @@ +package com.ruoyi.winery.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +/** + * 土壤类型状态枚举 + * + * @author tottimctj + */ +@Getter +public enum SoilTypeEnum { + + /** + * 数据当前状态 + */ + SAND("SAND", "沙石"), + STONE("STONE", "砾石"), + LIMESTONE("LIMESTONE", "石灰岩"), + MIXING("MIXING", "混合"); + + @EnumValue + private final String value; + + @JsonValue + private final String desc; + + SoilTypeEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + + public static SoilTypeEnum parseEnum(String desc) { + + if (desc.equals(SAND.desc)) { + return SAND; + } else if (desc.equals(STONE.desc)) { + return STONE; + } else if (desc.equals(LIMESTONE.desc)) { + return LIMESTONE; + } else { + return MIXING; + } + } + +} \ No newline at end of file diff --git a/hope-winery/src/main/java/com/ruoyi/winery/enums/StateEnum.java b/hope-winery/src/main/java/com/ruoyi/winery/enums/StateEnum.java new file mode 100644 index 000000000..18fedc07b --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/enums/StateEnum.java @@ -0,0 +1,33 @@ +package com.ruoyi.winery.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +/** + * 数据状态枚举 + * + * @author zyArcher + */ +@Getter +public enum StateEnum { + + /** + * 数据当前状态 + */ + OFF("OFF", "停用"), + ON("ON", "启用"), + DEL("DEL", "删除"); + + @EnumValue + private final String value; + + @JsonValue + private final String desc; + + StateEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + +} \ No newline at end of file diff --git a/hope-winery/src/main/java/com/ruoyi/winery/enums/WineryStatusEnum.java b/hope-winery/src/main/java/com/ruoyi/winery/enums/WineryStatusEnum.java new file mode 100644 index 000000000..9b618aebd --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/enums/WineryStatusEnum.java @@ -0,0 +1,48 @@ +package com.ruoyi.winery.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +/** + * 酒庄状态枚举 + * + * @author tottimctj + */ +@Getter +public enum WineryStatusEnum { + + /** + * 数据当前状态 + */ + PRODUCE("PRODUCE", "已建成投产"), + BUILDING_PRODUCE("BUILDING_PRODUCE", "在建已投产"), + BUILDING("BUILDING", "在建未投产"), + STOP("STOP", "已停产"); + + @EnumValue + private final String value; + + @JsonValue + private final String desc; + + WineryStatusEnum(final String value, final String desc) { + this.value = value; + this.desc = desc; + } + + public static WineryStatusEnum parseEnum(String desc) { + + if (desc.equals(BUILDING.desc)) { + return BUILDING; + } else if (desc.equals(BUILDING_PRODUCE.desc)) { + return BUILDING_PRODUCE; + } else if (desc.equals(PRODUCE.desc)) { + return PRODUCE; + } else { + return STOP; + } + } + + +} \ No newline at end of file diff --git a/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryCompanyRecordMapper.java b/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryCompanyRecordMapper.java new file mode 100644 index 000000000..a387cf0e7 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/mapper/WineryCompanyRecordMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.mapper; + +import com.ruoyi.winery.domain.WineryCompanyRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 酒庄厂家登记记录Mapper接口 + * + * @author ruoyi + * @date 2020-12-18 + */ +public interface WineryCompanyRecordMapper extends BaseMapper { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryCompanyRecordService.java b/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryCompanyRecordService.java new file mode 100644 index 000000000..b89c14967 --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/IWineryCompanyRecordService.java @@ -0,0 +1,14 @@ +package com.ruoyi.winery.service; + +import com.ruoyi.winery.domain.WineryCompanyRecord; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 酒庄厂家登记记录Service接口 + * + * @author ruoyi + * @date 2020-12-18 + */ +public interface IWineryCompanyRecordService extends IService { + +} diff --git a/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryCompanyRecordServiceImpl.java b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryCompanyRecordServiceImpl.java new file mode 100644 index 000000000..3b149befc --- /dev/null +++ b/hope-winery/src/main/java/com/ruoyi/winery/service/impl/WineryCompanyRecordServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.winery.service.impl; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.winery.mapper.WineryCompanyRecordMapper; +import com.ruoyi.winery.domain.WineryCompanyRecord; +import com.ruoyi.winery.service.IWineryCompanyRecordService; + +/** + * 酒庄厂家登记记录Service业务层处理 + * + * @author ruoyi + * @date 2020-12-18 + */ +@Service +public class WineryCompanyRecordServiceImpl extends ServiceImpl implements IWineryCompanyRecordService { + +} diff --git a/ruoyi-ui/src/api/winery/winery_company_record.js b/ruoyi-ui/src/api/winery/winery_company_record.js new file mode 100644 index 000000000..4a43b9edf --- /dev/null +++ b/ruoyi-ui/src/api/winery/winery_company_record.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询酒庄厂家登记记录列表 +export function listWinery_company_record(query) { + return request({ + url: '/winery/winery_company_record/list', + method: 'get', + params: query + }) +} + +// 查询酒庄厂家登记记录详细 +export function getWinery_company_record(id) { + return request({ + url: '/winery/winery_company_record/' + id, + method: 'get' + }) +} + +// 新增酒庄厂家登记记录 +export function addWinery_company_record(data) { + return request({ + url: '/winery/winery_company_record', + method: 'post', + data: data + }) +} + +// 修改酒庄厂家登记记录 +export function updateWinery_company_record(data) { + return request({ + url: '/winery/winery_company_record', + method: 'put', + data: data + }) +} + +// 删除酒庄厂家登记记录 +export function delWinery_company_record(id) { + return request({ + url: '/winery/winery_company_record/' + id, + method: 'delete' + }) +} + +// 导出酒庄厂家登记记录 +export function exportWinery_company_record(query) { + return request({ + url: '/winery/winery_company_record/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/winery/winery_company_record/index.vue b/ruoyi-ui/src/views/winery/winery_company_record/index.vue new file mode 100644 index 000000000..60d2e61ea --- /dev/null +++ b/ruoyi-ui/src/views/winery/winery_company_record/index.vue @@ -0,0 +1,750 @@ + + +