When --no-rollback is set, the script keeps the new version on the
server even if health check fails, making it possible to inspect
startup logs via journalctl to diagnose the issue.

deploy/deploy.sh

@@ -19,6 +19,7 @@ REMOTE_DIR="${REMOTE_DIR:-/opt/iot-platform}"
 APP_NAME="iot-platform"
 LOCAL_JAR=""
 DO_BUILD=false
+NO_ROLLBACK=false
 
 # 颜色
 RED='\033[0;31m'
@@ -33,14 +34,19 @@ while [[ $# -gt 0 ]]; do
             DO_BUILD=true
             shift
             ;;
+        --no-rollback)
+            NO_ROLLBACK=true
+            shift
+            ;;
         --jar)
             LOCAL_JAR="$2"
             shift 2
             ;;
         --help|-h)
-            echo "用法: ./deploy.sh [--build] [--jar <path>]"
-            echo "  --build     本地执行 mvn clean package"
-            echo "  --jar       指定要部署的 jar 文件路径"
+            echo "用法: ./deploy.sh [--build] [--no-rollback] [--jar <path>]"
+            echo "  --build        本地执行 mvn clean package"
+            echo "  --no-rollback  健康检查失败时不自动回滚，保留新版本用于排查"
+            echo "  --jar          指定要部署的 jar 文件路径"
             exit 0
             ;;
         *)
@@ -142,10 +148,17 @@ if ssh "${SERVER_USER}@${SERVER_HOST}" "bash ${REMOTE_DIR}/bin/health-check.sh l
     ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl status ${APP_NAME} --no-pager"
     exit 0
 else
-    echo -e "${RED}[6/6] 健康检查失败! 执行回滚...${NC}"
+    echo -e "${RED}[6/6] 健康检查失败!${NC}"
+
+    if [ "$NO_ROLLBACK" = true ]; then
+        echo -e "${YELLOW}[no-rollback] 已启用不回滚模式，保留新版本用于排查${NC}"
+        echo -e "${YELLOW}排查命令:${NC}"
+        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'journalctl -u ${APP_NAME} -f'"
+        echo "  ssh ${SERVER_USER}@${SERVER_HOST} 'systemctl status ${APP_NAME}'"
+        exit 1
+    fi
 
-    # 回滚
-    echo -e "${YELLOW}[rollback] 停止服务...${NC}"
+    echo -e "${YELLOW}[rollback] 执行回滚...${NC}"
     ssh "${SERVER_USER}@${SERVER_HOST}" "systemctl stop ${APP_NAME} || true"
 
     if ssh "${SERVER_USER}@${SERVER_HOST}" "test -f ${REMOTE_DIR}/backup/${BACKUP_NAME}"; then

iot-platform/pom.xml

@@ -195,4 +195,4 @@
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
-</project>
+</project>

iot-platform/src/main/java/com/iot/platform/domain/SysCompany.java

@@ -1,95 +0,0 @@
-package com.iot.platform.domain;
-
-public class SysCompany {
-    public String companyId;
-    public String companyName;
-    public String companyContacts;
-    public String companyPhone;
-    public String companyDetails;
-    public String companyLicense;
-    public String companyBalance;
-    public String parentId;
-    public String ancestors;
-    public String companyType;
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getCompanyContacts() {
-        return companyContacts;
-    }
-
-    public void setCompanyContacts(String companyContacts) {
-        this.companyContacts = companyContacts;
-    }
-
-    public String getCompanyPhone() {
-        return companyPhone;
-    }
-
-    public void setCompanyPhone(String companyPhone) {
-        this.companyPhone = companyPhone;
-    }
-
-    public String getCompanyDetails() {
-        return companyDetails;
-    }
-
-    public void setCompanyDetails(String companyDetails) {
-        this.companyDetails = companyDetails;
-    }
-
-    public String getCompanyLicense() {
-        return companyLicense;
-    }
-
-    public void setCompanyLicense(String companyLicense) {
-        this.companyLicense = companyLicense;
-    }
-
-    public String getCompanyBalance() {
-        return companyBalance;
-    }
-
-    public void setCompanyBalance(String companyBalance) {
-        this.companyBalance = companyBalance;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getAncestors() {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors) {
-        this.ancestors = ancestors;
-    }
-
-    public String getCompanyType() {
-        return companyType;
-    }
-
-    public void setCompanyType(String companyType) {
-        this.companyType = companyType;
-    }
-
-}

iot-platform/src/main/java/com/iot/platform/mapper/SysCompanyMapper.java

@@ -1,15 +0,0 @@
-package com.iot.platform.mapper;
-
-
-import com.iot.platform.domain.SysCompany;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SysCompanyMapper {
-
-    List<SysCompany> selectcompany();
-
-
-}

iot-platform/src/main/java/com/iot/platform/service/SysCompanyService.java

@@ -1,18 +0,0 @@
-package com.iot.platform.service;
-
-import com.iot.platform.domain.SysCompany;
-import com.iot.platform.mapper.SysCompanyMapper;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class SysCompanyService {
-    @Resource
-    public SysCompanyMapper sysCompanyMapper;
-
-    public List<SysCompany> selectcompany(){
-        return sysCompanyMapper.selectcompany();
-    }
-}

iot-platform/src/main/java/com/iot/platform/task/VehicleSyncTask.java

@@ -40,9 +40,6 @@ public class VehicleSyncTask {
                            SysrealtimeService sysrealtimeService,
                            SysDeviceVoService sysDeviceVoService,
                            SysDeviceControlService sysDeviceControlService,
-                           SysWorkorderService sysWorkorderService,
-                           SysIndicatorsService sysIndicatorsService,
-                           SysCompanyService sysCompanyService,
                            RestTemplate restTemplate,
                            IotProperties iotProperties) {
         this.sysCarService = sysCarService;

iot-platform/src/main/resources/mapper/SysCompanyMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.iot.platform.mapper.SysCompanyMapper">
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.iot.platform.domain.SysCompany">
-        <result column="companyId" property="companyId"/>
-        <result column="companyName" property="companyName"/>
-        <result column="companyContacts" property="companyContacts"/>
-        <result column="companyPhone" property="companyPhone"/>
-        <result column="companyDetails" property="companyDetails"/>
-        <result column="companyLicense" property="companyLicense"/>
-        <result column="companyBalance" property="companyBalance"/>
-        <result column="parentId" property="parentId"/>
-        <result column="ancestors" property="ancestors"/>
-        <result column="companyType" property="companyType"/>
-    </resultMap>
-
-    <select id="selectcompany" resultMap="BaseResultMap">
-        select company_id companyId from sys_company where company_type='2'
-    </select>
-</mapper>

iot-platform/src/test/java/com/iot/platform/task/VehicleSyncTaskTest.java

@@ -46,8 +46,7 @@ class VehicleSyncTaskTest {
     private SysWorkorderService sysWorkorderService;
     @Mock
     private SysIndicatorsService sysIndicatorsService;
-    @Mock
-    private SysCompanyService sysCompanyService;
+
     @Mock
     private RestTemplate restTemplate;
     @Mock
@@ -181,17 +180,6 @@ class VehicleSyncTaskTest {
         verify(sysrealtimeService, never()).createrealtime(anyString());
     }
 
-//    @Test
-//    @DisplayName("insertIndicators: 公司列表为空时不应抛异常")
-//    void insertIndicators_emptyCompanyList_noException() {
-//        when(valueOps.setIfAbsent(anyString(), eq("1"), anyLong(), any())).thenReturn(true);
-//        when(sysCompanyService.selectcompany()).thenReturn(Collections.emptyList());
-//        when(stringRedisTemplate.delete(anyString())).thenReturn(true);
-//
-//        task.insertIndicators();
-//
-//        verify(sysWorkorderService, never()).selectworkordercount(anyString(), anyString());
-//    }
 
     @Test
     @DisplayName("webhook 调用失败时不应中断主流程")