Merge pull request 'Saas后端服务合并请求' (#4) from dev into test

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/4

Jenkinsfile

@@ -8,7 +8,7 @@ pipeline {
         // 拉取代码
         stage('Pull Code') {
             steps {
-                checkout([$class: 'GitSCM', branches: [[name: '*/${branch}']], extensions: [], userRemoteConfigs: [[credentialsId: '0f6d6eaa8754e735262afa495fe2828d611fca17', url: 'http://39.105.23.186:3000/develop/digimeta-MultiSaas.git']]])
+                checkout([$class: 'GitSCM', branches: [[name: '${git_version}']], extensions: [], userRemoteConfigs: [[credentialsId: '0f6d6eaa8754e735262afa495fe2828d611fca17', url: 'http://39.105.23.186:3000/develop/digimeta-MultiSaas.git']]])
             }
         }
         // 代码静态检查
@@ -19,13 +19,20 @@ pipeline {
                     sh "which java"
                     echo "打包子目录并进行代码检查 ${project_name}"
                     sh "mvn clean install"
-                    sh "mvn -f ${project_name} clean package -e -U -Dmaven.test.skip=true sonar:sonar"
+                    sh "mvn -f ${project_name} clean package -e -U -Dmaven.test.skip=true -Dsonar.login=admin -Dsonar.password=Digimeta@2023 sonar:sonar"
                 }
             }
         }
         stage('Quality Gate') {
             steps {
-                timeout(time: 1, unit: 'HOURS') {
+                //休息10s等待结果
+                sleep(10)
+                script {
+                    def workspace=pwd()
+                    // 删除所有report报告
+                    sh "find ${workspace} -name report-task.txt | xargs rm -f"
+                }
+                timeout(time: 15, unit: 'MINUTES') {
                     // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails
                     // true = set pipeline to UNSTABLE, false = don't waitForQualityGates abortPipeline: true
                     waitForQualityGate abortPipeline: true
@@ -44,13 +51,13 @@ pipeline {
                     if  ("${project_name}" ==  'digimeta-MultiSaas' ) {
                         echo '仅做代码检查，不打包目录'
                     } else {
-                        echo  "构件微服务 ${modules_name}，并推送到镜像仓库"
+                        echo  "构件微服务 ${module_name}，并推送到镜像仓库"
                         sh """
                             cd ${workspace}/${project_name}
                             docker login --username=缔智元2023 --password=digimeta@2023 ${ali_registry}
-                            docker build --tag ${ali_registry}/digitalman-multisaas/${modules_name}:${version} .
-                            docker push ${ali_registry}/digitalman-multisaas/${modules_name}:${version}
-                            docker rmi ${ali_registry}/digitalman-multisaas/${modules_name}:${version}
+                            docker build --tag ${ali_registry}/digitalman-multisaas/${module_name}:${version} .
+                            docker push ${ali_registry}/digitalman-multisaas/${module_name}:${version}
+                            docker rmi ${ali_registry}/digitalman-multisaas/${module_name}:${version}
                         """
                     }
                 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/meeting/domain/dto/DmMeetingOrdersDto.java

@@ -33,4 +33,6 @@ public class DmMeetingOrdersDto extends DmMeetingOrdersPo {
 
     private DmMeetingRoomsPo dmMeetingRoomsPo;
 
+    private String devId;
+
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/meeting/feign/factory/RemoteMeetingFallbackFactory.java

@@ -33,9 +33,10 @@ public class RemoteMeetingFallbackFactory implements FallbackFactory<RemoteMeeti
 
             @Override
             public JSONObject saveInner(DmMeetingOrdersDto order, Long enterpriseId, String sourceName, String source) {
-                return  R.fail("保存会议室预约失败:" + throwable.getMessage()).toJson();
+                return null;
             }
 
+
             @Override
             public JSONObject delInner(Long id, Long enterpriseId, String sourceName, String source) {
                 return  R.fail("删除会议室预约失败:" + throwable.getMessage()).toJson();

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/version/domain/vo/ApkReleaseVo.java

@@ -15,4 +15,5 @@ public class ApkReleaseVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime releaseTime;
     private String path;
+    private String comment;
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/version/feign/RemoteReleaseManagerService.java

@@ -6,11 +6,12 @@ import com.xueyi.message.api.transfer.domain.vo.DmDeployScheduleVo;
 import com.xueyi.system.api.organize.feign.factory.RemoteUserFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @FeignClient(contextId = "remoteReleaseManagerService", value = ServiceConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
 public interface RemoteReleaseManagerService {
 
-    @GetMapping("/releaseManager/inner/reply")
+    @PostMapping("/releaseManager/inner/reply")
     R<Integer> syncDeployStatus(@RequestBody DmDeployScheduleVo vo);
 }

xueyi-auth/src/main/resources/bootstrap.yml

@@ -15,9 +15,15 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 172.17.0.1:18848
+        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        # 配置中心地址
+        #server-addr: 39.107.77.235:18848
       config:
         # 配置中心地址
         server-addr: 172.17.0.1:18848
+#        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        # 配置中心地址
+#        server-addr: 39.107.77.235:18848
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-gateway/src/main/resources/bootstrap.yml

@@ -14,14 +14,14 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        #server-addr: 172.17.0.1:18848
-        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        server-addr: 39.107.77.235:18848
+        server-addr: 172.17.0.1:18848
+        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        #server-addr: 39.107.77.235:18848
       config:
         # 配置中心地址
-        #server-addr: 172.17.0.1:18848
-        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-        server-addr: 39.107.77.235:18848
+        server-addr: 172.17.0.1:18848
+        #namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        #server-addr: 39.107.77.235:18848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -38,9 +38,9 @@ spring:
       datasource:
         ds1:
           nacos:
-#            server-addr: 172.17.0.1:18848
-            namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
-            server-addr: 39.107.77.235:18848
+            server-addr: 172.17.0.1:18848
+            # namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+            # server-addr: 39.107.77.235:18848
             dataId: sentinel-xueyi-gateway
             groupId: DEFAULT_GROUP
             data-type: json

xueyi-modules/xueyi-file/src/main/java/com/xueyi/file/service/MinioSysFileServiceImpl.java

@@ -9,6 +9,8 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.net.URLEncoder;
+
 /**
  * Minio 文件存储
  *
@@ -33,6 +35,8 @@ public class MinioSysFileServiceImpl implements ISysFileService {
     @Override
     public String uploadFile(MultipartFile file) throws Exception {
         String fileName = FileUploadUtils.extractFilename(file);
+
+        //fileName = URLEncoder.encode(fileName, "UTF-8");
         System.out.println("Minio filename:" + fileName);
         PutObjectArgs args = PutObjectArgs.builder()
                 .bucket(minioConfig.getBucketName())
@@ -42,6 +46,10 @@ public class MinioSysFileServiceImpl implements ISysFileService {
                 .build();
         client.putObject(args);
         System.out.println("Minio 文件上传成功");
+        // 获取fileName的最后一个'/'的位置的字符串，并用URLEncoder进行UTF-8编码后，再拼接到fileName中
+        String splitStr = fileName.substring(fileName.lastIndexOf("/") + 1);
+        splitStr = URLEncoder.encode(splitStr, "UTF-8");
+        fileName = fileName.substring(0, fileName.lastIndexOf("/") + 1) + splitStr;
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
     }
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmManDeviceController.java

@@ -280,8 +280,15 @@ public class DmManDeviceController extends BaseController<DmManDeviceQuery, DmMa
     @RequiresPermissions(Auth.DM_MAN_DEVICE_LIST)
     public AjaxResult onlineDevicesToChart() {
         Long total = redisTemplate.opsForList().size(GENERAL_CURRENT_NUMBER_OF_ONLINE);
+        if (total == null) {
+            total = new Long(0);
+        }
         // 从缓存中获取在线信息
         List devices = (List) redisTemplate.opsForList().range(GENERAL_CURRENT_NUMBER_OF_ONLINE, 0, total.longValue());
+
+        if (devices == null) {
+            devices = new ArrayList();
+        }
         // 获取最近五周的数据
         List<NumberOfOnlineToChartVo> charList = new ArrayList<>();
         int count = 0;

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmManDeviceServiceImpl.java

@@ -161,7 +161,7 @@ public class DmManDeviceServiceImpl extends BaseServiceImpl<DmManDeviceQuery, Dm
         // 发送重启指令
         JSONObject message = new JSONObject();
         message.put("type",type);
-        mqttTemplate.sendToMqtt("/digitalman/" + devId + "/restart", message.toJSONString());
+        mqttTemplate.sendToMqtt("/digital_man/" + devId + "/notify/restart", message.toJSONString());
         // 更新设备启动状态
         DmManDeviceDto dmManDeviceDto = new DmManDeviceDto();
         dmManDeviceDto.setManCode(devId);

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/emcs/controller/DmExceptionLogController.java

@@ -267,7 +267,7 @@ public class DmExceptionLogController extends BaseController<DmExceptionLogQuery
             int monthValue = month.getValue();
 
             // 如果当前月份已经过去，则跳过输出
-            if (currentYear == currentYear && monthValue > currentMonth) {
+            if (monthValue > currentMonth) {
                 continue;
             }
             // 获取当前月份的第一天和最后一天

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/emcs/manager/impl/DmDeviceLogFileManager.java

@@ -37,9 +37,9 @@ public class DmDeviceLogFileManager extends BaseManagerImpl<DmDeviceLogFileQuery
 
     @Override
     protected List<SlaveRelation> subRelationInit() {
-        return new ArrayList<>() {{
-            add(new SlaveRelation(LOG_DmDevice_GROUP, DmManDeviceManager.class, OperateConstants.SubOperateLimit.ONLY_SEL));
-        }};
+        List result = new ArrayList<SlaveRelation>();
+        result.add(new SlaveRelation(LOG_DmDevice_GROUP, DmManDeviceManager.class, OperateConstants.SubOperateLimit.ONLY_SEL));
+        return result;
     }
 
     @Override

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingInnerApiController.java

@@ -4,11 +4,15 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xueyi.common.core.constant.basic.SqlConstants;
 import com.xueyi.common.core.web.result.R;
 import com.xueyi.common.security.annotation.InnerAuth;
 import com.xueyi.common.sms.configure.SmsProperties;
 import com.xueyi.common.web.constant.ResponseCode;
 import com.xueyi.common.web.utils.DateUtils;
+import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanExtPo;
+import com.xueyi.system.api.digitalmans.domain.po.DmDigitalmanPo;
 import com.xueyi.system.api.meeting.domain.dto.DmMeetingOrdersDto;
 import com.xueyi.system.api.meeting.domain.dto.DmMeetingRoomsDto;
 import com.xueyi.system.api.meeting.domain.po.DmMeetingOrdersPo;
@@ -16,6 +20,8 @@ import com.xueyi.system.api.meeting.domain.po.DmMeetingRoomsPo;
 import com.xueyi.system.api.sms.domain.vo.SmsReqEntity;
 import com.xueyi.system.api.sms.feign.RemoteSmsService;
 import com.xueyi.system.api.staff.domain.po.DmStaffPo;
+import com.xueyi.system.digitalmans.mapper.DmDigitalmanExtMapper;
+import com.xueyi.system.digitalmans.mapper.DmDigitalmanMapper;
 import com.xueyi.system.meeting.domain.model.DmMeetingOrdersConverter;
 import com.xueyi.system.meeting.domain.model.DmMeetingRoomsConverter;
 import com.xueyi.system.meeting.mapper.DmMeetingOrdersMapper;
@@ -70,6 +76,12 @@ public class DmMeetingInnerApiController extends BaseApiController {
     @Autowired
     private RemoteSmsService remoteSmsService;
 
+    @Autowired
+    private DmDigitalmanMapper digitalmanMapper;
+
+    @Autowired
+    private DmDigitalmanExtMapper digitalmanExtMapper;
+
 
     @Autowired
     private DmMeetingRoomsConverter dmMeetingRoomsConverter;
@@ -141,7 +153,7 @@ public class DmMeetingInnerApiController extends BaseApiController {
 
         dmMeetingOrdersMapper.insertBatch(list);
 
-        mms.append(mms.substring(0, mms.length() - 1) + "于" + meetingRoom.getName());
+        String mms2 = mms.substring(0, mms.length() - 1) + "于" + meetingRoom.getName();
         DmStaffPo dmStaffPo = dmStaffMapper.selectById(order.getOrderBy());
 
         SmsReqEntity send = new SmsReqEntity();
@@ -150,15 +162,23 @@ public class DmMeetingInnerApiController extends BaseApiController {
                 send.setPhone(dmStaffPo.getPhone());
                 send.setTemplate(smsProperties.getMeetingOrderTemplate());
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("dateStr", mms);
+                jsonObject.put("dateStr", mms2);
                 jsonObject.put("name", dmStaffPo.getUserName());
                 //TODO. 发送短信 后期需要获取数字人昵称
-                jsonObject.put("robotName", smsProperties.getRobotName());
+
+                DmDigitalmanPo dmDigitalmanPo = digitalmanMapper.selectByCode(digitalmanExtMapper.selectOne(Wrappers.<DmDigitalmanExtPo>query().lambda().eq(DmDigitalmanExtPo::getDeviceId, order.getDevId()).last(SqlConstants.LIMIT_ONE)).getManCode());
+                if (null!= dmDigitalmanPo &&  StringUtils.isNotEmpty(dmDigitalmanPo.getName())) {
+                    jsonObject.put("robotName", dmDigitalmanPo.getName());
+                } else {
+                    jsonObject.put("robotName", smsProperties.getRobotName());
+                }
+
                 send.setDataMap(jsonObject.toJSONString());
                 remoteSmsService.sendSms(send);
 
             }
         } catch (Exception e) {
+            System.err.println(e.getMessage());
             e.printStackTrace();
         }
         return outputSuccess().toJSON();

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/manager/impl/DmBackgroundManager.java

@@ -26,8 +26,8 @@ public class DmBackgroundManager extends BaseManagerImpl<DmBackgroundQuery, DmBa
 
     @Override
     protected List<SlaveRelation> subRelationInit() {
-        return new ArrayList<>(){{
-            add(new SlaveRelation(Background_Resource_GROUP,DmResourcesManager.class, OperateConstants.SubOperateLimit.ONLY_SEL));
-        }};
+        List result = new ArrayList<SlaveRelation>();
+        result.add(new SlaveRelation(Background_Resource_GROUP,DmResourcesManager.class, OperateConstants.SubOperateLimit.ONLY_SEL));
+        return result;
     }
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java

@@ -30,7 +30,6 @@ import com.xueyi.system.meeting.constant.VisitRecordStatus;
 import com.xueyi.system.receiver.domain.po.DmTenantReceiverPo;
 import com.xueyi.system.receiver.mapper.DmTenantReceiverMapper;
 import com.xueyi.system.resource.controller.api.BaseApiController;
-import com.xueyi.system.staff.domain.dto.DmVisitorSmsConfigDto;
 import com.xueyi.system.staff.domain.model.DmVisitRecordsConverter;
 import com.xueyi.system.staff.domain.model.DmVisitorSmsConfigConverter;
 import com.xueyi.system.staff.domain.po.DmVisitorSmsConfigPo;
@@ -112,7 +111,7 @@ public class DmVisitorInnerApiController extends BaseApiController {
             }
 
 //            DmStaffPo e = dmStaffMapper.selectById(v.getUserId());
-            if (v.getReceiverPhone() != null && v.getUpdateTime() == null){
+            if (v.getReceiverPhone() != null){
                 json.put("phone", v.getReceiverPhone());
                 json.put("visitorId", v.getVisitorId());
                 //给访问对象发送短信
@@ -240,11 +239,10 @@ public class DmVisitorInnerApiController extends BaseApiController {
 
         DmDigitalmanPo dmDigitalmanPo = digitalmanMapper.selectByCode(digitalmanExtMapper.selectOne(Wrappers.<DmDigitalmanExtPo>query().lambda().eq(DmDigitalmanExtPo::getDeviceId, devId).last(SqlConstants.LIMIT_ONE)).getManCode());
 
+        com.alibaba.fastjson2.JSONObject  output = outputSuccess(dmVisitorSmsConfigPo).toJSON();
+        output.put("robotName", dmDigitalmanPo.getName());
 
-        DmVisitorSmsConfigDto dto = visitorSmsConfigConverter.mapperDto(dmVisitorSmsConfigPo);
-        dto.setRobotName(dmDigitalmanPo.getName());
-
-        return outputSuccess(dto).toJSON();
+        return output;
     }
 
     @InnerAuth

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/domain/dto/DmVisitorSmsConfigDto.java

@@ -17,6 +17,4 @@ public class DmVisitorSmsConfigDto extends DmVisitorSmsConfigPo {
 
     @Serial
     private static final long serialVersionUID = 1L;
-
-    private String robotName;
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/service/impl/DmVisitRecordsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xueyi.system.staff.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.xueyi.common.web.entity.service.impl.BaseServiceImpl;
 import com.xueyi.system.api.digitalmans.domain.dto.DmVisitRecordsDto;
 import com.xueyi.system.staff.domain.query.DmVisitRecordsQuery;
@@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -30,15 +33,21 @@ public class DmVisitRecordsServiceImpl extends BaseServiceImpl<DmVisitRecordsQue
 
 
     public String generateCode() {
-        Random random = new Random();
-        StringBuilder codeBuilder = new StringBuilder(CODE_LENGTH);
+        try {
+            Random random = SecureRandom.getInstanceStrong();
+            StringBuilder codeBuilder = new StringBuilder(CODE_LENGTH);
 
-        for (int i = 0; i < CODE_LENGTH; i++) {
-            int digit = random.nextInt(10);
-            codeBuilder.append(digit);
+            for (int i = 0; i < CODE_LENGTH; i++) {
+                int digit = random.nextInt(10);
+                codeBuilder.append(digit);
+            }
+            return codeBuilder.toString();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
         }
 
-        return codeBuilder.toString();
+
+        return null;
     }
 
     public boolean storeCode(String code) {
@@ -63,10 +72,11 @@ public class DmVisitRecordsServiceImpl extends BaseServiceImpl<DmVisitRecordsQue
         String code = "";
         while (true) {
             code = generateCode();
-            if (storeCode(code)){
+            if (StringUtils.isNotEmpty(code) && storeCode(code)){
                 return code;
             }
         }
     }
 
+
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/version/controller/DmApkVersionController.java

@@ -42,6 +42,7 @@ public class DmApkVersionController extends BaseController<DmApkVersionQuery, Dm
         apkVersion.setCodeVersion(apkReleaseVo.getCodeVersionName());
         apkVersion.setReleaseTime(apkReleaseVo.getReleaseTime());
         apkVersion.setPath(apkReleaseVo.getPath());
+        apkVersion.setComment(apkReleaseVo.getComment());
         return super.add(apkVersion);
     }
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/version/controller/DmReleaseManagerController.java

@@ -46,7 +46,7 @@ public class DmReleaseManagerController extends BaseController<DmReleaseManagerQ
     }
 
     /** 根据设备id获取数字人信息 */
-    @GetMapping("/inner/reply")
+    @PostMapping("/inner/reply")
     R<Integer> syncDeployStatus(@RequestBody DmDeployScheduleVo vo) {
         log.info(vo.toString());
 

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/version/service/impl/DmReleaseManagerServiceImpl.java

@@ -62,12 +62,16 @@ public class DmReleaseManagerServiceImpl extends BaseServiceImpl<DmReleaseManage
         for (String dId : idList) {
 
             // 1.dId表示设备dId，根据设备id查询dm_man_device表并获取dto
-            DmReleaseManagerDto dmReleaseManagerDto = baseManager.selectList(new DmReleaseManagerQuery(){{setDeviceId(dId);}}).get(0);
+            DmReleaseManagerQuery query = new DmReleaseManagerQuery();
+            query.setDeviceId(dId);
+            DmReleaseManagerDto dmReleaseManagerDto = baseManager.selectList(query).get(0);
             if (dmReleaseManagerDto == null) {
                 return 0;
             }
             // 根据apkVersion获取DmApkVersionDto
-            DmApkVersionDto dmApkVersionDto = apkVersionManager.selectList(new DmApkVersionQuery(){{setApkVersion(apkVersion);}}).get(0);
+            DmApkVersionQuery versionQuery = new DmApkVersionQuery();
+            versionQuery.setApkVersion(apkVersion);
+            DmApkVersionDto dmApkVersionDto = apkVersionManager.selectList(versionQuery).get(0);
             JSONObject jo = new JSONObject();
             jo.put("versionName", apkVersion);
             jo.put("path", dmApkVersionDto.getPath());
@@ -87,7 +91,9 @@ public class DmReleaseManagerServiceImpl extends BaseServiceImpl<DmReleaseManage
     @Override
     public Integer syncDeployStatusByDevId(DmDeployScheduleVo vo) {
         // 1.获取vo中的devId，并根据devId获取DmReleaseManagerDto
-        DmReleaseManagerDto dmReleaseManagerDto = baseManager.selectList(new DmReleaseManagerQuery(){{setDeviceId(vo.getDevId());}}).get(0);
+        DmReleaseManagerQuery query = new DmReleaseManagerQuery();
+        query.setDeviceId(vo.getDevId());
+        DmReleaseManagerDto dmReleaseManagerDto = baseManager.selectList(query).get(0);
         // 2. 更新setup_status字段并更新表
         dmReleaseManagerDto.setSetupStatus(vo.getType());