Commit f0858e97 张少辉

工单超过200盘 拆分工单

1 个父辈 cbc849b7
...@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest; ...@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.neotel.smfcore.common.bean.PageData; import com.neotel.smfcore.common.bean.PageData;
import com.neotel.smfcore.common.bean.ResultBean; import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.exception.ValidateException; import com.neotel.smfcore.common.exception.ValidateException;
...@@ -25,19 +24,15 @@ import com.neotel.smfcore.core.storage.service.po.Storage; ...@@ -25,19 +24,15 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl; import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.service.po.Humiture;
import com.neotel.smfcore.core.system.util.DevicesStatusUtil; import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.security.annotation.AnonymousPutMapping; import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
import com.neotel.smfcore.security.service.manager.IGroupManager; import com.neotel.smfcore.security.service.manager.IGroupManager;
import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl; import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
import com.neotel.smfcore.security.service.po.Group; import com.neotel.smfcore.security.service.po.Group;
import com.neotel.smfcore.security.service.po.User; import com.neotel.smfcore.security.service.po.User;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import javafx.concurrent.Task;
import lombok.Data;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -45,7 +40,6 @@ import org.springframework.data.domain.Pageable; ...@@ -45,7 +40,6 @@ import org.springframework.data.domain.Pageable;
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;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
......
...@@ -39,7 +39,7 @@ public class StationCacheUtil { ...@@ -39,7 +39,7 @@ public class StationCacheUtil {
@PostConstruct @PostConstruct
public void init() { public void init() {
log.info("开始工位缓存信息"); log.info("开始工位缓存信息");
for (int i = 1; i <= 5; i++) { /*for (int i = 1; i <= 5; i++) {
String stationName = "s" + i; String stationName = "s" + i;
Station station = dataCache.getCache(stationName); Station station = dataCache.getCache(stationName);
if(station == null){ if(station == null){
...@@ -48,7 +48,7 @@ public class StationCacheUtil { ...@@ -48,7 +48,7 @@ public class StationCacheUtil {
} }
stationMap.put(stationName,station); stationMap.put(stationName,station);
dataCache.updateCache(stationName, station); dataCache.updateCache(stationName, station);
} }*/
} }
public static synchronized void updateStation(Station station){ public static synchronized void updateStation(Station station){
......
...@@ -31,7 +31,7 @@ public class StationStatusCache { ...@@ -31,7 +31,7 @@ public class StationStatusCache {
private static Map<String, String> stationStatusMap = Maps.newConcurrentMap(); private static Map<String, String> stationStatusMap = Maps.newConcurrentMap();
@PostConstruct //@PostConstruct
public void init() { public void init() {
try { try {
List<StationStatus> statusList = maiZhengApi.StationStatus(); List<StationStatus> statusList = maiZhengApi.StationStatus();
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!