添加设备

lefull-lot-api-web/src/main/java/cn/lefull/api/LisaController.java

@@ -2,7 +2,9 @@ package cn.lefull.api;
 
 import cn.lefull.common.annotation.NoAuth;
 import cn.lefull.common.response.ApiResponse;
+import cn.lefull.interaction.vo.face.EquipmentListVO;
 import cn.lefull.service.lisa.EquipmentService;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,4 +26,11 @@ public class LisaController {
         equipmentService.addEquipment(apartmentId, uuid, name, position, employeeId);
         return new ApiResponse<>();
     }
+
+    @NoAuth
+    @GetMapping("/getEquipmentList")
+    public ApiResponse<Object> getEquipmentList() {
+        PageInfo<EquipmentListVO> equipmentListVOPageInfo = equipmentService.getEquipmentList(1, 20);
+        return new ApiResponse<>(equipmentListVOPageInfo);
+    }
 }

lefull-lot-interaction/src/main/java/cn/lefull/interaction/vo/face/EquipmentListVO.java

+package cn.lefull.interaction.vo.face;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author 杨奇
+ */
+@Data
+public class EquipmentListVO {
+
+    /**
+     * 主键
+     */
+    private Integer cameraEquipmentId;
+
+    /**
+     * 设备唯一编码
+     */
+    private String equipmentUuid;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 门店id
+     */
+    private Integer apartmentId;
+
+    /**
+     * 位置
+     */
+    private String position;
+
+    /**
+     * 门店名称
+     */
+    private String apartmentName;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+}

lefull-lot-repository/src/main/java/cn/lefull/repository/bo/face/CameraEquipmentBO.java

+package cn.lefull.repository.bo.face;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author 杨奇
+ */
+@Data
+public class CameraEquipmentBO {
+
+    /**
+     * 主键
+     */
+    private Integer cameraEquipmentId;
+
+    /**
+     * 设备唯一编码
+     */
+    private String equipmentUuid;
+
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+
+    /**
+     * 门店id
+     */
+    private Integer apartmentId;
+
+    /**
+     * 位置
+     */
+    private String position;
+
+    /**
+     * 门店名称
+     */
+    private String apartmentName;
+
+    /**
+     * 操作人
+     */
+    private Integer operatorEmployeeId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否删除
+     */
+    private Byte isDelete;
+
+    /**
+     * 删除时间
+     */
+    private LocalDateTime deleteTime;
+}

lefull-lot-repository/src/main/java/cn/lefull/repository/mapper/face/CameraEquipmentMapper.java

 package cn.lefull.repository.mapper.face;
 
+import cn.lefull.repository.bo.face.CameraEquipmentBO;
 import cn.lefull.repository.model.face.CameraEquipment;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author 杨奇
  */
@@ -11,6 +14,9 @@ public interface CameraEquipmentMapper {
 
     CameraEquipment getEquipment(String equipmentUuid);
 
+
+    List<CameraEquipmentBO> getEquipmentList();
+
     /**
      * 添加设备
      */

lefull-lot-repository/src/main/resources/mapper/face/CameraEuipmentMapper.xml

@@ -6,6 +6,11 @@
         SELECT camera_equipment_id, equipment_uuid, equipment_name, apartment_id, position
         FROM camera_equipment where equipment_uuid = #{equipmentUuid} and is_delete = 0
     </select>
+    <select id="getEquipmentList" resultType="cn.lefull.repository.bo.face.CameraEquipmentBO">
+        SELECT e.camera_equipment_id, e.equipment_uuid, e.equipment_name, e.apartment_id, e.position, a.apartment_name
+        FROM camera_equipment e left join apartment a on e.apartment_id = a.apartment_id
+        where e.is_delete = 0
+    </select>
     <insert id="addEquipment" keyProperty="cameraEquipmentId" useGeneratedKeys="true" parameterType="cn.lefull.repository.model.face.CameraEquipment">
         INSERT INTO camera_equipment (equipment_uuid, equipment_name, apartment_id, position, operator_employee_id) VALUES(#{equipmentUuid}, #{equipmentName}, #{apartmentId}, #{position}, #{operatorEmployeeId});
     </insert>

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentService.java

 package cn.lefull.service.lisa;
 
+import cn.lefull.interaction.vo.face.EquipmentListVO;
+import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,4 +14,6 @@ public interface EquipmentService {
      * 添加设备
      */
     void addEquipment(int apartmentId, String uuid, String name, String position, int employeeId) throws Exception;
+
+    PageInfo<EquipmentListVO> getEquipmentList(int page, int pageSize);
 }

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentServiceImpl.java

 package cn.lefull.service.lisa;
 
 import cn.lefull.common.utils.Utils;
+import cn.lefull.interaction.vo.face.EquipmentListVO;
+import cn.lefull.repository.bo.face.CameraEquipmentBO;
 import cn.lefull.repository.mapper.face.CameraEquipmentMapper;
 import cn.lefull.repository.model.face.CameraEquipment;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
 
 /**
  * @author 杨奇
@@ -34,4 +41,28 @@ public class EquipmentServiceImpl implements EquipmentService {
         equipment.setOperatorEmployeeId(employeeId);
         equipmentMapper.addEquipment(equipment);
     }
+
+    @Override
+    public PageInfo<EquipmentListVO> getEquipmentList(int page, int pageSize)
+    {
+        PageHelper.startPage(page, pageSize);
+        List<CameraEquipmentBO> equipmentList = equipmentMapper.getEquipmentList();
+
+        if (CollectionUtils.isEmpty(equipmentList)) {
+            return new PageInfo<>();
+        }
+
+        List<EquipmentListVO> equipmentListVOS = new ArrayList<>();
+        for (CameraEquipmentBO cameraEquipmentBO : equipmentList) {
+            EquipmentListVO equipmentListVO = new EquipmentListVO();
+            equipmentListVO.setCameraEquipmentId(cameraEquipmentBO.getCameraEquipmentId());
+            equipmentListVO.setEquipmentUuid(cameraEquipmentBO.getEquipmentUuid());
+            equipmentListVO.setEquipmentName(cameraEquipmentBO.getEquipmentName());
+            equipmentListVO.setApartmentId(cameraEquipmentBO.getApartmentId());
+            equipmentListVO.setApartmentName(cameraEquipmentBO.getApartmentName());
+            equipmentListVO.setPosition(cameraEquipmentBO.getPosition());
+            equipmentListVOS.add(equipmentListVO);
+        }
+        return new PageInfo<>(equipmentListVOS);
+    }
 }