Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/controller/CesOrderRepairController.java

@@ -0,0 +1,230 @@
+package org.jeecg.modules.order.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.dto.PostDataDto;
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusMarketCouponsCashUsed;
+import org.jeecg.modules.business.entity.BusMemberCard;
+import org.jeecg.modules.business.enums.CouponsStatusEnum;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.order.entity.CesOrderMessage;
+import org.jeecg.modules.order.entity.CesOrderRepair;
+import org.jeecg.modules.order.service.ICesOrderRepairService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: ces_order_repair
+ * @Author: jeecg-boot
+ * @Date:   2023-03-27
+ * @Version: V1.0
+ */
+@Api(tags="ces_order_repair")
+@RestController
+@RequestMapping("/order/cesOrderRepair")
+@Slf4j
+public class CesOrderRepairController extends JeecgController<CesOrderRepair, ICesOrderRepairService> {
+	@Autowired
+	private ICesOrderRepairService cesOrderRepairService;
+	 @Autowired
+	 private IBusHotelService busHotelService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cesOrderRepair
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_repair-分页列表查询")
+	@ApiOperation(value="ces_order_repair-分页列表查询", notes="ces_order_repair-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CesOrderRepair>> queryPageList(CesOrderRepair cesOrderRepair,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   @RequestParam(name="hotelIds[]",required = false) List<String> hotelIds,
+													   @RequestParam(name="startTime",required = false) String startTime,
+													   @RequestParam(name="endTime",required = false) String endTime,
+								   HttpServletRequest req) {
+		LambdaQueryWrapper<CesOrderRepair> queryWrapper = QueryGenerator.initQueryWrapper(cesOrderRepair, req.getParameterMap()).lambda();
+		if (ObjectUtils.isNotEmpty(hotelIds)) {
+			queryWrapper.and(j -> {
+				for (int k = 0; k < hotelIds.size(); k++) {
+					j = j.or().eq(CesOrderRepair::getHotelId, hotelIds.get(k));
+				}
+			});
+		}
+		if (ObjectUtils.isNotEmpty(startTime)) {
+			queryWrapper.ge(CesOrderRepair::getRepairDate, DateUtil.parseDate(startTime));
+		}
+		if (ObjectUtils.isNotEmpty(endTime)) {
+			queryWrapper.le(CesOrderRepair::getRepairDate, DateUtil.parseDate(endTime));
+		}
+		Page<CesOrderRepair> page = new Page<CesOrderRepair>(pageNo, pageSize);
+		IPage<CesOrderRepair> pageList = cesOrderRepairService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item -> {
+			BusHotel hotle = busHotelService.getById(item.getHotelId());
+			if (hotle != null) {
+				item.setHotelName(hotle.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cesOrderRepair
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_repair-添加")
+	@ApiOperation(value="ces_order_repair-添加", notes="ces_order_repair-添加")
+	//@RequiresPermissions("order:ces_order_repair:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CesOrderRepair cesOrderRepair) {
+		cesOrderRepairService.save(cesOrderRepair);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cesOrderRepair
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_repair-编辑")
+	@ApiOperation(value="ces_order_repair-编辑", notes="ces_order_repair-编辑")
+	//@RequiresPermissions("order:ces_order_repair:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CesOrderRepair cesOrderRepair) {
+		cesOrderRepairService.updateById(cesOrderRepair);
+		return Result.OK("编辑成功!");
+	}
+
+	 /**
+	  * 更改状态
+	  * @param dto
+	  * @return
+	  */
+	 @AutoLog(value = "服务维修订单更改状态")
+	 @ApiOperation(value="服务维修订单更改状态", notes="服务维修订单更改状态")
+	 @RequestMapping(value = "/setStauts", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> setStauts(@RequestBody CesOrderRepair dto) {
+		 LambdaUpdateWrapper<CesOrderRepair> updateWrapper = new UpdateWrapper().lambda();
+		 updateWrapper.set(CesOrderRepair::getStatus, dto.getStatus());
+		 updateWrapper.eq(CesOrderRepair::getId, dto.getId());
+		 cesOrderRepairService.update(updateWrapper);
+		 return Result.OK("编辑成功!");
+	 }
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_repair-通过id删除")
+	@ApiOperation(value="ces_order_repair-通过id删除", notes="ces_order_repair-通过id删除")
+	//@RequiresPermissions("order:ces_order_repair:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cesOrderRepairService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "ces_order_repair-批量删除")
+	@ApiOperation(value="ces_order_repair-批量删除", notes="ces_order_repair-批量删除")
+	//@RequiresPermissions("order:ces_order_repair:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cesOrderRepairService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "ces_order_repair-通过id查询")
+	@ApiOperation(value="ces_order_repair-通过id查询", notes="ces_order_repair-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CesOrderRepair> queryById(@RequestParam(name="id",required=true) String id) {
+		CesOrderRepair cesOrderRepair = cesOrderRepairService.getById(id);
+		if(cesOrderRepair==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cesOrderRepair);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cesOrderRepair
+    */
+    //@RequiresPermissions("order:ces_order_repair:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CesOrderRepair cesOrderRepair) {
+        return super.exportXls(request, cesOrderRepair, CesOrderRepair.class, "ces_order_repair");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("order:ces_order_repair:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CesOrderRepair.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/entity/CesOrderRepair.java

@@ -0,0 +1,96 @@
+package org.jeecg.modules.order.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: ces_order_repair
+ * @Author: jeecg-boot
+ * @Date:   2023-03-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("ces_order_repair")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ces_order_repair对象", description="ces_order_repair")
+public class CesOrderRepair implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**用户ID*/
+	@Excel(name = "用户ID", width = 15)
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+	/**类型 1服务 2维修*/
+	@Excel(name = "类型 1服务 2维修", width = 15)
+    @ApiModelProperty(value = "类型 1服务 2维修")
+    private Integer type;
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+    @ApiModelProperty(value = "订单号")
+    private String orderId;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private String contentBody;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String userName;
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private String userMobile;
+	/**房号*/
+	@Excel(name = "房号", width = 15)
+    @ApiModelProperty(value = "房号")
+    private String roomNo;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**维修时间*/
+	@Excel(name = "维修时间", width = 15, format = "yyyy-MM-dd HH:mm")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @ApiModelProperty(value = "维修时间")
+    private Date repairDate;
+	/**创建时间*/
+	@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 createDate;
+	/**状态 1待处理 2已处理 3已取消*/
+	@Excel(name = "状态 1待处理 2已处理 3已取消", width = 15)
+    @ApiModelProperty(value = "状态 1待处理 2已处理 3已取消")
+    private Integer status;
+
+    @TableField(exist = false)
+    private String hotelName;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/CesOrderRepairMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.order.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.order.entity.CesOrderRepair;
+
+/**
+ * @Description: ces_order_repair
+ * @Author: jeecg-boot
+ * @Date:   2023-03-27
+ * @Version: V1.0
+ */
+public interface CesOrderRepairMapper extends BaseMapper<CesOrderRepair> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/mapper/xml/CesOrderRepairMapper.xml

@@ -0,0 +1,5 @@
+<?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.jeecg.modules.demo.order.mapper.CesOrderRepairMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/ICesOrderRepairService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.order.entity.CesOrderRepair;
+
+/**
+ * @Description: ces_order_repair
+ * @Author: jeecg-boot
+ * @Date:   2023-03-27
+ * @Version: V1.0
+ */
+public interface ICesOrderRepairService extends IService<CesOrderRepair> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/order/service/impl/CesOrderRepairServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.order.service.impl;
+
+import org.jeecg.modules.order.entity.CesOrderRepair;
+import org.jeecg.modules.order.mapper.CesOrderRepairMapper;
+import org.jeecg.modules.order.service.ICesOrderRepairService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: ces_order_repair
+ * @Author: jeecg-boot
+ * @Date:   2023-03-27
+ * @Version: V1.0
+ */
+@Service
+public class CesOrderRepairServiceImpl extends ServiceImpl<CesOrderRepairMapper, CesOrderRepair> implements ICesOrderRepairService {
+
+}