Merge remote-tracking branch 'origin/master'

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/CardController.java

@@ -6,14 +6,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
-import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardPageReqVO;
+import cn.iocoder.yudao.module.member.controller.admin.card.vo.*;
-import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardRespVO;
-import cn.iocoder.yudao.module.member.controller.admin.card.vo.CardSaveReqVO;
 import cn.iocoder.yudao.module.member.dal.dataobject.card.CardDO;
 import cn.iocoder.yudao.module.member.service.card.CardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -41,6 +40,40 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
 @Validated
 public class CardController {
 
+    //   写一个示例，将一条数据插入redis
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    @PostMapping("/weighingAddInfo")
+    @Operation(summary = "称重信息入口")
+    public void weighingAddInfo(@RequestBody RobotReqVO reqVO) {
+//        生成一个redis对象并且插入数据
+        redisTemplate.opsForValue().set(reqVO.getIp(), reqVO);
+    }
+
+    @GetMapping("/weighingGetInfo")
+    @Operation(summary = "获取称重相关信息")
+    public CommonResult<Object> weighingGetInfo(@RequestParam String ip) {
+//        生成一个redis对象并且插入数据
+//        redisTemplate.opsForValue().get(ip);
+        return success(redisTemplate.opsForValue().get(ip));
+    }
+
+    @GetMapping("/plateGetInfo")
+    @Operation(summary = "获取盘子信息")
+    public CommonResult<Object> plateGetInfo(@RequestParam String ip) {
+//        生成一个redis对象并且插入数据
+        return success(redisTemplate.opsForValue().get(ip));
+    }
+
+    @PostMapping("/plateAddInfo")
+    @Operation(summary = "盘子信息入口")
+    public void plateAddInfo(@RequestBody RobotReqVO reqVO) {
+//        生成一个redis对象并且插入数据
+        redisTemplate.opsForValue().set(reqVO.getIp(), reqVO);
+    }
+
+
     @Resource
     private CardService cardService;
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/vo/RobotReqVO.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.member.controller.admin.card.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "称重机器入参")
+@Data
+@ExcelIgnoreUnannotated
+public class RobotReqVO {
+
+    @Schema(description = "ip地址")
+    private String ip;
+
+    @Schema(description = "盘子编码")
+    private String cardId;
+
+
+    @Schema(description = "重量变化")
+    private BigDecimal change;
+
+
+}

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/card/vo/RobotResVO.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.member.controller.admin.card.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "称重机器出参")
+@Data
+@ExcelIgnoreUnannotated
+public class RobotResVO {
+
+    @Schema(description = "ip地址")
+    private String ip;
+
+    @Schema(description = "盘子编码")
+    private String cardId;
+
+    @Schema(description = "重量变化")
+    private BigDecimal change;
+
+
+}