Merge branch 'iscs_dev_mars' of http://192.168.0.253:3000/bozzysadmb/ISCS_Base into iscs_dev_mars

ktg-iscs/src/main/java/com/ktg/iscs/controller/HardwareApiController.java

@@ -115,14 +115,6 @@ public class HardwareApiController extends BaseController
         return CommonResult.success(hardwareApiService.updateColockerStatus(dto));
     }
 
-    @ApiOperation("更新隔离点开关状态")
-    @Log(title = "更新隔离点开关状态", businessType = BusinessType.UPDATE)
-    @PostMapping("/updateSwitchStatus")
-    public CommonResult<Boolean> updateSwitchStatus(@RequestBody @Parameter(name = "dto", description = "修改数据类,放到body") UpdateSwitchStatusDTO dto)
-    {
-        return CommonResult.success(hardwareApiService.updateSwitchStatus(dto));
-    }
-
     @ApiOperation("批量更新隔离点开关状态")
     @Log(title = "批量更新隔离点开关状态", businessType = BusinessType.UPDATE)
     @PostMapping("/updateSwitchList")

ktg-iscs/src/main/java/com/ktg/iscs/domain/IsMapPoint.java

@@ -71,6 +71,10 @@ public class IsMapPoint extends BaseBean
     @TableField(exist = false)
     private String pointNfc;
 
+    @ApiModelProperty(value = "隔离点序列号")
+    @TableField(exist = false)
+    private String pointSerialNumber;
+
     @ApiModelProperty(value = "开关状态(0-开 1-关)")
     @TableField(exist = false)
     private String switchStatus;

ktg-iscs/src/main/java/com/ktg/iscs/domain/dto/hardwareApi/UpdateSwitchStatusDTO.java

@@ -15,8 +15,8 @@ import java.util.Date;
 @Data
 public class UpdateSwitchStatusDTO {
 
-    @ApiModelProperty(value = "隔离点NFC")
-    private String pointNfc;
+    /*@ApiModelProperty(value = "隔离点NFC")
+    private String pointNfc;*/
 
     @ApiModelProperty(value = "隔离点序列号")
     private String pointSerialNumber;

ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/ticketPoints/IsJobTicketPointsVO.java

@@ -1,7 +1,6 @@
 package com.ktg.iscs.domain.vo.ticketPoints;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ktg.common.annotation.Excel;
@@ -54,6 +53,10 @@ public class IsJobTicketPointsVO extends BaseBean
     @Excel(name = "隔离点nfc")
     private String pointNfc;
 
+    @ApiModelProperty(value = "隔离点序列号")
+    @Excel(name = "隔离点序列号")
+    private String pointSerialNumber;
+
     @ApiModelProperty(value = "隔离点Name")
     private String pointName;
 

ktg-iscs/src/main/java/com/ktg/iscs/service/HardwareApiService.java

@@ -88,13 +88,6 @@ public interface HardwareApiService {
      */
     Boolean updateColockerStatus(UpdateColockerStatusDTO dto);
 
-    /**
-     * 更新开关状态
-     * @param dto
-     * @return
-     */
-    Boolean updateSwitchStatus(UpdateSwitchStatusDTO dto);
-
     /**
      * 批量更新开关状态
      * @param dto

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/HardwareApiServiceImpl.java

@@ -788,35 +788,12 @@ public class HardwareApiServiceImpl implements HardwareApiService {
         return true;
     }
 
-    @Override
-    public Boolean updateSwitchStatus(UpdateSwitchStatusDTO dto) {
-        Assert.notBlank(dto.getPointNfc(), "隔离点nfc不能为空!");
-        Assert.notBlank(dto.getSwitchStatus(), "隔离点开关状态不能为空!");
-        IsRfidToken rfidToken = iIsRfidTokenService.getOne(Wrappers.<IsRfidToken>lambdaQuery()
-                .eq(IsRfidToken::getRfid, dto.getPointNfc()));
-        Assert.isTrue(rfidToken != null, "该点位nfc失效！");
-        return iIsIsolationPointService.update(Wrappers.<IsIsolationPoint>lambdaUpdate()
-                .eq(IsIsolationPoint::getRfidId, rfidToken.getRfidId())
-                .set(IsIsolationPoint::getSwitchStatus, dto.getSwitchStatus()));
-    }
-
     @Override
     public Boolean updateSwitchList(UpdateSwitchParam dto) {
         Assert.isFalse(dto.getList().isEmpty(), "点位开关数据不可为空！");
-        Date date = new Date();
-        List<String> collect = dto.getList().stream().map(UpdateSwitchStatusDTO::getPointSerialNumber).collect(Collectors.toList());
-        Assert.isFalse(collect.isEmpty(), "请提供硬件序列号！");
-        List<IsIsolationPoint> list = iIsIsolationPointService.list(Wrappers.<IsIsolationPoint>lambdaQuery()
-                .in(IsIsolationPoint::getPointSerialNumber, collect));
-        for (UpdateSwitchStatusDTO updateSwitchStatusDTO : dto.getList()) {
-            Assert.notBlank(updateSwitchStatusDTO.getPointSerialNumber(), "存在序列号为空的数据！");
-            updateSwitchStatusDTO.setSwitchLastUpdateTime(date);
-            for (IsIsolationPoint isIsolationPoint : list) {
-                if (updateSwitchStatusDTO.getPointSerialNumber().equals(isIsolationPoint.getPointSerialNumber())) {
-                    updateSwitchStatusDTO.setPointNfc(isIsolationPoint.getPointNfc());
-                }
-            }
-        }
+        dto.getList().forEach(o -> {
+            Assert.notBlank(o.getPointSerialNumber(), "序列号不可为空！");
+        });
         redisCache.setCacheList(SYS_ATTR + "sys.points.switch.last", dto.getList());
         redisCache.expire(SYS_ATTR + "sys.points.switch.last", 60, TimeUnit.SECONDS);
         redisCache.deleteObject(SYS_ATTR + "sys.points.switch.records");

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsIsolationPointServiceImpl.java

@@ -212,9 +212,9 @@ public class IsIsolationPointServiceImpl extends ServiceImpl<IsIsolationPointMap
         if (!switchStatusList.isEmpty() && !isIsolationPointPage.getRecords().isEmpty()) {
             for (PointPageVO pointPageVO : isIsolationPointPage.getRecords()) {
                 for (UpdateSwitchStatusDTO updateSwitchStatusDTO : switchStatusList) {
-                    if (StringUtils.isNotBlank(pointPageVO.getPointNfc())
-                            && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointNfc())
-                            && pointPageVO.getPointNfc().equals(updateSwitchStatusDTO.getPointNfc())) {
+                    if (StringUtils.isNotBlank(pointPageVO.getPointSerialNumber())
+                            && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointSerialNumber())
+                            && pointPageVO.getPointSerialNumber().equals(updateSwitchStatusDTO.getPointSerialNumber())) {
                         pointPageVO.setSwitchStatus(updateSwitchStatusDTO.getSwitchStatus());
                         pointPageVO.setSwitchLastUpdateTime(updateSwitchStatusDTO.getSwitchLastUpdateTime());
                     }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -801,7 +801,9 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
             vo.setLocksetName(collect);
             if (!switchStatusList.isEmpty()) {
                 for (UpdateSwitchStatusDTO updateSwitchStatusDTO : switchStatusList) {
-                    if (vo.getPointNfc().equals(updateSwitchStatusDTO.getPointNfc())) {
+                    if (StringUtils.isNotBlank(vo.getPointSerialNumber())
+                            && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointSerialNumber())
+                            && vo.getPointSerialNumber().equals(updateSwitchStatusDTO.getPointSerialNumber())) {
                         vo.setSwitchStatus(updateSwitchStatusDTO.getSwitchStatus());
                         vo.setSwitchLastUpdateTime(updateSwitchStatusDTO.getSwitchLastUpdateTime());
                     }

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsMapServiceImpl.java

@@ -11,7 +11,6 @@ import com.ktg.iscs.domain.dto.hardwareApi.UpdateSwitchStatusDTO;
 import com.ktg.iscs.mapper.IsMapMapper;
 import com.ktg.iscs.service.IIsMapPointService;
 import com.ktg.iscs.service.IIsMapService;
-import com.ktg.system.domain.vo.IsSystemAttributeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,7 +52,9 @@ public class IsMapServiceImpl extends ServiceImpl<IsMapMapper, IsMap> implements
         if (!switchStatusList.isEmpty() && !list.isEmpty()) {
             for (IsMapPoint isMapPoint : list) {
                 for (UpdateSwitchStatusDTO updateSwitchStatusDTO : switchStatusList) {
-                    if (StringUtils.isNotBlank(isMapPoint.getPointNfc()) && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointNfc()) && isMapPoint.getPointNfc().equals(updateSwitchStatusDTO.getPointNfc())) {
+                    if (StringUtils.isNotBlank(isMapPoint.getPointSerialNumber())
+                            && StringUtils.isNotBlank(updateSwitchStatusDTO.getPointSerialNumber())
+                            && isMapPoint.getPointSerialNumber().equals(updateSwitchStatusDTO.getPointSerialNumber())) {
                         isMapPoint.setSwitchStatus(updateSwitchStatusDTO.getSwitchStatus());
                         isMapPoint.setSwitchLastUpdateTime(updateSwitchStatusDTO.getSwitchLastUpdateTime());
                     }

ktg-iscs/src/main/resources/mapper/IsJobTicketPointsMapper.xml

@@ -123,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             j.*,
             i.point_name,
             r.rfid as point_nfc,
+            i.point_serial_number,
             l.lock_name,
             l.lock_nfc
         FROM

ktg-iscs/src/main/resources/mapper/IsMapPointMapper.xml

@@ -51,7 +51,11 @@
         CASE
         WHEN p.map_type = "2" THEN
         r.rfid
-        END AS point_nfc
+        END AS point_nfc,
+        CASE
+        WHEN p.map_type = "2" THEN
+        ip.point_serial_number
+        END AS point_serial_number
         FROM
         is_map_point p
         LEFT JOIN is_map m ON m.id = p.map_id