瀏覽代碼

Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zhuchangxue 3 年之前
父節點
當前提交
90cf52c9e4

+ 1 - 0
zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -617,6 +617,7 @@ public class PerPrefix {
      * RFID标签管理
      */
     public static final String AIRBOTTLE_TAG= "airbottle:tag:";
+    public static final String BOTTLE_TAG= "bottle:tag:";
 
     /**
      * 气瓶货物

+ 5 - 0
zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/RfidTag.java

@@ -1,5 +1,6 @@
 package com.zd.bottle.domain;
 
+import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.web.domain.BaseBean;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
 
 /**
  * <p>
@@ -23,9 +25,12 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 public class RfidTag extends BaseBean {
 
+    @Excel(name = "标签内码")
+    @Length(message = "标签内码长度不能超过50")
     @ApiModelProperty("标签内码")
     private String tagCode;
 
+    @Excel(name = "是否绑定 1绑定  0未绑定")
     @ApiModelProperty("是否绑定 1绑定  0未绑定")
     private Short isBind;
 }

+ 0 - 6
zd-modules/zd-bottle-parent/zd-bottle/pom.xml

@@ -13,12 +13,6 @@
 
     <dependencies>
 
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
         <!-- SpringCloud Alibaba Nacos Config -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

+ 3 - 2
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/AlarmRecordController.java

@@ -38,7 +38,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     /**
      * 查询报警记录列表
      */
-    @PreAuthorize(hasPermi = "airbottle:alarm:record:list")
+    @PreAuthorize(hasPermi = "bottle:alarm:record:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
     public TableDataInfo<AlarmRecord> list(AlarmRecord alarmRecord) {
@@ -50,7 +50,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
      * 导出报警记录列表
      */
     @ApiOperation(value = "导出报警记录列表")
-    @PreAuthorize(hasPermi = "airbottle:alarm:record:export")
+    @PreAuthorize(hasPermi = "bottle:alarm:record:export")
     @Log(title = "报警记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, AlarmRecord alarmRecord) throws IOException {
@@ -63,6 +63,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     @Log(title = "识别器新增报警记录", businessType = BusinessType.INSERT)
     @PostMapping("remote/add")
     public R<Boolean> remoteAdd(@RequestBody InventoryTag tag) {
+
         return R.ok();
     }
 }

+ 118 - 2
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/RfidTagController.java

@@ -1,10 +1,30 @@
 package com.zd.bottle.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.RfidTag;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.zd.bottle.service.RfidTagService;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
+import com.zd.common.core.utils.SpringUtils;
+import com.zd.common.core.utils.poi.ExcelUtil;
+import com.zd.common.core.web.page.TableDataInfo;
+import com.zd.common.log.annotation.Log;
+import com.zd.common.log.enums.BusinessType;
+import com.zd.common.response.ResultData;
+import com.zd.common.security.annotation.PreAuthorize;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.sql.Wrapper;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  * RFID标签管理 前端控制器
@@ -14,7 +34,103 @@ import com.zd.common.core.web.controller.BaseController;
  * @since 2022-09-08
  */
 @RestController
+@Api(tags = "【RFID标签管理】")
 @RequestMapping("/rfidTag")
 public class RfidTagController extends BaseController<RfidTag> {
 
+    @Resource
+    private RfidTagService service;
+
+    /**
+     * 查询RFID标签管理列表
+     * @param rfidTag 参数实体
+     * @return TableDataInfo<RfidTag>
+     */
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.LIST)
+    @GetMapping("/list")
+    @ApiOperation(value = "查询RFID标签管理列表")
+    public TableDataInfo<RfidTag> list(RfidTag rfidTag) {
+        startPage();
+        LambdaQueryWrapper<RfidTag> wrapper = Wrappers.lambdaQuery();
+        wrapper.setEntity(rfidTag);
+        List<RfidTag> list = service.list(wrapper);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出RFID标签管理列表
+     * @param response 响应对象
+     * @param rfidTag 参数实体
+     * @throws IOException 异常
+     */
+    @ApiOperation(value = "导出RFID标签管理列表")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.EXPORT)
+    @Log(title = "RFID标签管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, RfidTag rfidTag) throws IOException {
+        LambdaQueryWrapper<RfidTag> wrapper = Wrappers.lambdaQuery();
+        wrapper.setEntity(rfidTag);
+        List<RfidTag> list = service.list(wrapper);
+        ExcelUtil<RfidTag> util = new ExcelUtil<>(RfidTag.class);
+        util.exportExcel(response, list, "RFID标签管理数据");
+    }
+
+    /**
+     * 获取RFID标签管理详细信息
+     * @param id 主键
+     * @return RfidTag
+     */
+    @ApiOperation(value = "获取RFID标签管理详细信息")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.QUERY)
+    @GetMapping(value = "/{id}")
+    public ResultData<RfidTag> getInfo(@PathVariable("id") Long id) {
+        return ResultData.success(service.getById(id));
+    }
+
+    /**
+     * 新增RFID标签管理
+     * @param rfidTag 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "新增RFID标签管理")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.ADD)
+    @Log(title = "RFID标签管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultData<Boolean> add(@RequestBody RfidTag rfidTag) {
+        String tagCode = rfidTag.getTagCode();
+        LambdaQueryWrapper<RfidTag> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(RfidTag::getTagCode,tagCode);
+        List<RfidTag> tags = service.list(queryWrapper);
+        if (!tags.isEmpty()){
+            return ResultData.fail("该标签已经存在,请勿重复录入,如需补打二维码请点击下方按钮。");
+        }
+        return ResultData.result(service.add(rfidTag));
+    }
+
+    /**
+     * 修改RFID标签管理
+     * @param rfidTag 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "修改RFID标签管理")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.EDIT)
+    @Log(title = "RFID标签管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public ResultData<Boolean> edit(@RequestBody RfidTag rfidTag) {
+        return ResultData.result(service.updateById(rfidTag));
+    }
+
+    /**
+     * 删除RFID标签管理
+     * @param ids 主键集合
+     * @return Boolean
+     */
+    @ApiOperation(value = "删除RFID标签管理")
+//    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_TAG+ PerFun.REMOVE)
+    @Log(title = "RFID标签管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public ResultData<Boolean> remove(@PathVariable Long[] ids) {
+        return ResultData.result(service.removeBatchByIds(Arrays.asList(ids)));
+    }
+
 }

+ 6 - 0
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/RfidTagService.java

@@ -13,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface RfidTagService extends IService<RfidTag> {
 
+    /**
+     * 新增标签
+     * @param rfidTag 实体
+     * @return boolean
+     */
+    boolean add(RfidTag rfidTag);
 }

+ 18 - 0
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/RfidTagServiceImpl.java

@@ -4,8 +4,14 @@ import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.mapper.RfidTagMapper;
 import com.zd.bottle.service.RfidTagService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.SpringUtils;
+import com.zd.common.security.service.TokenService;
+import com.zd.system.api.model.LoginUser;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * <p>
  * RFID标签管理 服务实现类
@@ -17,4 +23,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class RfidTagServiceImpl extends ServiceImpl<RfidTagMapper, RfidTag> implements RfidTagService {
 
+    @Resource
+    private TokenService tokenService;
+    @Override
+    public boolean add(RfidTag rfidTag) {
+        String username=null;
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (loginUser!=null){
+            username=loginUser.getUsername();
+        }
+        rfidTag.setCommonValue(username);
+        return save(rfidTag);
+    }
 }

+ 11 - 3
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/device/DeviceRemoteController.java

@@ -61,11 +61,19 @@ public class DeviceRemoteController {
             ops.write(ReUtil.hexStringToByteArray(instruct));
             ops.flush();
 
-            Thread.sleep(800);
+            Thread.sleep(300);
             ops.write(ReUtil.hexStringToByteArray(instruct));
             ops.flush();
-
-            Thread.sleep(700);
+            Thread.sleep(500);
+            ops.write(ReUtil.hexStringToByteArray(instruct));
+            ops.flush();
+            Thread.sleep(300);
+            ops.write(ReUtil.hexStringToByteArray(instruct));
+            ops.flush();
+            Thread.sleep(500);
+            ops.write(ReUtil.hexStringToByteArray(instruct));
+            ops.flush();
+            Thread.sleep(300);
             ops.write(ReUtil.hexStringToByteArray(instruct));
             ops.flush();