回收柜投递/清运接口开发

回收柜投递/清运接口开发

nxhs-service/src/main/java/cc/yunxi/controller/EntranceController.java

@@ -21,10 +21,7 @@ import cc.yunxi.domain.vo.device.RecycleDeviceRespVO;
 import cc.yunxi.domain.vo.file.FileUploadReqVO;
 import cc.yunxi.domain.vo.file.FileUploadRespVO;
 import cc.yunxi.enums.UserTypeEnum;
-import cc.yunxi.service.IClientService;
-import cc.yunxi.service.IFileService;
-import cc.yunxi.service.IRecycleDevicePhotoService;
-import cc.yunxi.service.IRecycleDeviceService;
+import cc.yunxi.service.*;
 import cc.yunxi.service.impl.CommonService;
 import cc.yunxi.utils.RestTemplateUtils;
 import cc.yunxi.utils.UserContext;
@@ -78,6 +75,9 @@ public class EntranceController {
     @Resource
     private IRecycleDevicePhotoService recycleDevicePhotoService;
 
+    @Resource
+    private IRecycleDeviceRunningDataService recycleDeviceRunningDataService;
+
 
     @ApiOperation("回收柜二维码请求设备信息接口")
     @RequestMapping("/dev_qr_code/wx9e638ba024ed7868")
@@ -146,18 +146,47 @@ public class EntranceController {
 
     @ApiOperation("投递照片上传")
     @PostMapping(value ="/device/file/delivery_photo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public CommonResult<FileUploadRespVO> ZSG_DeliveryPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
+    public CommonResult<String> ZSG_DeliveryPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
         FileUploadRespVO uploadRespVO = fileService.uploadImage(uploadReqVO);
 
         recycleDevicePhotoService.addRecycleDevicePhoto(orderid,uploadRespVO.getUrl());
-        return CommonResult.success(uploadRespVO);
+        return CommonResult.success("请求成功");
     }
 
     @ApiOperation("清运照片上传")
     @PostMapping(value ="/device/file/clean_photo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public CommonResult<FileUploadRespVO> ZSG_CleanPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
+    public CommonResult<String> ZSG_CleanPhoto(@RequestParam(name="orderid ",required = true) String orderid,@RequestBody FileUploadReqVO uploadReqVO) {
         FileUploadRespVO uploadRespVO = fileService.uploadImage(uploadReqVO);
         recycleDevicePhotoService.addRecycleDevicePhoto(orderid,uploadRespVO.getUrl());
-        return CommonResult.success(uploadRespVO);
+        return CommonResult.success("请求成功");
+    }
+
+    @ApiOperation("上传投递重量")
+    @PostMapping(value ="/delivery_data")
+    public CommonResult<String> ZSG_DeliveryData(HttpServletRequest request) throws Exception  {
+
+        // 1. 参数解析处理
+        Map<String, String> dataMap = WebUtils.parseQueryString(request);
+
+        RecycleDeviceRespVO recycleDeviceRespVO = BeanUtils.copyBean(dataMap, RecycleDeviceRespVO.class);
+
+        // 2. 保存数据
+        recycleDeviceRunningDataService.addRecycleDeviceRunningData(recycleDeviceRespVO,1);
+
+        return CommonResult.success("上传成功");
+    }
+
+    @ApiOperation("上传清运重量")
+    @PostMapping(value ="/clean_data")
+    public CommonResult<String> ZSG_CleanData(HttpServletRequest request) throws Exception {
+        // 1. 参数解析处理
+        Map<String, String> dataMap = WebUtils.parseQueryString(request);
+
+        RecycleDeviceRespVO recycleDeviceRespVO = BeanUtils.copyBean(dataMap, RecycleDeviceRespVO.class);
+
+        // 2. 保存数据
+        recycleDeviceRunningDataService.addRecycleDeviceRunningData(recycleDeviceRespVO,2);
+
+        return CommonResult.success("上传成功");
     }
 }

nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleDeviceRunningData.java

@@ -0,0 +1,79 @@
+package cc.yunxi.domain.po;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 回收柜设备表
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-04-11 10:33:58
+ */
+@Data
+@TableName("nx_recycle_device_running_data")
+@ApiModel(value = "RecycleDeviceRunningData", description = "回收柜投递/清运订单表")
+public class RecycleDeviceRunningData {
+
+    @ApiModelProperty("主键id")
+    @EqualsAndHashCode.Exclude
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty("投递/清运编号")
+    @TableField("no")
+    private String no;
+
+    @ApiModelProperty("重量")
+    @TableField("weight")
+    private BigDecimal weight;
+
+    @ApiModelProperty("价格")
+    @TableField("price")
+    private BigDecimal price;
+
+    @ApiModelProperty("订单编号")
+    @TableField("order_id")
+    private String orderId;
+
+    @ApiModelProperty("手机号码")
+    @TableField("phone")
+    private String phone;
+
+    @ApiModelProperty("类型：1为投递，2为清运")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty("提交信息详细")
+    @TableField("postDetail")
+    private String postDetail;
+
+
+    @ApiModelProperty("创建时间")
+    @TableField("f_creator_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新时间")
+    @TableField("f_last_modify_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("公司id")
+    @TableField("company_id")
+    private String companyId;
+
+    @ApiModelProperty("组织id")
+    @TableField("organize_json_id")
+    private String organizeJsonId;
+
+
+}

nxhs-service/src/main/java/cc/yunxi/domain/vo/device/RecycleDeviceRespVO.java

@@ -57,7 +57,7 @@ public class RecycleDeviceRespVO {
     private String test;
 
     @ApiModelProperty("ac版本1")
-    private String ad;
+    private String ac;
 
     @ApiModelProperty("配置版本，在B后台生成后下发到设备，观察屏幕上C*判断是否下发成功，*为对应的配置版本号，可在B后台设备详情页面查看最新配置版本")
     private String app_config_version;
@@ -66,6 +66,14 @@ public class RecycleDeviceRespVO {
     private String acc;
 
     // -------------------公共上报参数--------------------------------
+    @ApiModelProperty("订单编号")
+    private String orderId;
+
+    @ApiModelProperty("清运/投递数据")
+    private String data;
+
+    @ApiModelProperty("筒的数据")
+    private String door;
 
     @ApiModelProperty("设备编码")
     private String devsn;

nxhs-service/src/main/java/cc/yunxi/mapper/RecycleDeviceRunningDataMapper.java

@@ -0,0 +1,19 @@
+package cc.yunxi.mapper;
+
+import cc.yunxi.domain.po.RecycleDevicePhoto;
+import cc.yunxi.domain.po.RecycleDeviceRunningData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 回收柜设备表 Mapper 接口
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-04-11 10:33:58
+ */
+@Mapper
+public interface RecycleDeviceRunningDataMapper extends BaseMapper<RecycleDeviceRunningData> {
+
+}

nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeviceRunningDataService.java

@@ -0,0 +1,19 @@
+package cc.yunxi.service;
+
+import cc.yunxi.domain.po.RecycleDevicePhoto;
+import cc.yunxi.domain.po.RecycleDeviceRunningData;
+import cc.yunxi.domain.vo.device.RecycleDeviceRespVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 回收柜设备表 服务类
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-04-11 10:33:58
+ */
+public interface IRecycleDeviceRunningDataService extends IService<RecycleDeviceRunningData> {
+
+    Boolean addRecycleDeviceRunningData(RecycleDeviceRespVO recycleDeviceRespVO,Integer type);
+}

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleDeviceRunningDataServiceImpl.java

@@ -0,0 +1,54 @@
+package cc.yunxi.service.impl;
+
+import cc.yunxi.domain.po.RecycleDevicePhoto;
+import cc.yunxi.domain.po.RecycleDeviceRunningData;
+import cc.yunxi.domain.vo.device.RecycleDeviceRespVO;
+import cc.yunxi.mapper.RecycleDevicePhotoMapper;
+import cc.yunxi.mapper.RecycleDeviceRunningDataMapper;
+import cc.yunxi.service.IRecycleDevicePhotoService;
+import cc.yunxi.service.IRecycleDeviceRunningDataService;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 回收柜设备表 服务实现类
+ * </p>
+ *
+ * @author ccongli
+ * @since 2024-04-11 10:33:58
+ */
+@Service
+public class RecycleDeviceRunningDataServiceImpl extends ServiceImpl<RecycleDeviceRunningDataMapper, RecycleDeviceRunningData> implements IRecycleDeviceRunningDataService {
+
+
+    @Override
+    public Boolean addRecycleDeviceRunningData(RecycleDeviceRespVO recycleDeviceRespVO,Integer type) {
+
+        String data = recycleDeviceRespVO.getData();
+
+        JSONObject jsonObject = JSONUtil.parseObj(data);
+
+        RecycleDeviceRunningData recycleDeviceRunningData = new RecycleDeviceRunningData();
+
+        recycleDeviceRunningData.setType(type);
+        recycleDeviceRunningData.setNo(jsonObject.getStr("no"));
+        recycleDeviceRunningData.setWeight(jsonObject.getBigDecimal("weight"));
+        recycleDeviceRunningData.setPrice(jsonObject.getBigDecimal("price"));
+        recycleDeviceRunningData.setOrderId(recycleDeviceRespVO.getOrderId());
+        recycleDeviceRunningData.setPhone(jsonObject.getStr("phone"));
+        recycleDeviceRunningData.setPostDetail(JSONUtil.toJsonStr(recycleDeviceRespVO));
+
+        recycleDeviceRunningData.setCreateTime(LocalDateTime.now());
+        return this.save(recycleDeviceRunningData);
+    }
+
+
+
+
+}

nxhs-service/src/main/resources/mapper/RecycleDeviceRunningDataMapper.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="cc.yunxi.mapper.RecycleDeviceRunningDataMapper">
+
+</mapper>