|
|
@@ -6,24 +6,15 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.github.zuihou.authority.entity.auth.User;
|
|
|
import com.github.zuihou.authority.entity.common.DictionaryItem;
|
|
|
-import com.github.zuihou.authority.entity.core.Org;
|
|
|
-import com.github.zuihou.authority.service.auth.RoleService;
|
|
|
import com.github.zuihou.authority.service.auth.UserService;
|
|
|
import com.github.zuihou.authority.service.common.DictionaryItemService;
|
|
|
-import com.github.zuihou.authority.strategy.DataScopeContext;
|
|
|
-import com.github.zuihou.authority.strategy.impl.ThisLevelChildrenDataScope;
|
|
|
import com.github.zuihou.authority.utils.XxlJobUtil;
|
|
|
import com.github.zuihou.base.service.SuperCacheServiceImpl;
|
|
|
-import com.github.zuihou.common.constant.BizConstant;
|
|
|
-import com.github.zuihou.common.constant.CacheKey;
|
|
|
-import com.github.zuihou.common.constant.DictionaryKey;
|
|
|
-import com.github.zuihou.common.constant.DictionaryType;
|
|
|
+import com.github.zuihou.common.constant.*;
|
|
|
import com.github.zuihou.common.util.StringUtil;
|
|
|
import com.github.zuihou.context.BaseContextHandler;
|
|
|
import com.github.zuihou.database.mybatis.auth.DataScope;
|
|
|
-import com.github.zuihou.database.mybatis.auth.DataScopeType;
|
|
|
import com.github.zuihou.database.mybatis.conditions.Wraps;
|
|
|
import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
|
|
|
import com.github.zuihou.database.properties.DatabaseProperties;
|
|
|
@@ -54,6 +45,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
@@ -1086,7 +1078,9 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
headers.setContentType(MediaType.parseMediaType("application/json;charset=UTF-8"));
|
|
|
HttpEntity<String> formEntity = new HttpEntity<String>("", headers);
|
|
|
- String instructionUrl = DictionaryKey.INSTRUCTION_URL + "/api/getEquipment" ;
|
|
|
+ String instructionUrl = (null == redisTemplate.opsForValue().get(ParameterKey.PARAMETERS)? "": ((Map<String,String>) redisTemplate.opsForValue().get(ParameterKey.PARAMETERS)).get("capsule_plc").toString()) + "/api/getEquipment";
|
|
|
+
|
|
|
+// String instructionUrl = DictionaryKey.INSTRUCTION_URL + "/api/getEquipment" ;
|
|
|
try{
|
|
|
String returnData = restTemplate.postForObject(instructionUrl, formEntity, String.class);
|
|
|
//TODO
|
yejian