opt: 更改创建者显示，页面优化

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java

@@ -138,7 +138,7 @@ public class AddressServiceImpl extends CommonServiceImpl<AddressMapper, Address
             throw new BadRequestException(LangProcess.msg("error_checkExist", methodsDto.getMethods_code()));
         }
         Long userId = Long.valueOf(SecurityUtils.getCurrentUserId());
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setMethods_id(IdUtil.simpleUUID());
@@ -162,7 +162,7 @@ public class AddressServiceImpl extends CommonServiceImpl<AddressMapper, Address
         }
 
         Long userId = Long.valueOf(SecurityUtils.getCurrentUserId());
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_optid(userId);
         dto.setUpdate_optname(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java

@@ -46,9 +46,9 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(AcsPointAngle dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
-        dto.setCreate_by("auto");
+        dto.setCreate_by(currentUsername);
         dto.setCreate_time(now);
         dto.setUpdate_by(currentUsername);
         dto.setUpdate_time(now);
@@ -64,7 +64,7 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
         if (entity == null) {
             throw new BadRequestException(LangProcess.msg("error_nullPoint"));
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_by(currentUsername);
         dto.setUpdate_time(now);
@@ -101,7 +101,7 @@ public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, A
         AcsPointAngle acsPointAngle = new AcsPointAngle();
         acsPointAngle.setId(id);
         acsPointAngle.setIs_active(is_active);
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         acsPointAngle.setUpdate_by(currentUsername);
         acsPointAngle.setUpdate_time(now);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java

@@ -81,7 +81,7 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl<CustomPolicyMappe
 
     @Override
     public void create(CustomPolicyDTO dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         Date now = new Date();
         dto.setCreate_user(currentUsername);
         dto.setCreate_time(now);
@@ -90,7 +90,7 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl<CustomPolicyMappe
 
     @Override
     public void update(CustomPolicyDTO dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         Date now = new Date();
         dto.setUpdate_user(currentUsername);
         dto.setUpdate_time(now);
@@ -107,7 +107,7 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl<CustomPolicyMappe
 
     @Override
     public void createPlant(CustomPolicyPlantVO customPolicyPlantVO) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         CustomPolicy customPolicy = new CustomPolicy();
         Date now = new Date();
         customPolicy.setId(customPolicyPlantVO.getId());

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java

@@ -115,7 +115,7 @@ public class DeviceAssignedServiceImpl extends CommonServiceImpl<DeviceAssignedM
     @Transactional(rollbackFor = Exception.class)
     public void create(Map whereJson) {
         JSONObject param = new JSONObject();
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String device_code = whereJson.get("device_code").toString();
         String task_nextdevice = String.join(",", (List) whereJson.get("task_nextDevice_code"));
         String inst_nextdevice = String.join(",", (List) whereJson.get("inst_nextDevice_code"));
@@ -176,7 +176,7 @@ public class DeviceAssignedServiceImpl extends CommonServiceImpl<DeviceAssignedM
             jo.put(device, data);
         }
         param.put("param", jo);
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         param.put("update_by", currentUsername);
         param.put("update_time", now);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java

@@ -118,7 +118,7 @@ public class DeviceExtraServiceImpl extends CommonServiceImpl<DeviceExtraMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(DeviceExtraDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setExtra_id(IdUtil.simpleUUID());
@@ -139,7 +139,7 @@ public class DeviceExtraServiceImpl extends CommonServiceImpl<DeviceExtraMapper,
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -292,7 +292,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
             throw new BadRequestException(LangProcess.msg("error_checkExist", device_code));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setDevice_id(IdUtil.simpleUUID());
@@ -321,7 +321,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
             throw new BadRequestException(LangProcess.msg("error_checkExist", device_code));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
@@ -733,7 +733,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                 if (ObjectUtil.isEmpty(deviceRunpoint)) {
                     devrundto.setDevice_code(dto.getDevice_code());
                     devrundto.setDevice_id(dto.getDevice_id());
-                    devrundto.setCreate_by("auto");
+                    devrundto.setCreate_by(SecurityUtils.getCurrentNickName());
                     devrundto.setCreate_time(DateUtil.now());
 
                     DeviceRunpoint entity = ConvertUtil.convert(devrundto, DeviceRunpoint.class);
@@ -777,7 +777,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                 param.put("filed_type", "02");
                 param.put("device_id", device_id);
                 param.put("device_code", device_code);
-                param.put("create_by", SecurityUtils.getCurrentUsername());
+                param.put("create_by", SecurityUtils.getCurrentNickName());
                 param.put("create_time", DateUtil.now());
 //                wo.insert(param);
                 DeviceExtra entity = ConvertUtil.convert(param, DeviceExtra.class);
@@ -805,7 +805,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                 param.put("filed_type", "03");
                 param.put("device_id", device_id);
                 param.put("device_code", device_code);
-                param.put("create_by", SecurityUtils.getCurrentUsername());
+                param.put("create_by", SecurityUtils.getCurrentNickName());
                 param.put("create_time", DateUtil.now());
 //                wo.insert(param);
                 DeviceExtra entity = ConvertUtil.convert(param, DeviceExtra.class);
@@ -836,7 +836,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                         celldto.setZ(formatNum(j));
                         //celldto.setAddress(Integer.parseInt(CodeUtil.getNewCode("NDCADDRESS_NO")));
                         celldto.setCreate_by("init");
-                        celldto.setCreate_time(SecurityUtils.getCurrentUsername());
+                        celldto.setCreate_time(SecurityUtils.getCurrentNickName());
 //                        wo.insert((JSONObject) JSONObject.toJSON(celldto));
                         StorageCell entity = ConvertUtil.convert(celldto, StorageCell.class);
                         storageCellMapper.insert(entity);
@@ -862,7 +862,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                         celldto.setZ("0");
                         celldto.setAddress(Integer.parseInt(CodeUtil.getNewCode("NDCADDRESS_NO")));
                         celldto.setCreate_by("init");
-                        celldto.setCreate_time(SecurityUtils.getCurrentUsername());
+                        celldto.setCreate_time(SecurityUtils.getCurrentNickName());
 //                        wo.insert((JSONObject) JSONObject.toJSON(celldto));
                         StorageCell entity = ConvertUtil.convert(celldto, StorageCell.class);
                         storageCellMapper.insert(entity);
@@ -883,7 +883,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
                     celldto.setZ("0");
                     celldto.setAddress(Integer.parseInt(CodeUtil.getNewCode("NDCADDRESS_NO")));
                     celldto.setCreate_by("init");
-                    celldto.setCreate_time(SecurityUtils.getCurrentUsername());
+                    celldto.setCreate_time(SecurityUtils.getCurrentNickName());
 //                    wo.insert((JSONObject) JSONObject.toJSON(celldto));
                     StorageCell entity = ConvertUtil.convert(celldto, StorageCell.class);
                     storageCellMapper.insert(entity);
@@ -1902,9 +1902,15 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
             String is_config = list.get(3).toString();
             String is_route = list.get(4).toString();
             String region = list.get(5).toString();
-            String in_device_name = list.get(6).toString();
+            String in_device_name = null;
-            String en_device_name = list.get(7).toString();
+            String en_device_name = null;
-            String zh_device_name = list.get(8).toString();
+            String zh_device_name = null;
+            /*if(list.size() > 7){
+                in_device_name = list.get(6).toString();
+                en_device_name = list.get(7).toString();
+                zh_device_name = list.get(8).toString();
+            }*/
+
             if (StrUtil.isEmpty(device_code)) {
                 throw new BadRequestException(LangProcess.msg("error_checkNull", "device_code"));
             }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -40,6 +40,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -608,7 +609,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
         instdto.setTask_code(taskcode);
         String now = DateUtil.now();
         instdto.setCreate_time(now);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java

@@ -30,6 +30,7 @@ import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -479,7 +480,7 @@ public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
                     instdto.setTask_code(taskcode);
                     String now = DateUtil.now();
                     instdto.setCreate_time(now);
-                    instdto.setCreate_by("auto");
+                    instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                     instdto.setStart_device_code(start_device_code);
                     instdto.setNext_device_code(next_device_code);
                     instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -38,6 +38,7 @@ import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -659,7 +660,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java

@@ -38,6 +38,7 @@ import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -629,7 +630,7 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java

@@ -36,6 +36,7 @@ import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -650,7 +651,7 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java

@@ -33,6 +33,7 @@ import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.acs.task.service.mapper.TaskMapper;
 import org.nl.acs.utils.ConvertUtil;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -706,7 +707,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);
@@ -816,7 +817,7 @@ public class StandardCoveyorControlWithPlcScannerDeviceDriver extends AbstractOp
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java

@@ -32,6 +32,7 @@ import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
@@ -660,7 +661,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java

@@ -34,6 +34,7 @@ import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.thread.ThreadPoolExecutorUtil;
@@ -416,7 +417,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java

@@ -32,6 +32,7 @@ import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.thread.ThreadPoolExecutorUtil;
@@ -472,7 +473,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java

@@ -35,6 +35,7 @@ import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -621,7 +622,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -40,6 +40,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -513,7 +514,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
         instdto.setVehicle_code(vehiclecode);
         String now = DateUtil.now();
         instdto.setCreate_time(now);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(startCode);
         instdto.setNext_device_code(endCode);
         instdto.setStart_point_code(startCode);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java

@@ -35,6 +35,7 @@ import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.thread.ThreadPoolExecutorUtil;
@@ -567,7 +568,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -37,6 +37,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 
@@ -489,7 +490,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
         instdto.setRoute_plan_code(route_plan_code);
         instdto.setTask_id(taskid);
         instdto.setTask_code(taskcode);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java

@@ -38,6 +38,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -457,7 +458,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
         instdto.setRoute_plan_code(route_plan_code);
         instdto.setTask_id(taskid);
         instdto.setTask_code(taskcode);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java

@@ -39,6 +39,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 
@@ -478,7 +479,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
         instdto.setRoute_plan_code(route_plan_code);
         instdto.setTask_id(taskid);
         instdto.setTask_code(taskcode);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java

@@ -37,6 +37,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 
@@ -483,7 +484,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
             instdto.setRoute_plan_code(route_plan_code);
             instdto.setTask_id(taskid);
             instdto.setTask_code(taskcode);
-            instdto.setCreate_by("auto");
+            instdto.setCreate_by(SecurityUtils.getCurrentNickName());
             instdto.setStart_device_code(start_device_code);
             instdto.setNext_device_code(next_device_code);
             instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -37,6 +37,7 @@ import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 
@@ -448,7 +449,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
         instdto.setRoute_plan_code(route_plan_code);
         instdto.setTask_id(taskid);
         instdto.setTask_code(taskcode);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java

@@ -39,6 +39,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -451,7 +452,7 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -38,6 +38,7 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -528,7 +529,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java

@@ -34,6 +34,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -465,7 +466,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java

@@ -33,6 +33,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -467,7 +468,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 instdto.setVehicle_code(vehiclecode);
                 String now = DateUtil.now();
                 instdto.setCreate_time(now);
-                instdto.setCreate_by("auto");
+                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
                 instdto.setStart_device_code(start_device_code);
                 instdto.setNext_device_code(next_device_code);
                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -28,6 +28,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
 import org.openscada.opc.lib.da.Server;
@@ -464,7 +465,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
         instdto.setVehicle_code(vehiclecode);
         String now = DateUtil.now();
         instdto.setCreate_time(now);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java

@@ -109,7 +109,7 @@ public class DeviceErrorLogServiceImpl extends CommonServiceImpl<AcsDeviceErrorL
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(DeviceErrorLogDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setError_log_uuid(IdUtil.simpleUUID());
@@ -125,7 +125,7 @@ public class DeviceErrorLogServiceImpl extends CommonServiceImpl<AcsDeviceErrorL
     public void update(DeviceErrorLogDto dto) {
         DeviceErrorLogDto entity = this.findById(dto.getError_log_uuid());
         if (entity == null) {throw new BadRequestException(ERROR_DELETE);}
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         updateById(BeanUtil.copyProperties(dto, AcsDeviceErrorLog.class));
     }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -372,7 +372,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if(regional(dto.getStart_device_code(), dto.getNext_device_code())){
             throw new BadRequestException(LangProcess.msg("error_regional_max"));
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         if (StrUtil.isEmpty(dto.getRoute_plan_code())) {
             dto.setRoute_plan_code(task.getRoute_plan_code());
@@ -529,7 +529,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if(regional(dto.getStart_device_code(), dto.getNext_device_code())){
             throw new BadRequestException(LangProcess.msg("error_regional_max"));
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         if (StrUtil.isEmpty(dto.getRoute_plan_code())) {
             dto.setRoute_plan_code(task.getRoute_plan_code());
@@ -642,7 +642,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
     public void createAgain(Instruction dto) throws Exception {
         String task_code = dto.getTask_code();
         TaskDto task = taskService.findByCodeFromCache(task_code);
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         if (StrUtil.isEmpty(dto.getRoute_plan_code())) {
             dto.setRoute_plan_code(task.getRoute_plan_code());
@@ -733,7 +733,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(Instruction dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
@@ -798,7 +798,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
     public void finish(String id) {
         InstructionDto entity = this.findById(id);
         // if (entity == null) throw new BadRequestException(LangProcess.msg("error_sysAuth"));
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);
@@ -985,7 +985,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         instdto.setVehicle_code(acsTask.getVehicle_code());
         String now = DateUtil.now();
         instdto.setCreate_time(now);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);
@@ -1062,7 +1062,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                 acsToLiKuService.cancelTask(cancelTaskRequest);
             }
 
-            String currentUsername = SecurityUtils.getCurrentUsername();
+            String currentUsername = SecurityUtils.getCurrentNickName();
             String now = DateUtil.now();
             entity.setUpdate_time(now);
             entity.setUpdate_by(currentUsername);
@@ -1119,7 +1119,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         if (StrUtil.isEmpty(entity.getRoute_plan_code())) {
             entity.setRoute_plan_code(task.getRoute_plan_code());
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);
@@ -1173,7 +1173,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             entity.setRoute_plan_code(task.getRoute_plan_code());
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java

@@ -98,7 +98,7 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
         }
         limitRegional.setIs_active("1");
         limitRegional.setMax_num(max_num);
-        limitRegional.setCreate_by("auto");
+        limitRegional.setCreate_by(SecurityUtils.getCurrentNickName());
         limitRegional.setCreate_time(DateUtil.now());
         limitRegionalMapper.insert(limitRegional);
         dataList.add(limitRegional);
@@ -131,7 +131,7 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
             throw new BadRequestException(LangProcess.msg("error_isNull", "流量限制id="+json.getString("id")));
         }
         LimitRegional limitRegional = new LimitRegional();
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         limitRegional.setId(json.getString("id"));
         limitRegional.setStart_regional(json.getString("start_regional"));
         limitRegional.setNext_regional(json.getString("next_regional"));
@@ -169,7 +169,7 @@ public class LimitRegionalServiceImpl extends CommonServiceImpl<LimitRegionalMap
         LimitRegional limitRegional = new LimitRegional();
         limitRegional.setId(id);
         limitRegional.setIs_active(whereJson.get("is_active").toString());
-        limitRegional.setUpdate_by(SecurityUtils.getCurrentUsername());
+        limitRegional.setUpdate_by(SecurityUtils.getCurrentNickName());
         limitRegional.setUpdate_time(DateUtil.now());
         limitRegionalMapper.updateById(limitRegional);
         dataList.forEach(limitRegional1 -> {if (limitRegional.getId().equals(limitRegional1.getId())) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java

@@ -79,7 +79,7 @@ public class OpcServiceImpl extends CommonServiceImpl<OpcMapper, Opc> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insert(OpcDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setOpc_id(IdUtil.simpleUUID());
         dto.setCreate_by(currentUsername);
@@ -203,7 +203,7 @@ public class OpcServiceImpl extends CommonServiceImpl<OpcMapper, Opc> implements
         if (entity == null) {
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
@@ -305,7 +305,7 @@ public class OpcServiceImpl extends CommonServiceImpl<OpcMapper, Opc> implements
         plc_map.put("remark", (String) map.get("remark"));
         plc_map.put("is_active", CommonFinalParam.ONE);
         plc_map.put("is_delete", "0");
-        plc_map.put("create_by", SecurityUtils.getCurrentUsername());
+        plc_map.put("create_by", SecurityUtils.getCurrentNickName());
         plc_map.put("create_time", now);
         OpcPlc entity = ConvertUtil.convert(plc_map, OpcPlc.class);
         opcPlcMapper.insert(entity);
@@ -322,7 +322,7 @@ public class OpcServiceImpl extends CommonServiceImpl<OpcMapper, Opc> implements
     public void editPLC(JSONObject json) {
         String now = DateUtil.now();
         json.put("update_time", now);
-        json.put("update_by", SecurityUtils.getCurrentUsername());
+        json.put("update_by", SecurityUtils.getCurrentNickName());
         OpcPlc opcPlc = JSON.toJavaObject(json, OpcPlc.class);
         opcPlcMapper.updateById(opcPlc);
     }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java

@@ -313,7 +313,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
                 dto.setNext_device_code(next_device_code);
                 dto.setNext_device_type(next_device.getDevice_type());
                 dto.setType(String.valueOf(whereJson.get("type")));
-                String currentUsername = SecurityUtils.getCurrentUsername();
+                String currentUsername = SecurityUtils.getCurrentNickName();
                 String now = DateUtil.now();
 
                 dto.setLine_uuid(IdUtil.simpleUUID());
@@ -358,7 +358,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
         if (nextDevice != null) {
             dto.setNext_device_type(nextDevice.getDevice_type());
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java

@@ -159,7 +159,7 @@ public class RouteLocServiceImpl extends CommonServiceImpl<RouteLocMapper, Route
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(RouteLocDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setIoc_uuid(IdUtil.simpleUUID());
@@ -180,7 +180,7 @@ public class RouteLocServiceImpl extends CommonServiceImpl<RouteLocMapper, Route
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java

@@ -160,7 +160,7 @@ public class RoutePlanServiceImpl extends CommonServiceImpl<RoutePlanMapper, Rou
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(RoutePlanDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setPlan_uuid(IdUtil.simpleUUID());
@@ -181,7 +181,7 @@ public class RoutePlanServiceImpl extends CommonServiceImpl<RoutePlanMapper, Rou
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java

@@ -189,7 +189,7 @@ public class StorageCellServiceImpl extends CommonServiceImpl<StorageCellMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(StorageCellDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setStorage_id(IdUtil.simpleUUID());
@@ -210,7 +210,7 @@ public class StorageCellServiceImpl extends CommonServiceImpl<StorageCellMapper,
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java

@@ -191,7 +191,7 @@ public class TaskFeedbackServiceImpl extends CommonServiceImpl<TaskFeedbackMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(TaskFeedbackDto dto) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
         dto.setTaskback_id(IdUtil.simpleUUID());
@@ -213,7 +213,7 @@ public class TaskFeedbackServiceImpl extends CommonServiceImpl<TaskFeedbackMappe
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
@@ -300,7 +300,7 @@ public class TaskFeedbackServiceImpl extends CommonServiceImpl<TaskFeedbackMappe
     @Override
     public void invalid(String id) {
         TaskFeedbackDto entity = this.findById(id);
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -518,7 +518,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
                 throw new BadRequestException(LangProcess.msg("task_checkExist", dto.getVehicle_code()));
             }
         }
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         String task_uuid = dto.getTask_id();
         if (StrUtil.isEmpty(task_uuid)) {
@@ -534,7 +534,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         String start_device_code = dto.getStart_device_code();
         String next_device_code = dto.getNext_device_code();
         String route_plan_code = dto.getRoute_plan_code();
-        dto.setCreate_by("auto");
+        dto.setCreate_by(currentUsername);
         dto.setUpdate_by(currentUsername);
         dto.setUpdate_time(now);
         dto.setCreate_time(now);
@@ -762,7 +762,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
         dto.setUpdate_by(currentUsername);
@@ -799,7 +799,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
             throw new BadRequestException(LangProcess.msg("task_insHas"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);
@@ -829,7 +829,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
             throw new BadRequestException(LangProcess.msg("task_insRun"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         entity.setUpdate_time(now);
         entity.setUpdate_by(currentUsername);
@@ -916,7 +916,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         instdto.setVehicle_code(vehiclecode);
         String now = DateUtil.now();
         instdto.setCreate_time(now);
-        instdto.setCreate_by("auto");
+        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
         instdto.setStart_device_code(start_device_code);
         instdto.setNext_device_code(next_device_code);
         instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/aspect/LogAspect.java

@@ -149,7 +149,7 @@ public class LogAspect {
 
     public String getUsername() {
         try {
-            return SecurityUtils.getCurrentUsername();
+            return SecurityUtils.getCurrentNickName();
         }catch (Exception e){
             return "";
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java

@@ -38,7 +38,7 @@ public class SysLogController {
     @GetMapping(value = "/user")
     public ResponseEntity<Object> queryUserLog(@RequestParam Map criteria, PageQuery pageable){
         criteria.put("log_type","INFO");
-        criteria.put("username", SecurityUtils.getCurrentUsername());
+        criteria.put("username", SecurityUtils.getCurrentNickName());
         return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK);
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java

@@ -106,7 +106,7 @@ public class UserController {
         // 解密，得到字符密码
         String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass"));
         String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass"));
-        SysUser user = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername()));
+        SysUser user = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, SecurityUtils.getCurrentNickName()));
         if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) {
             throw new BadRequestException(LangProcess.msg("login_pwdWrong_1"));
         }
@@ -129,7 +129,7 @@ public class UserController {
     @PostMapping(value = "/updateEmail/{code}")
     public ResponseEntity<Object> updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception {
         String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword());
-        SysUser userInfo = userService.getOne(new QueryWrapper<SysUser>().eq("username",SecurityUtils.getCurrentUsername()));
+        SysUser userInfo = userService.getOne(new QueryWrapper<SysUser>().eq("username",SecurityUtils.getCurrentNickName()));
         if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))){
             throw new BadRequestException(LangProcess.msg("login_pwdWrong"));
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java

@@ -134,7 +134,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
     @Transactional(rollbackFor = Exception.class)
     public void create(SysCodeRule codeRule) {
         String currentUserId = SecurityUtils.getCurrentUserId();
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         List<SysCodeRule> sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, codeRule.getCode()));
         if (ObjectUtil.isNotEmpty(sysCodeRules)) {
@@ -168,7 +168,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
             throw new BadRequestException("该编码code已存在，请校验！");
         }
         String currentUserId = SecurityUtils.getCurrentUserId();
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
         codeRule.setUpdate_id(currentUserId);
         codeRule.setUpdate_name(currentUsername);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java

@@ -67,7 +67,7 @@ public class StageImageServiceImpl extends ServiceImpl<StageImageMapper, StageIm
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String currentUserId = SecurityUtils.getCurrentUserId();
         String now = DateUtil.now();
         entity.setUpdate_time(now);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java

@@ -71,7 +71,7 @@ public class StageServiceImpl extends ServiceImpl<StageMapper, Stage> implements
             throw new BadRequestException(LangProcess.msg("error_sysAuth"));
         }
 
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String currentUserId = SecurityUtils.getCurrentUserId();
         String now = DateUtil.now();
         dto.setUpdate_time(now);
@@ -102,7 +102,7 @@ public class StageServiceImpl extends ServiceImpl<StageMapper, Stage> implements
         // 设置内容
         stage.setStage_data(dto.getStage_data());
         // 获取当前用户与时间
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        String currentUsername = SecurityUtils.getCurrentNickName();
         String currentUserId = SecurityUtils.getCurrentUserId();
         String now = DateUtil.now();
         stage.setUpdate_time(now);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java

@@ -24,6 +24,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
@@ -137,7 +138,7 @@ public class AutoCreateInst {
             instdto.setVehicle_code(vehiclecode);
             String now = DateUtil.now();
             instdto.setCreate_time(now);
-            instdto.setCreate_by("auto");
+            instdto.setCreate_by(SecurityUtils.getCurrentNickName());
 
             instdto.setStart_device_code(start_device_code);
             instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java

@@ -24,6 +24,7 @@ import org.nl.acs.task.enums.TaskStatusEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
 import org.springframework.stereotype.Component;
 
@@ -184,7 +185,7 @@ public class CreateDDJInst {
                         instdto.setVehicle_code(vehiclecode);
                         String now = DateUtil.now();
                         instdto.setCreate_time(now);
-                        instdto.setCreate_by("auto");
+                        instdto.setCreate_by(SecurityUtils.getCurrentNickName());
 
                         instdto.setStart_device_code(start_device_code);
                         instdto.setStart_point_code(start_point_code);
@@ -295,7 +296,7 @@ public class CreateDDJInst {
                                 instdto.setVehicle_code(vehiclecode);
                                 String now = DateUtil.now();
                                 instdto.setCreate_time(now);
-                                instdto.setCreate_by("auto");
+                                instdto.setCreate_by(SecurityUtils.getCurrentNickName());
 
                                 instdto.setStart_device_code(start_device_code);
                                 instdto.setStart_point_code(start_point_code);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/impl/ISysUserServiceImpl.java

@@ -53,7 +53,7 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
 
     @Override
     public Map<String, String> updateAvatar(MultipartFile multipartFile) {
-        SysUser user = this.getOne(new QueryWrapper<SysUser>().eq("username", SecurityUtils.getCurrentUsername()));
+        SysUser user = this.getOne(new QueryWrapper<SysUser>().eq("username", SecurityUtils.getCurrentNickName()));
         String oldPath = user.getAvatar_path();
         File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar());
         user.setAvatar_path(Objects.requireNonNull(file).getPath());

acs2/nladmin-ui/src/views/acs/device/index.vue

@@ -50,7 +50,7 @@
         >
           {{ $t('auto.common.import') }}
         </el-button>
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -59,13 +59,13 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="1050px"
       >

acs2/nladmin-ui/src/views/acs/history/udwData/index.vue

@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('TaskRecord.table.Value')">
+          <el-form-item :label="$t('TaskRecord.table.Value')">
             <el-select
               v-model="form.unified_key"
               :placeholder="$t('TaskRecord.table.Value')"
@@ -23,7 +23,7 @@
               <el-option v-for="(item,index) in unified_key" :key="index" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('TaskRecord.table.Numbering')">
+          <el-form-item :label="$t('TaskRecord.table.Numbering')">
             <el-input
               v-model="query.code"
               size="small"
@@ -34,6 +34,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -112,6 +113,7 @@ import pagination from '@crud/Pagination'
 import crudUdwData from '@/api/acs/history/udwData'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/api/system/dict'
 
 const defaultForm = {
@@ -123,7 +125,7 @@ const defaultForm = {
 export default {
   dicts: [],
   name: 'UdwData',
-  components: { pagination, crudOperation },
+  components: { pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

acs2/nladmin-ui/src/views/acs/instruction/index.vue

@@ -60,17 +60,6 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('task.txt_box.start_or_end')">
-            <el-input
-              v-model="query.point_code"
-              size="small"
-              clearable
-              :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item :label="$t('Inst.table.instruction_type')">
             <el-select
               v-model="query.instruction_type"
@@ -85,13 +74,25 @@
               <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.start_or_end')">
+            <el-input
+              v-model="query.point_code"
+              size="small"
+              clearable
+              :placeholder="$t('Inst.table.input_startCode_or_nextCode')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
         </el-form>
-        <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
           slot="right"
+          v-permission="['admin','task:synchronous']"
           class="filter-item"
           size="mini"
           type="primary"
@@ -105,7 +106,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
@@ -148,8 +149,8 @@
         <el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
         <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))"/>
+        <el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />
-        <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))"/>
+        <el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
         <el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@@ -235,6 +236,7 @@
 import crudInstruction from '@/api/acs/instruction/instruction'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import { getDicts } from '@/views/system/dict/dict'
 import pagination from '@crud/Pagination'
 
@@ -277,7 +279,7 @@ const defaultForm = {
 export default {
   dicts: ['task_status', 'task_type'],
   name: 'Instruction',
-  components: { crudOperation, pagination },
+  components: { crudOperation, pagination, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({

acs2/nladmin-ui/src/views/acs/regional/index.vue

@@ -4,7 +4,7 @@
     <div class="head-container">
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -13,7 +13,7 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog

acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue

@@ -51,7 +51,7 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
-        <el-button
+        <!-- <el-button
           slot="right"
           class="filter-item"
           size="mini"
@@ -60,7 +60,7 @@
           @click="reload"
         >
           {{ $t('auto.common.synchronous') }}
-        </el-button>
+        </el-button> -->
       </crudOperation>
       <!--表单组件-->
       <el-dialog

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -10,6 +10,20 @@
           label-position="right"
           label-suffix=":"
         >
+          <el-form-item :label="$t('task.txt_box.Task_status')">
+            <el-select
+              v-model="query.status"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_status')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.task_code"
@@ -46,31 +60,6 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item :label="$t('task.txt_box.Task_status')">
-            <el-select
-              v-model="query.status"
-              clearable
-              filterable
-              size="small"
-              :placeholder="$t('task.txt_box.Task_status')"
-              class="filter-item"
-              style="width: 200px"
-              @change="crud.toQuery"
-            >
-              <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('task.txt_box.start_or_end')">
-            <el-input
-              v-model="query.point_code"
-              size="small"
-              clearable
-              :placeholder="$t('task.txt_box.Origin_or_destination')"
-              style="width: 200px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Task_type')">
             <el-select
               v-model="query.task_type"
@@ -84,7 +73,19 @@
             >
               <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
+            <el-form-item :label="$t('task.txt_box.start_or_end')">
+              <el-input
+                v-model="query.point_code"
+                size="small"
+                clearable
+                :placeholder="$t('task.txt_box.Origin_or_destination')"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="crud.toQuery"
+              />
+            </el-form-item>
           </el-form-item>
+          <rrOperation />
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -102,6 +103,7 @@
         </el-button>
         <el-button
           slot="right"
+          v-permission="['admin','task:synchronous']"
           class="filter-item"
           size="mini"
           type="primary"
@@ -573,6 +575,7 @@
 import crudTask from '@/api/acs/task/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
+import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import deviceCrud from '@/api/acs/device/device'
 import routeCurd from '@/api/acs/route/routePlan'
@@ -581,7 +584,7 @@ import i18n from '@/i18n'
 
 export default {
   name: 'Task',
-  components: { pagination, crudOperation },
+  components: { pagination, crudOperation, rrOperation },
   dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'],
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -591,7 +594,7 @@ export default {
         edit: true,
         del: true,
         reset: false,
-        download: true
+        download: false
       },
       crudMethod: { ...crudTask }})
   },