|
@@ -1709,10 +1709,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
|
|
|
List<PlcCostomAddress> returnList=new ArrayList<>();
|
|
|
List<PlcCostomAddress> addressList = plcCostomAddressMapper.getAddressList();
|
|
|
PlcCostomAddressHistory addressListHistory = plcCostomAddressHistoryMapper.getGroupByList();
|
|
|
- String cleanedStr = addressListHistory.getValue().replaceAll("[\\[\\]\"]", "").trim();
|
|
|
- List<String> stringList = Arrays.asList(cleanedStr);
|
|
|
- for(int i=0;i<stringList.size();i++){
|
|
|
- String string = stringList.get(i);
|
|
|
+ JSONArray jsonArray = JSONObject.parseArray(addressListHistory.getValue());
|
|
|
+
|
|
|
+ for(int i=0;i<jsonArray.size();i++){
|
|
|
+ String string = jsonArray.getString(i);
|
|
|
if("True".equals(string)){
|
|
|
PlcCostomAddress plcCostomAddress = addressList.get(i);
|
|
|
plcCostomAddress.setCreateTime(addressListHistory.getCreateTime());
|