xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActicityStrategy.java
@@ -1,8 +1,10 @@ package com.xiaopeng.api.model.operation; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import com.xiaopeng.common.core.web.domain.BaseModel; import io.swagger.annotations.ApiModel; @@ -44,7 +46,8 @@ private Integer distributionRules; @ApiModelProperty(value = "发放规则json,[]=本券使用后循环发放, [1,2,3]=指定优惠券使用后发放（优惠券id数组）") private String distributionAfterUse; @TableField(typeHandler = JacksonTypeHandler.class) private List<Long> distributionAfterUse; @ApiModelProperty(value = "生效规则（1=次日0点失效，2=领取后指定日期生效）") private Integer effectiveRules; @@ -72,6 +75,7 @@ private Integer repPercent; @ApiModelProperty(value = "使用时间段,时间字符串,开始和结束用,分割拼接成一个字符串，如果只有结束时间还是需要保持逗号,如:[',05:00:00']") @TableField(typeHandler = JacksonTypeHandler.class) private List<String> usagePeriod; @ApiModelProperty(value = "每人限领数量") xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivityNotice.java
@@ -77,6 +77,6 @@ @Max(100) private Integer floatingWindowPriority; @ApiModelProperty(value = "跳转链接") private Boolean linkUrl; private String linkUrl; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskController.java
@@ -1,6 +1,8 @@ package com.xiaopeng.maintenance.controller; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.xiaopeng.api.dto.account.XpOperationsUserPositionDTO; @@ -40,6 +42,7 @@ import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType; import org.apache.shardingsphere.transaction.core.TransactionType; import org.springframework.beans.factory.annotation.Autowired; @@ -54,8 +57,12 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.*; import java.util.stream.Collectors; @@ -310,6 +317,37 @@ return R.ok(xpTaskService.reassignTaskPageList(query)); } @ApiOperation(value = "待改派的工单导出", tags = {"管理后台-运维执行-任务工单-待改派工单"}) @PostMapping("/api/v1/task/reassign/export") public R<?> export(@RequestBody TaskPageListQuery query, HttpServletResponse response) { List<XpTaskVO> list= xpTaskService.exportList(query); Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), XpCruiseCheckInRecordVO.class, list); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); ServletOutputStream outputStream = null; try { String fileName = URLEncoder.encode("巡游打卡记录.xls", "utf-8"); response.setHeader("Content-disposition", "attachment;filename=" + fileName); outputStream = response.getOutputStream(); workbook.write(outputStream); outputStream.flush(); } catch (IOException e) { log.error("导出巡游打卡记录失败", e); } finally { try { if (outputStream != null) { outputStream.close(); } if (workbook != null) { workbook.close(); } } catch (IOException e) { log.error("关闭输出流失败", e); } } return R.ok(); } @Resource XpFleetClient xpFleetClient;
@@ -39,5 +39,7 @@ */ XpTask queryInfoByVehicleId(@Param("vehicleId")Long vehicleId); PageInfo<XpTaskVO> reassignTaskPageList(@Param("pageInfo")PageInfo<TaskPageListQuery> pageInfo, @Param("query")TaskPageListQuery query); List<XpTaskVO> reassignTaskPageList(@Param("pageInfo")PageInfo<XpTaskVO> pageInfo, @Param("query")TaskPageListQuery query); List<XpTaskVO> reassignTaskPageList(TaskPageListQuery query); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/XpTaskService.java
@@ -105,4 +105,6 @@ PageInfo<XpTaskVO> reassignTaskPageList(TaskPageListQuery query); XpTaskVO detail(Long taskId); List<XpTaskVO> exportList(TaskPageListQuery query); } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpTaskServiceImpl.java
@@ -1501,9 +1501,10 @@ @Override public PageInfo<XpTaskVO> reassignTaskPageList(TaskPageListQuery query) { PageInfo<TaskPageListQuery> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); return baseMapper.reassignTaskPageList(pageInfo,query); PageInfo<XpTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<XpTaskVO> list = baseMapper.reassignTaskPageList(pageInfo, query); pageInfo.setRecords(list); return pageInfo; } @Override @@ -1540,6 +1541,13 @@ return xpTaskVO; } @Override public List<XpTaskVO> exportList(TaskPageListQuery query) { return baseMapper.reassignTaskPageList(query); } @Value("${robotaxi.sms.app-id:1476153389173952512}") private String smsAppId; @Value("${robotaxi.sms.app-push-config-code:ROBOTAXI_VERIFY_CODE_SMS}") xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpActicityMapper.xml
@@ -13,9 +13,9 @@ <if test="query.status != null"> and a.status = #{query.status} </if> <if test="query.activity_type != null"> and a.activity_type = #{query.activityType} </if> <!-- <if test="query.activity_type != null">--> <!-- and a.activity_type = #{query.activityType}--> <!-- </if>--> order by a.update_time desc </select>
