架构调整

src/main/java/com/neotel/smfcore/SmfCoreApplication.java

 package com.neotel.smfcore;
 package com.neotel.smfcore;
 
 
-import com.neotel.smfcore.common.annotation.security.AnonymousGetMapping;
+import com.neotel.smfcore.security.annotation.AnonymousGetMapping;
 import com.neotel.smfcore.common.utils.SpringContextHolder;
 import com.neotel.smfcore.common.utils.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/neotel/smfcore/common/utils/StorageConstants.java

@@ -111,222 +111,6 @@ public class StorageConstants {
         public final static int OFFLINE = 999;
         public final static int OFFLINE = 999;
     }
     }
 
 
-    /// <summary>
-    /// 单台BOX状态
-    /// 1=正常运行中
-    /// 2=急停，3=故障，4=警告,5=调试中
-    /// 6入库执行中，7入仓位完成，8入库失败
-    /// 9出库执行中，10出仓位完成，11出库失败
-    /// </summary>
-    public static class BOX_STATUS{
-        /**
-         * 1=准备就绪
-         */
-        public final static  int READY = 1;
-
-        /**
-         * 2=急停
-         */
-        public final static  int EMERGENCY = 2;
-        /**
-         * 3=故障
-         */
-        public final static  int PROBLEM = 3;
-        /**
-         * 4=警告（用msg发送提醒，如出库到达工位但是没有工人操作）
-         */
-        public final static  int WARNING = 4;
-        /**
-         * 5=调试中
-         */
-        public final static  int DEBUG = 5;
-        /**
-         * 6入库执行中
-         */
-        public final static  int PUTIN = 6;
-        /**
-         * 7入仓位完成，
-         */
-        public final static  int IN_FINISHED = 7;
-        /**
-         * 8入库失败
-         */
-        public final static  int IN_FAILED = 8;
-        /**
-         *9出库执行中，
-         */
-        public final static  int CHECKOUT = 9;
-        /**
-         * 10出仓位完成
-         */
-        public final static  int OUT_FINISHED = 10;
-        /**
-         * 11出库完成
-         */
-        public final static  int OUT_END = 11;
-
-        /**
-         * 12出库移栽中
-         */
-        public final static int OUT_MOVING = 12;
-
-        /**
-         * 13原点返回中
-         */
-        public final static int RESET = 13;
-
-        /**
-         * 14 回温取料中
-         */
-        public final static int REWARM_TAKING = 14;
-
-        /**
-         * 15 回温取料完成
-         */
-        public final static int REWARM_TAKING_END = 15;
-
-        /**
-         * 16 回温放料中
-         */
-        public final static int REWARM_PUTTING = 16;
-
-        /**
-         * 17 回温放料完成
-         */
-        public final static int REWARM_PUTTING_END = 17;
-
-        /**
-         * 18 搅拌取料中
-         */
-        public final static int MIX_TAKING = 18;
-
-        /**
-         * 19 等待搅拌
-         */
-        public final static int WAIT_MIX = 19;
-
-        /**
-         * 20 搅拌执行中
-         */
-        public final static int MIXING = 20;
-
-        /**
-         * 21 搅拌完成回仓
-         */
-        public final static int MIX_PUTTING = 21;
-
-        /**
-         * 22 搅拌完成放回原来的仓中
-         */
-        public final static int MIX_END = 22;
-    }
-
-    /**
-     * 料仓类型:0单台自动料仓,1手动料仓2流水线料仓
-     */
-    public static enum TYPE{
-        /**
-         *0单台自动料仓
-         */
-        AUTO("storage.type.auto"),
-
-        /**
-         * 1手动料仓
-         */
-        MANUAL("storage.type.manual"),
-
-        /**
-         * 2流水线料仓
-         */
-        LINE("storage.type.line"),
-
-        /**
-         * 3 虚拟料仓
-         */
-        VIRTUAL("storage.type.virtual"),
-
-        /**
-         * 4 在线料仓(上下层两个 BOX)
-         */
-        ONLINE("storage.type.online"),
-
-        /**
-         * 5批量上下料料仓
-         */
-        BATCH("storage.type.batch"),
-
-        /**
-         * 6智能料架
-         */
-        SHELF("storage.type.shelf"),
-
-        /**
-         * 7 料柜
-         */
-        CABINET("storage.type.cabinet"),
-
-        /**
-         * 8 料架
-         */
-        ACCSHELF("storage.type.accShelf"),
-
-        /**
-         * 9 新料架,支持合并库位确认
-         */
-        NEWSHELF("storage.type.newShelf"),
-
-        /**
-         * 9 扫码料架
-         */
-        CODESHELF("storage.type.codeShelf"),
-
-        /**
-         * 10 锡膏料仓
-         */
-        SOLDERPASTE("storage.type.solderPaste"),
-
-
-        /**
-         * 11 垂直货柜
-         */
-        VERTICALBOX("storage.type.smdVl"),
-
-
-        /**
-         * 12 SMD-XL(方仓)
-         */
-        SMD_XL("storage.type.smdXl"),
-
-
-        /**
-         * 13 SMD-DUO(DUO料仓)
-         */
-        SMD_DUO("storage.type.smdDuo")
-
-        ;
-
-        private String key;
-
-        TYPE(String key) {
-            this.key = key;
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public void setKey(String key) {
-            this.key = key;
-        }
-
-        public String getName(){
-            return name();
-        }
-
-        public static List<TYPE> availableTypeList(){
-            return Lists.newArrayList(AUTO,LINE,BATCH,ACCSHELF,CODESHELF,SOLDERPASTE,VERTICALBOX,SMD_XL,SMD_DUO);
-        }
-    }
 
 
     /**
     /**
      * 操作状态
      * 操作状态

src/main/java/com/neotel/smfcore/security/service/dao/IBarcodeDao.java → src/main/java/com/neotel/smfcore/core/barcode/service/dao/IBarcodeDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.barcode.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IComponentDao.java → src/main/java/com/neotel/smfcore/core/barcode/service/dao/IComponentDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.barcode.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
-import com.neotel.smfcore.security.service.po.Component;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 
 
 import java.util.List;
 import java.util.List;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/impl/BarcodeDaoImpl.java → src/main/java/com/neotel/smfcore/core/barcode/service/dao/impl/BarcodeDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.barcode.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IBarcodeDao;
-import com.neotel.smfcore.security.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 
 
 public class BarcodeDaoImpl extends AbstractBaseDao implements IBarcodeDao {
 public class BarcodeDaoImpl extends AbstractBaseDao implements IBarcodeDao {
     @Override
     @Override

src/main/java/com/neotel/smfcore/security/service/dao/impl/ComponentDaoImpl.java → src/main/java/com/neotel/smfcore/core/barcode/service/dao/impl/ComponentDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.barcode.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IComponentDao;
-import com.neotel.smfcore.security.service.po.Component;
+import com.neotel.smfcore.core.barcode.service.dao.IComponentDao;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 

src/main/java/com/neotel/smfcore/security/service/manager/IBarcodeManager.java → src/main/java/com/neotel/smfcore/core/barcode/service/manager/IBarcodeManager.java

-package com.neotel.smfcore.security.service.manager;
+package com.neotel.smfcore.core.barcode.service.manager;
 
 
 import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.base.IBaseManager;
-import com.neotel.smfcore.security.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 
 
 public interface IBarcodeManager extends IBaseManager<Barcode> {
 public interface IBarcodeManager extends IBaseManager<Barcode> {
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/IComponentManager.java → src/main/java/com/neotel/smfcore/core/barcode/service/manager/IComponentManager.java

-package com.neotel.smfcore.security.service.manager;
+package com.neotel.smfcore.core.barcode.service.manager;
 
 
 import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.base.IBaseManager;
-import com.neotel.smfcore.security.service.po.Component;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 
 
 public interface IComponentManager extends IBaseManager<Component> {
 public interface IComponentManager extends IBaseManager<Component> {
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/BarcodeManagerImpl.java → src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/BarcodeManagerImpl.java

-package com.neotel.smfcore.security.service.manager.impl;
+package com.neotel.smfcore.core.barcode.service.manager.impl;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.security.service.manager.IBarcodeManager;
-import com.neotel.smfcore.security.service.po.Barcode;
+import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 

src/main/java/com/neotel/smfcore/security/service/manager/impl/ComponentManagerImpl.java → src/main/java/com/neotel/smfcore/core/barcode/service/manager/impl/ComponentManagerImpl.java

-package com.neotel.smfcore.security.service.manager.impl;
+package com.neotel.smfcore.core.barcode.service.manager.impl;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.security.service.manager.IComponentManager;
-import com.neotel.smfcore.security.service.po.Component;
+import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
+import com.neotel.smfcore.core.barcode.service.po.Component;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 

src/main/java/com/neotel/smfcore/security/service/po/Barcode.java → src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.barcode.service.po;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;

src/main/java/com/neotel/smfcore/security/service/po/Component.java → src/main/java/com/neotel/smfcore/core/barcode/service/po/Component.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.barcode.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;

src/main/java/com/neotel/smfcore/core/device/SmdXlBoxHandler.java

-package com.neotel.smfcore.core.device;
-
-/**
- * Created by sunke on 2021/7/12.
- */
-public class SmdXlBoxHandler implements IDeviceHandler{
-
-    @Override
-    public String getDeviceType() {
-        return null;
-    }
-}

src/main/java/com/neotel/smfcore/core/device/bean/BoxStatusBean.java

+package com.neotel.smfcore.core.device.bean;
+
+import com.neotel.smfcore.core.device.enums.BOX_STATUS;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by sunke on 17/2/13.
+ */
+public class BoxStatusBean {
+
+    /// <summary>
+    /// Box编号，从1开始
+    /// </summary>
+    private int boxId;
+    /// <summary>
+    /// 单台BOX状态
+    ///1=正常运行中
+    /// 2=急停，3=故障，4=警告,5=调试中
+    /// 6入库执行中，7入仓位完成，8入库失败
+    /// 9出库执行中，10出仓位完成，11出库失败
+    /// </summary>
+    private int status;
+    /// <summary>
+    /// 操作相关数据，出仓完成或入仓完成时,需要有 posId 信息
+
+    /// </summary>
+    private Map<String, String> data = new HashMap<>();
+    /// <summary>
+    /// 单台BOX的消息
+    /// 正在调试中，不能出入库
+    /// 入库失败原因：
+    /// 出库失败原因：
+    /// </summary>
+    public String msg;
+    /// <summary>
+    /// 温度
+    /// </summary>
+    public String temperature;
+    /// <summary>
+    /// 湿度
+    /// </summary>
+    public String humidity;
+
+    public int getBoxId() {
+        return boxId;
+    }
+
+    public void setBoxId(int boxId) {
+        this.boxId = boxId;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getHumidity() {
+        return humidity;
+    }
+
+    public void setHumidity(String humidity) {
+        this.humidity = humidity;
+    }
+
+    /**
+     * 当前的 BOX 是否空闲,即状态为就绪状态
+     */
+    public boolean boxIsIdle(){
+        return status == BOX_STATUS.READY;
+    }
+
+
+    /**
+     * 当前的 BOX 是否正在出库执行(未出仓位或出仓完成但还没完成出库)
+     */
+    public boolean boxIsCheckingOut(){
+        return status == BOX_STATUS.CHECKOUT || status == BOX_STATUS.OUT_FINISHED || status == BOX_STATUS.OUT_MOVING;
+    }
+
+    /**
+     * 当前 box 是否可以接受出库任务(空闲或出仓完成或正在移栽的都可以再分配出库任务)
+     */
+    public boolean boxCanCheckout(){
+        return boxIsIdle() || status == BOX_STATUS.OUT_MOVING;
+    }
+
+    /**
+     * BOX 是否可以正常使用,没有急停,故障,调试等
+     */
+    public boolean boxIsAvailable(){
+        return status != BOX_STATUS.EMERGENCY && status != BOX_STATUS.PROBLEM && status != BOX_STATUS.DEBUG ;
+    }
+
+    public Map<String, String> getData() {
+        return data;
+    }
+
+    public void setData(Map<String, String> data) {
+        this.data = data;
+    }
+
+    /**
+     * 获取客户端发送上来的出入库完成的库位信息
+     */
+    public String getPosId(){
+        return data.get("posId");
+    }
+}

src/main/java/com/neotel/smfcore/core/device/enums/BOX_STATUS.java

+package com.neotel.smfcore.core.device.enums;
+
+/**
+ * Created by sunke on 2021/7/13.
+ */
+public class BOX_STATUS {
+    /**
+     * 1=准备就绪
+     */
+    public final static  int READY = 1;
+
+    /**
+     * 2=急停
+     */
+    public final static  int EMERGENCY = 2;
+    /**
+     * 3=故障
+     */
+    public final static  int PROBLEM = 3;
+    /**
+     * 4=警告（用msg发送提醒，如出库到达工位但是没有工人操作）
+     */
+    public final static  int WARNING = 4;
+    /**
+     * 5=调试中
+     */
+    public final static  int DEBUG = 5;
+    /**
+     * 6入库执行中
+     */
+    public final static  int PUTIN = 6;
+    /**
+     * 7入仓位完成，
+     */
+    public final static  int IN_FINISHED = 7;
+    /**
+     * 8入库失败
+     */
+    public final static  int IN_FAILED = 8;
+    /**
+     *9出库执行中，
+     */
+    public final static  int CHECKOUT = 9;
+    /**
+     * 10出仓位完成
+     */
+    public final static  int OUT_FINISHED = 10;
+    /**
+     * 11出库完成
+     */
+    public final static  int OUT_END = 11;
+
+    /**
+     * 12出库移栽中
+     */
+    public final static int OUT_MOVING = 12;
+
+    /**
+     * 13原点返回中
+     */
+    public final static int RESET = 13;
+
+    /**
+     * 14 回温取料中
+     */
+    public final static int REWARM_TAKING = 14;
+
+    /**
+     * 15 回温取料完成
+     */
+    public final static int REWARM_TAKING_END = 15;
+
+    /**
+     * 16 回温放料中
+     */
+    public final static int REWARM_PUTTING = 16;
+
+    /**
+     * 17 回温放料完成
+     */
+    public final static int REWARM_PUTTING_END = 17;
+
+    /**
+     * 18 搅拌取料中
+     */
+    public final static int MIX_TAKING = 18;
+
+    /**
+     * 19 等待搅拌
+     */
+    public final static int WAIT_MIX = 19;
+
+    /**
+     * 20 搅拌执行中
+     */
+    public final static int MIXING = 20;
+
+    /**
+     * 21 搅拌完成回仓
+     */
+    public final static int MIX_PUTTING = 21;
+
+    /**
+     * 22 搅拌完成放回原来的仓中
+     */
+    public final static int MIX_END = 22;
+}

src/main/java/com/neotel/smfcore/core/device/handler/BaseDeviceHandler.java

+package com.neotel.smfcore.core.device.handler;
+
+import com.neotel.smfcore.common.enums.DeviceType;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by sunke on 2021/7/12.
+ */
+@Service
+public class BaseDeviceHandler implements IDeviceHandler{
+
+    @Override
+    public StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request) {
+        return null;
+    }
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.AUTO;
+    }
+}

src/main/java/com/neotel/smfcore/core/device/IDeviceHandler.java → src/main/java/com/neotel/smfcore/core/device/handler/IDeviceHandler.java

-package com.neotel.smfcore.core.device;
+package com.neotel.smfcore.core.device.handler;
+
+import com.neotel.smfcore.common.enums.DeviceType;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+
+import javax.servlet.http.HttpServletRequest;
 
 
 /**
 /**
  * Created by sunke on 2021/7/13.
  * Created by sunke on 2021/7/13.
  */
  */
 public interface IDeviceHandler {
 public interface IDeviceHandler {
 
 
-    String getDeviceType();
+    StatusBean handleClientRequest(StatusBean statusBean, HttpServletRequest request);
+
+    DeviceType getDeviceType();
 }
 }

src/main/java/com/neotel/smfcore/core/device/BaseDeviceHandler.java → src/main/java/com/neotel/smfcore/core/device/handler/SmdXlBoxHandler.java

-package com.neotel.smfcore.core.device;
+package com.neotel.smfcore.core.device.handler;
 
 
-import com.neotel.smfcore.core.listener.IDeviceListener;
+import com.neotel.smfcore.common.enums.DeviceType;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
 /**
  * Created by sunke on 2021/7/12.
  * Created by sunke on 2021/7/12.
  */
  */
 @Service
 @Service
-public class BaseDeviceHandler implements IDeviceHandler{
-
+public class SmdXlBoxHandler extends BaseDeviceHandler{
 
 
     @Override
     @Override
-    public String getDeviceType() {
-        return "";
+    public DeviceType getDeviceType() {
+        return DeviceType.SMD_XL;
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/core/device/handler/VerticalBoxHandler.java

+package com.neotel.smfcore.core.device.handler;
+
+import com.neotel.smfcore.common.enums.DeviceType;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by sunke on 2021/7/13.
+ */
+@Service
+public class VerticalBoxHandler extends BaseDeviceHandler{
+
+    @Override
+    public DeviceType getDeviceType() {
+        return DeviceType.VERTICALBOX;
+    }
+}

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

+
+package com.neotel.smfcore.core.device.rest;
+
+import com.neotel.smfcore.security.annotation.AnonymousPostMapping;
+import com.neotel.smfcore.common.enums.DeviceType;
+import com.neotel.smfcore.core.device.handler.IDeviceHandler;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.service.po.Storage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Slf4j
+@RestController
+@RequestMapping("/service/store")
+@RequiredArgsConstructor
+@Api(tags = "设备通信")
+public class DeviceController {
+
+    @Autowired
+    private DataCache dataCahche;
+
+    private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
+
+    public DeviceController(List<IDeviceHandler> deviceHandlerList){
+        for (IDeviceHandler deviceHandler : deviceHandlerList) {
+            System.out.println(deviceHandler.getDeviceType() + "处理类 :" + deviceHandler.getClass());
+            handlerMap.put(deviceHandler.getDeviceType().name(),deviceHandler);
+        }
+    }
+
+    @ApiOperation("客户端定时通信接口")
+    @AnonymousPostMapping(value = "/communication")
+    @ResponseBody
+    public StatusBean communication(@RequestBody final StatusBean statusBean, HttpServletRequest request) {
+        try {
+            String cid = statusBean.getCid();
+            Storage storage = dataCahche.getStorage(cid);
+            if (storage == null) {
+                log.error("料仓cid: [" + cid + "]不存在");
+                return null;
+            }
+            synchronized (storage) {
+                String deviceType = storage.getType();
+                IDeviceHandler deviceHandler = handlerMap.get(deviceType);
+                if(deviceHandler == null){
+                    //未找到处理类,使用默认处理类
+                   deviceHandler = handlerMap.get(DeviceType.AUTO.name());
+                }
+                StatusBean resultBean = deviceHandler.handleClientRequest(statusBean,request);
+                return resultBean;
+            }
+        } catch (Exception e) {
+            log.error("", e);
+        }
+        return statusBean;
+    }
+}

src/main/java/com/neotel/smfcore/core/listener/ApiListener.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
  * Created by sunke on 2021/7/12.
  * Created by sunke on 2021/7/12.
  */
  */
 @Service
 @Service
-public class ApiListener implements IDeviceListener {
+public class ApiListener implements ITaskListener {
 
 
     @Override
     @Override
     public String onScanCode(String codeStr) {
     public String onScanCode(String codeStr) {

src/main/java/com/neotel/smfcore/core/listener/IDeviceListener.java → src/main/java/com/neotel/smfcore/core/listener/ITaskListener.java

 package com.neotel.smfcore.core.listener;
 package com.neotel.smfcore.core.listener;
 
 
+import com.neotel.smfcore.core.service.po.DataLog;
+
 /**
 /**
  * Created by sunke on 2021/7/12.
  * Created by sunke on 2021/7/12.
  */
  */
-public interface IDeviceListener {
+public interface ITaskListener {
 
 
-    String onScanCode(String codeStr);
+    String onTaskStatusChange(DataLog task);
 
 
 }
 }

src/main/java/com/neotel/smfcore/core/listener/LiteOrderListener.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Service;
  * Created by sunke on 2021/7/12.
  * Created by sunke on 2021/7/12.
  */
  */
 @Service
 @Service
-public class LiteOrderListener implements IDeviceListener {
+public class LiteOrderListener implements ITaskListener {
 
 
     @Override
     @Override
     public String onScanCode(String codeStr) {
     public String onScanCode(String codeStr) {

src/main/java/com/neotel/smfcore/core/rest/TaskService.java

 package com.neotel.smfcore.core.rest;
 package com.neotel.smfcore.core.rest;
 
 
-import com.neotel.smfcore.core.device.IDeviceHandler;
-import com.neotel.smfcore.core.listener.IDeviceListener;
+import com.google.common.collect.Maps;
+import com.neotel.smfcore.core.listener.ITaskListener;
+import com.neotel.smfcore.core.service.po.DataLog;
+import org.springframework.stereotype.Service;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
  * Created by sunke on 2021/7/13.
  * Created by sunke on 2021/7/13.
  */
  */
+@Service
 public class TaskService {
 public class TaskService {
 
 
-    private List<IDeviceListener> listenerList = new ArrayList<>();
+    private List<ITaskListener> taskListenerList = new ArrayList<>();
 
 
-    private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
+    /**
+     * 任务队列,Key 为dataLog的ID，value 为本区域待执行的任务
+     */
+    private static Map<String, DataLog> taskMap = Maps.newConcurrentMap();
 
 
-    public TaskService(List<IDeviceHandler> deviceHandlerList, List<IDeviceListener> deviceListenerList){
+    /**
+     * 完成的任务列表Key 为dataLog的ID, Value 为 Datalog
+     */
+    private static Map<String,DataLog> theFinishedTaskMap = Maps.newConcurrentMap();
 
 
-        for (IDeviceHandler deviceHandler : deviceHandlerList) {
-            
-        }
-        for (IDeviceListener deviceListener: deviceListenerList) {
-            listenerList.add(deviceListener);
+    public TaskService(List<ITaskListener> deviceListenerList){
+        for (ITaskListener deviceListener: deviceListenerList) {
+            taskListenerList.add(deviceListener);
         }
         }
     }
     }
+
 }
 }

src/main/java/com/neotel/smfcore/security/service/dao/IAlarmInfoDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IAlarmInfoDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IDataLogDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IDataLogDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IHumitureDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IHumitureDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/ILiteOrderDao.java → src/main/java/com/neotel/smfcore/core/service/dao/ILiteOrderDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/ILiteOrderItemDao.java → src/main/java/com/neotel/smfcore/core/service/dao/ILiteOrderItemDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
-import com.neotel.smfcore.security.service.po.LiteOrderItem;
+import com.neotel.smfcore.core.service.po.LiteOrderItem;
 
 
 import java.util.List;
 import java.util.List;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IMaintenanceDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IMaintenanceDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
-import com.neotel.smfcore.security.service.po.Maintenance;
+import com.neotel.smfcore.core.service.po.Maintenance;
 
 
 public interface IMaintenanceDao extends IBaseDao {
 public interface IMaintenanceDao extends IBaseDao {
     Maintenance findByCid(String cid);
     Maintenance findByCid(String cid);

src/main/java/com/neotel/smfcore/security/service/dao/ISettingsDao.java → src/main/java/com/neotel/smfcore/core/service/dao/ISettingsDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IStorageDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IStorageDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/IStoragePosDao.java → src/main/java/com/neotel/smfcore/core/service/dao/IStoragePosDao.java

-package com.neotel.smfcore.security.service.dao;
+package com.neotel.smfcore.core.service.dao;
 
 
 import com.neotel.smfcore.common.base.IBaseDao;
 import com.neotel.smfcore.common.base.IBaseDao;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/impl/AlarmInfoDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/AlarmInfoDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IAlarmInfoDao;
-import com.neotel.smfcore.security.service.po.AlarmInfo;
+import com.neotel.smfcore.core.service.dao.IAlarmInfoDao;
+import com.neotel.smfcore.core.service.po.AlarmInfo;
 
 
 public class AlarmInfoDaoImpl extends AbstractBaseDao implements IAlarmInfoDao {
 public class AlarmInfoDaoImpl extends AbstractBaseDao implements IAlarmInfoDao {
     @Override
     @Override

src/main/java/com/neotel/smfcore/security/service/dao/impl/DataLogDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/DataLogDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IDataLogDao;
-import com.neotel.smfcore.security.service.po.DataLog;
+import com.neotel.smfcore.core.service.dao.IDataLogDao;
+import com.neotel.smfcore.core.service.po.DataLog;
+import org.springframework.stereotype.Service;
 
 
+@Service
 public class DataLogDaoImpl extends AbstractBaseDao implements IDataLogDao {
 public class DataLogDaoImpl extends AbstractBaseDao implements IDataLogDao {
     @Override
     @Override
     public Class getEntityClass() {
     public Class getEntityClass() {

src/main/java/com/neotel/smfcore/security/service/dao/impl/HumitureDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/HumitureDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IHumitureDao;
-import com.neotel.smfcore.security.service.po.Humiture;
+import com.neotel.smfcore.core.service.dao.IHumitureDao;
+import com.neotel.smfcore.core.service.po.Humiture;
 
 
 public class HumitureDaoImpl extends AbstractBaseDao implements IHumitureDao {
 public class HumitureDaoImpl extends AbstractBaseDao implements IHumitureDao {
     @Override
     @Override

src/main/java/com/neotel/smfcore/security/service/dao/impl/LiteOrderDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/LiteOrderDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.ILiteOrderDao;
-import com.neotel.smfcore.security.service.po.LiteOrder;
+import com.neotel.smfcore.core.service.dao.ILiteOrderDao;
+import com.neotel.smfcore.core.service.po.LiteOrder;
 
 
 public class LiteOrderDaoImpl extends AbstractBaseDao implements ILiteOrderDao {
 public class LiteOrderDaoImpl extends AbstractBaseDao implements ILiteOrderDao {
     @Override
     @Override

src/main/java/com/neotel/smfcore/security/service/dao/impl/LiteOrderItemDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/LiteOrderItemDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.ILiteOrderItemDao;
-import com.neotel.smfcore.security.service.po.LiteOrderItem;
+import com.neotel.smfcore.core.service.dao.ILiteOrderItemDao;
+import com.neotel.smfcore.core.service.po.LiteOrderItem;
 
 
 import java.util.List;
 import java.util.List;
 
 

src/main/java/com/neotel/smfcore/security/service/dao/impl/MaintenanceDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/MaintenanceDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IMaintenanceDao;
-import com.neotel.smfcore.security.service.po.Maintenance;
+import com.neotel.smfcore.core.service.dao.IMaintenanceDao;
+import com.neotel.smfcore.core.service.po.Maintenance;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

src/main/java/com/neotel/smfcore/security/service/dao/impl/SettingsDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/SettingsDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.ISettingsDao;
-import com.neotel.smfcore.security.service.po.Settings;
+import com.neotel.smfcore.core.service.dao.ISettingsDao;
+import com.neotel.smfcore.core.service.po.Settings;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

src/main/java/com/neotel/smfcore/security/service/dao/impl/StorageDaoImpl.java → src/main/java/com/neotel/smfcore/core/service/dao/impl/StorageDaoImpl.java

-package com.neotel.smfcore.security.service.dao.impl;
+package com.neotel.smfcore.core.service.dao.impl;
 
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
 import com.neotel.smfcore.common.base.AbstractBaseDao;
-import com.neotel.smfcore.security.service.dao.IStorageDao;
-import com.neotel.smfcore.security.service.po.Storage;
+import com.neotel.smfcore.core.service.dao.IStorageDao;
+import com.neotel.smfcore.core.service.po.Storage;
+import org.springframework.stereotype.Service;
 
 
+@Service
 public class StorageDaoImpl extends AbstractBaseDao implements IStorageDao {
 public class StorageDaoImpl extends AbstractBaseDao implements IStorageDao {
     @Override
     @Override
     public Class getEntityClass() {
     public Class getEntityClass() {

src/main/java/com/neotel/smfcore/security/service/po/data/DeviceStatusBean.java → src/main/java/com/neotel/smfcore/core/service/data/DeviceStatusBean.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

src/main/java/com/neotel/smfcore/security/service/po/data/InactionTaskSet.java → src/main/java/com/neotel/smfcore/core/service/data/InactionTaskSet.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/security/service/po/data/PlateSizeBean.java → src/main/java/com/neotel/smfcore/core/service/data/PlateSizeBean.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import com.neotel.smfcore.common.utils.PLATE_SIZE;
 import com.neotel.smfcore.common.utils.PLATE_SIZE;
 import lombok.Getter;
 import lombok.Getter;

src/main/java/com/neotel/smfcore/security/service/po/data/PreWareHousing.java → src/main/java/com/neotel/smfcore/core/service/data/PreWareHousing.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/security/service/po/data/ProviderPattern.java → src/main/java/com/neotel/smfcore/core/service/data/ProviderPattern.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/security/service/po/data/TaskSet.java → src/main/java/com/neotel/smfcore/core/service/data/TaskSet.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;

src/main/java/com/neotel/smfcore/security/service/po/data/UsageItem.java → src/main/java/com/neotel/smfcore/core/service/data/UsageItem.java

-package com.neotel.smfcore.security.service.po.data;
+package com.neotel.smfcore.core.service.data;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

src/main/java/com/neotel/smfcore/core/service/manager/IDataLogManager.java

+package com.neotel.smfcore.core.service.manager;
+
+import com.neotel.smfcore.common.base.IBaseManager;
+import com.neotel.smfcore.core.service.po.DataLog;
+
+public interface IDataLogManager extends IBaseManager<DataLog> {
+}

src/main/java/com/neotel/smfcore/security/service/manager/IHumitureManager.java → src/main/java/com/neotel/smfcore/core/service/manager/IHumitureManager.java

-package com.neotel.smfcore.security.service.manager;
+package com.neotel.smfcore.core.service.manager;
 
 
 import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.base.IBaseManager;
-import com.neotel.smfcore.security.service.po.Humiture;
+import com.neotel.smfcore.core.service.po.Humiture;
 
 
 public interface IHumitureManager extends IBaseManager<Humiture> {
 public interface IHumitureManager extends IBaseManager<Humiture> {
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/IStorageManager.java → src/main/java/com/neotel/smfcore/core/service/manager/IStorageManager.java

-package com.neotel.smfcore.security.service.manager;
+package com.neotel.smfcore.core.service.manager;
 
 
 import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.base.IBaseManager;
-import com.neotel.smfcore.security.service.po.Storage;
+import com.neotel.smfcore.core.service.po.Storage;
+
+import java.util.List;
 
 
 public interface IStorageManager extends IBaseManager<Storage> {
 public interface IStorageManager extends IBaseManager<Storage> {
+    List<Storage> findAll();
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/IStoragePosManager.java → src/main/java/com/neotel/smfcore/core/service/manager/IStoragePosManager.java

-package com.neotel.smfcore.security.service.manager;
+package com.neotel.smfcore.core.service.manager;
 
 
 import com.neotel.smfcore.common.base.IBaseManager;
 import com.neotel.smfcore.common.base.IBaseManager;
-import com.neotel.smfcore.security.service.po.StoragePos;
+import com.neotel.smfcore.core.service.po.StoragePos;
 
 
 public interface IStoragePosManager extends IBaseManager<StoragePos> {
 public interface IStoragePosManager extends IBaseManager<StoragePos> {
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/StorageManagerImpl.java → src/main/java/com/neotel/smfcore/core/service/manager/impl/DataLogManagerImpl.java

-package com.neotel.smfcore.security.service.manager.impl;
+package com.neotel.smfcore.core.service.manager.impl;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.security.service.manager.IStorageManager;
-import com.neotel.smfcore.security.service.po.Storage;
+import com.neotel.smfcore.core.service.manager.IDataLogManager;
+import com.neotel.smfcore.core.service.po.DataLog;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
 
 
 import java.util.List;
 import java.util.List;
 
 
-public class StorageManagerImpl implements IStorageManager {
+@Service
+public class DataLogManagerImpl implements IDataLogManager {
+
     @Override
     @Override
-    public Storage get(String id) {
+    public DataLog get(String id) {
         return null;
         return null;
     }
     }
 
 
     @Override
     @Override
-    public Storage save(Storage object) throws ValidateException {
+    public DataLog save(DataLog object) throws ValidateException {
         return null;
         return null;
     }
     }
 
 
     @Override
     @Override
-    public void delete(Storage object) throws ValidateException {
+    public void delete(DataLog object) throws ValidateException {
 
 
     }
     }
 
 
     @Override
     @Override
-    public List<Storage> findByPage(Query query, Pageable pageable) {
+    public List<DataLog> findByPage(Query query, Pageable pageable) {
         return null;
         return null;
     }
     }
 
 
     @Override
     @Override
-    public List<Storage> findByQuery(Query query) {
+    public List<DataLog> findByQuery(Query query) {
         return null;
         return null;
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/security/service/manager/impl/HumitureManagerImpl.java → src/main/java/com/neotel/smfcore/core/service/manager/impl/HumitureManagerImpl.java

-package com.neotel.smfcore.security.service.manager.impl;
+package com.neotel.smfcore.core.service.manager.impl;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.security.service.manager.IHumitureManager;
-import com.neotel.smfcore.security.service.po.Humiture;
+import com.neotel.smfcore.core.service.manager.IHumitureManager;
+import com.neotel.smfcore.core.service.po.Humiture;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 

src/main/java/com/neotel/smfcore/core/service/manager/impl/StorageManagerImpl.java

+package com.neotel.smfcore.core.service.manager.impl;
+
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.core.service.dao.IStorageDao;
+import com.neotel.smfcore.core.service.manager.IStorageManager;
+import com.neotel.smfcore.core.service.po.Storage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StorageManagerImpl implements IStorageManager {
+
+    @Autowired
+    private IStorageDao storageDao;
+
+    @Override
+    public Storage get(String id) {
+        return storageDao.findOneById(id);
+    }
+
+    @Override
+    public Storage save(Storage object) throws ValidateException {
+        return storageDao.save(object);
+    }
+
+    @Override
+    public void delete(Storage object) throws ValidateException {
+
+    }
+
+    @Override
+    public List<Storage> findByPage(Query query, Pageable pageable) {
+        return storageDao.findByQuery(query,pageable);
+    }
+
+    @Override
+    public List<Storage> findByQuery(Query query) {
+        return storageDao.findByQuery(query);
+    }
+
+    @Override
+    public List<Storage> findAll(){
+        return storageDao.findAll();
+    }
+}

src/main/java/com/neotel/smfcore/security/service/manager/impl/StoragePosManagerImpl.java → src/main/java/com/neotel/smfcore/core/service/manager/impl/StoragePosManagerImpl.java

-package com.neotel.smfcore.security.service.manager.impl;
+package com.neotel.smfcore.core.service.manager.impl;
 
 
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.security.service.manager.IStoragePosManager;
-import com.neotel.smfcore.security.service.po.StoragePos;
+import com.neotel.smfcore.core.service.manager.IStoragePosManager;
+import com.neotel.smfcore.core.service.po.StoragePos;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 

src/main/java/com/neotel/smfcore/security/service/po/AlarmInfo.java → src/main/java/com/neotel/smfcore/core/service/po/AlarmInfo.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
+import com.neotel.smfcore.common.utils.StorageConstants;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 
@@ -46,4 +47,12 @@ public class AlarmInfo extends BasePo implements Serializable {
      * 结束时间
      * 结束时间
      */
      */
     private Date endTime;
     private Date endTime;
+
+    public String getAlarmTypeMsg(){
+        return StorageConstants.ALARM_TYPE_MSG.getMsg(alarmType,alarmDetail);
+    }
+
+    public String getKey(){
+        return storageName + "-"+ boxId + "-" + alarmType+"-" + alarmDetail;
+    }
 }
 }

src/main/java/com/neotel/smfcore/security/service/po/DataLog.java → src/main/java/com/neotel/smfcore/core/service/po/DataLog.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;

src/main/java/com/neotel/smfcore/security/service/po/Humiture.java → src/main/java/com/neotel/smfcore/core/service/po/Humiture.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/security/service/po/LiteOrder.java → src/main/java/com/neotel/smfcore/core/service/po/LiteOrder.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;

src/main/java/com/neotel/smfcore/security/service/po/LiteOrderItem.java → src/main/java/com/neotel/smfcore/core/service/po/LiteOrderItem.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import lombok.Data;
 import lombok.Data;

src/main/java/com/neotel/smfcore/security/service/po/Maintenance.java → src/main/java/com/neotel/smfcore/core/service/po/Maintenance.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.DateUtil;
-import com.neotel.smfcore.security.service.po.data.DeviceStatusBean;
+import com.neotel.smfcore.core.service.data.DeviceStatusBean;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 

src/main/java/com/neotel/smfcore/security/service/po/Settings.java → src/main/java/com/neotel/smfcore/core/service/po/Settings.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;

src/main/java/com/neotel/smfcore/security/service/po/Storage.java → src/main/java/com/neotel/smfcore/core/service/po/Storage.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.utils.StorageConstants;
 import com.neotel.smfcore.common.utils.StorageConstants;
-import com.neotel.smfcore.security.service.po.data.PlateSizeBean;
-import com.neotel.smfcore.security.service.po.data.UsageItem;
+import com.neotel.smfcore.core.service.data.PlateSizeBean;
+import com.neotel.smfcore.core.service.data.UsageItem;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.NotNull;
 import lombok.Data;
 import lombok.Data;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/neotel/smfcore/security/service/po/StoragePos.java → src/main/java/com/neotel/smfcore/core/service/po/StoragePos.java

-package com.neotel.smfcore.security.service.po;
+package com.neotel.smfcore.core.service.po;
 
 
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.neotel.smfcore.common.base.BasePo;
 import com.neotel.smfcore.common.base.BasePo;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import lombok.Data;
 import lombok.Data;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.List;
 import java.util.List;

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousAccess.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousAccess.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *  limitations under the License.
  */
  */
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import java.lang.annotation.*;
 import java.lang.annotation.*;
 
 

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousDeleteMapping.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousDeleteMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousGetMapping.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousGetMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousPatchMapping.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousPatchMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousPostMapping.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousPostMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/neotel/smfcore/common/annotation/security/AnonymousPutMapping.java → src/main/java/com/neotel/smfcore/security/annotation/AnonymousPutMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.neotel.smfcore.common.annotation.security;
+package com.neotel.smfcore.security.annotation;
 
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/neotel/smfcore/security/config/SpringSecurityConfig.java

@@ -15,7 +15,7 @@
  */
  */
 package com.neotel.smfcore.security.config;
 package com.neotel.smfcore.security.config;
 
 
-import com.neotel.smfcore.common.annotation.security.AnonymousAccess;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.common.enums.RequestMethodEnum;
 import com.neotel.smfcore.common.enums.RequestMethodEnum;
 import com.neotel.smfcore.security.JwtAccessDeniedHandler;
 import com.neotel.smfcore.security.JwtAccessDeniedHandler;
 import com.neotel.smfcore.security.JwtAuthenticationEntryPoint;
 import com.neotel.smfcore.security.JwtAuthenticationEntryPoint;

src/main/java/com/neotel/smfcore/security/rest/AuthorizationController.java

@@ -15,9 +15,9 @@
  */
  */
 package com.neotel.smfcore.security.rest;
 package com.neotel.smfcore.security.rest;
 
 
-import com.neotel.smfcore.common.annotation.security.AnonymousDeleteMapping;
-import com.neotel.smfcore.common.annotation.security.AnonymousGetMapping;
-import com.neotel.smfcore.common.annotation.security.AnonymousPostMapping;
+import com.neotel.smfcore.security.annotation.AnonymousDeleteMapping;
+import com.neotel.smfcore.security.annotation.AnonymousGetMapping;
+import com.neotel.smfcore.security.annotation.AnonymousPostMapping;
 import com.neotel.smfcore.common.utils.EncryptUtils;
 import com.neotel.smfcore.common.utils.EncryptUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.security.bean.RsaProperties;
 import com.neotel.smfcore.security.bean.RsaProperties;