diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java
index c2f60d6..2f082a9 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/app/entity/StayPersonEntity.java
@@ -14,11 +14,11 @@ public class StayPersonEntity {
      */
     private Long userId;
 
-    /** 工程id */
-    private Long proId;
+//    /** 工程id */
+//    private Long proId;
 
-    /** 工程名称 */
-    private String proName;
+//    /** 工程名称 */
+//    private String proName;
 
     /**
      * 用户名称
@@ -80,12 +80,12 @@ public class StayPersonEntity {
     private String xl;
 
     /**
-     * 施工杆塔经度
+     * 施工杆塔纬度
      */
     private String sgLat;
 
     /**
-     * 施工杆塔 维度
+     * 施工杆塔经度
      */
     private String sgLon;
 
diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java
index a3b07f6..346cc58 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java
@@ -12,8 +12,8 @@ import lombok.Data;
 @Data
 public class ProjectVo {
 
-    /** 工程id */
-    private Long proId;
+    /** 杆塔id */
+    private Long gtId;
 
 
     /** 班组id */
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java
index d7ced1a..cc76631 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/StayPersonController.java
@@ -35,23 +35,23 @@ public class StayPersonController extends BaseController{
      */
     @GetMapping("getStayPersonList")
     @SysLog(title = "现场人员管理", businessType = OperaType.QUERY,  module = "基础管理->现场人员管理", details = "查询现场人员列表")
-    public TableDataInfo getStayPersonList(@RequestBody ProjectVo vo) {
+    public TableDataInfo getStayPersonList(ProjectVo vo) {
         startPage();
         List<StayPersonEntity> list = service.getStayPersonList(vo);
         return getDataTable(list);
 
     }
 
-    /**
-     * 切换时获取工程列表
-     * @param proId
-     * @return
-     */
-    @GetMapping("getProjectList/{proId}")
-    @SysLog(title = "现场人员管理", businessType = OperaType.QUERY,  module = "基础管理->现场人员管理", details = "切换时获取工程列表")
-    public AjaxResult getProjectList(@PathVariable Long proId) {
-        return service.getProjectList(proId);
-    }
+//    /**
+//     * 切换时获取工程列表
+//     * @param proId
+//     * @return
+//     */
+//    @GetMapping("getProjectList/{proId}")
+//    @SysLog(title = "现场人员管理", businessType = OperaType.QUERY,  module = "基础管理->现场人员管理", details = "切换时获取工程列表")
+//    public AjaxResult getProjectList(@PathVariable Long proId) {
+//        return service.getProjectList(proId);
+//    }
 
     /**
      * 修改安全帽、马甲编号
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/WarnReminderController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/WarnReminderController.java
index b33b12d..b66423e 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/WarnReminderController.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/WarnReminderController.java
@@ -1,14 +1,22 @@
 package com.bonus.app.controller;
 
+import com.bonus.app.entity.DeviceWarnEntity;
 import com.bonus.app.entity.StayPersonEntity;
+import com.bonus.app.entity.ViolationInfoEntity;
 import com.bonus.app.service.IStayPersonService;
 import com.bonus.app.service.IWarnReminderService;
+import com.bonus.common.core.constant.BusinessConstants;
+import com.bonus.common.core.text.Convert;
+import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
+import com.bonus.common.entity.app.vo.SafetyHatVo;
 import com.bonus.common.entity.bracelet.vo.ProjectVo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,27 +37,34 @@ public class WarnReminderController extends BaseController{
     private IWarnReminderService service;
 
     /**
-     * 查询预警提醒列表
+     * 查询预警提醒 设备预警列表
      * @param proId
      * @return
      */
-    @GetMapping("getWarnReminderList/{proId}")
-    @SysLog(title = "预警提醒管理", businessType = OperaType.QUERY,  module = "基础管理->预警提醒管理", details = "查询预警提醒列表")
-    public AjaxResult getWarnReminderList(@PathVariable Long proId) {
-        return service.getWarnReminderList(proId);
-
+    @GetMapping("getDeviceWarnList/{proId}")
+    @SysLog(title = "预警提醒管理", businessType = OperaType.QUERY,  module = "基础管理->预警提醒管理", details = "查询预警提醒设备预警列表")
+    public AjaxResult getDeviceWarnList(@PathVariable Long proId) {
+        Integer pageNum = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_SIZE), 10);
+        PageHelper.startPage(pageNum, pageSize);
+        PageInfo<DeviceWarnEntity> pageInfo = service.getDeviceWarnList(proId);
+        return AjaxResult.success(pageInfo.getList());
     }
 
+
     /**
-     * 切换时获取工程列表
+     * 查询预警提醒 违章识别列表
      * @param proId
      * @return
      */
-    @GetMapping("getProjectList/{proId}")
-    @SysLog(title = "现场人员管理", businessType = OperaType.QUERY,  module = "基础管理->现场人员管理", details = "切换时获取工程列表")
-    public AjaxResult getProjectList(@PathVariable Long proId) {
-        return service.getProjectList(proId);
+    @GetMapping("getViolationInfoList/{proId}")
+    @SysLog(title = "预警提醒管理", businessType = OperaType.QUERY,  module = "基础管理->预警提醒管理", details = "查询预警提醒违章识别列表")
+    public AjaxResult getViolationInfoList(@PathVariable Long proId) {
+        Integer pageNum = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_NUM), 1);
+        Integer pageSize = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_SIZE), 10);
+        PageHelper.startPage(pageNum, pageSize);
+        PageInfo<ViolationInfoEntity> pageInfo = service.getViolationInfoList(proId);
+        return AjaxResult.success(pageInfo.getList());
     }
 
-
 }
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java
index 388825d..e0c0271 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/StayPersonMapper.java
@@ -27,12 +27,12 @@ public interface StayPersonMapper {
      */
     String getDistance();
 
-    /**
-     * 切换时获取工程列表
-     * @param proId
-     * @return
-     */
-    List<Map<String, Object>> getProjectList(Long proId);
+//    /**
+//     * 切换时获取工程列表
+//     * @param proId
+//     * @return
+//     */
+//    List<Map<String, Object>> getProjectList(Long proId);
 
     /**
      * 安全帽编号是否重复
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/WarnReminderMapper.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/WarnReminderMapper.java
index 97b8d81..ffbe279 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/WarnReminderMapper.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/mapper/WarnReminderMapper.java
@@ -31,12 +31,6 @@ public interface WarnReminderMapper {
     List<DeviceWarnEntity> getDeviceInfoList(Long proId);
 
 
-    /**
-     * 切换时获取工程列表
-     * @param proId
-     * @return
-     */
-    List<Map<String, Object>> getProjectList(Long proId);
 
 
 }
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java
index ec0414b..52ffec7 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IStayPersonService.java
@@ -20,12 +20,12 @@ public interface IStayPersonService {
      */
     public List<StayPersonEntity> getStayPersonList(ProjectVo vo);
 
-    /**
-     * 切换时获取工程列表
-     * @param proId
-     * @return AjaxResult
-     */
-    AjaxResult getProjectList(Long proId);
+//    /**
+//     * 切换时获取工程列表
+//     * @param proId
+//     * @return AjaxResult
+//     */
+//    AjaxResult getProjectList(Long proId);
 
 
     /**
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IWarnReminderService.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IWarnReminderService.java
index 24e4196..9f80d43 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IWarnReminderService.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/IWarnReminderService.java
@@ -1,8 +1,13 @@
 package com.bonus.app.service;
 
+import com.bonus.app.entity.DeviceWarnEntity;
 import com.bonus.app.entity.StayPersonEntity;
+import com.bonus.app.entity.ViolationInfoEntity;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.entity.app.AppParamsDto;
+import com.bonus.common.entity.app.vo.SafetyHatVo;
 import com.bonus.common.entity.bracelet.vo.ProjectVo;
+import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
@@ -19,12 +24,21 @@ public interface IWarnReminderService {
      */
     AjaxResult getWarnReminderList(Long proId);
 
+
     /**
-     * 切换时获取工程列表
+     * 查询预警提醒 设备预警列表
      * @param proId
-     * @return AjaxResult
+     * @return
      */
-    AjaxResult getProjectList(Long proId);
+    PageInfo<DeviceWarnEntity> getDeviceWarnList(Long proId);
+
+    /**
+     * 查询预警提醒 违章识别列表
+     * @param proId
+     * @return
+     */
+    PageInfo<ViolationInfoEntity> getViolationInfoList(Long proId);
+
 
 
 }
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java
index 4d7a67d..eafa054 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/StayPersonServiceImpl.java
@@ -81,21 +81,21 @@ public class StayPersonServiceImpl implements IStayPersonService{
         return isWarn;
     }
 
-    /**
-     * 切换时获取工程列表
-     * @param proId
-     * @return
-     */
-    @Override
-    public AjaxResult getProjectList(Long proId) {
-        List<Map<String, Object>>  list = new ArrayList<>();
-        try {
-            list = mapper.getProjectList(proId);
-        } catch (Exception e) {
-            log.error(e.toString(), e);
-        }
-        return AjaxResult.success(list);
-    }
+//    /**
+//     * 切换时获取工程列表
+//     * @param proId
+//     * @return
+//     */
+//    @Override
+//    public AjaxResult getProjectList(Long proId) {
+//        List<Map<String, Object>>  list = new ArrayList<>();
+//        try {
+//            list = mapper.getProjectList(proId);
+//        } catch (Exception e) {
+//            log.error(e.toString(), e);
+//        }
+//        return AjaxResult.success(list);
+//    }
 
     /**
      * 修改安全帽、马甲编号
diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/WarnReminderServiceImpl.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/WarnReminderServiceImpl.java
index a43ff6b..60e3ce2 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/WarnReminderServiceImpl.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/service/impl/WarnReminderServiceImpl.java
@@ -9,10 +9,15 @@ import com.bonus.app.service.IWarnReminderService;
 import com.bonus.common.core.constant.HttpStatus;
 import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.domain.R;
+import com.bonus.common.core.utils.encryption.Sm4Utils;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.entity.app.AppParamsDto;
+import com.bonus.common.entity.app.vo.SafetyHatVo;
 import com.bonus.system.api.RemoteFileService;
 import com.bonus.system.api.domain.SysFile;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +40,11 @@ public class WarnReminderServiceImpl implements IWarnReminderService {
     @Resource
     private RemoteFileService remoteFileService;
 
+    /**
+     * 查询预警提醒 设备预警列表
+     * @param proId
+     * @return
+     */
     @Override
     public AjaxResult getWarnReminderList(Long proId) {
         Map<String,Object> map = new HashMap<>();
@@ -54,23 +64,39 @@ public class WarnReminderServiceImpl implements IWarnReminderService {
         return AjaxResult.success(map);
         }
 
-
     /**
-     * 切换时获取工程列表
+     * 查询预警提醒 违章识别列表
      * @param proId
      * @return
      */
     @Override
-    public AjaxResult getProjectList(Long proId) {
-        List<Map<String, Object>>  list = new ArrayList<>();
+    public PageInfo<DeviceWarnEntity> getDeviceWarnList(Long proId) {
+        List<DeviceWarnEntity> listDev = new ArrayList<>();
         try {
-            list = mapper.getProjectList(proId);
+            listDev = mapper.getDeviceInfoList(proId);
         } catch (Exception e) {
-            log.error(e.toString(), e);
+            log.error(e.toString(),e);
         }
-        return AjaxResult.success(list);
+        PageInfo<DeviceWarnEntity> pageInfo = new PageInfo<>(listDev);
+        return pageInfo;
     }
 
+    @Override
+    public PageInfo<ViolationInfoEntity> getViolationInfoList(Long proId) {
+        List<ViolationInfoEntity> listVio = new ArrayList<>();
+        try {
+            listVio = mapper.getViolationInfoList(proId);
+            for (ViolationInfoEntity vo : listVio) {
+                vo = handleData(vo);
+            }
+        } catch (Exception e) {
+            log.error(e.toString(),e);
+        }
+        PageInfo<ViolationInfoEntity> pageInfo = new PageInfo<>(listVio);
+        return pageInfo;
+    }
+
+
     public ViolationInfoEntity handleData(ViolationInfoEntity vo) {
         R<SysFile> result = remoteFileService.getImgBase64(vo.getFilePath(), SecurityConstants.INNER);
         if (result != null && result.getCode() == HttpStatus.SUCCESS && result.getData() != null) {
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml
index a6b0ef6..d0c180b 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/StayPersonMapper.xml
@@ -5,8 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.bonus.app.mapper.StayPersonMapper">
 
     <select id="getStayPersonList" resultType="com.bonus.app.entity.StayPersonEntity" >
-        select  tp.pro_name proName,tp.id as proId,twt.team_id teamId,twt.team_name teamName,blt.sh_code shCode,sbx.gt_id gtId,tpp.lon sgLon,tpp.lat sgLat,
-                peopel_type as userType,tddone.data_val as dl,tddtwo.data_val as lon,tddthree.data_val as lat,tddfour.data_val as wd,tddfive.data_val as xl,tddsix.data_val as xy,
+        select  tpp.id gtId ,twt.team_id teamId,twt.team_name teamName,blt.sh_code shCode,tpp.lon sgLon,tpp.lat sgLat,
+        peopel_type as userType,tddone.data_val as dl,tddtwo.data_val as lon,tddthree.data_val as lat,tddfour.data_val as wd,tddfive.data_val as xl,tddsix.data_val as xy,
                 case
                     WHEN  peopel_type=0 then tpe.aqm_code
                     WHEN  peopel_type=1 then null
@@ -43,26 +43,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     ELSE ''
                     END AS idCard
                 FROM tb_bracelet blt
-                 left join tb_sh_box sbx on blt.box_ix=sbx.id and sbx.del_flag = 0
-                 left join t_work_team twt on sbx.team_id = twt.team_id and twt.del_flag= 0
-                 left join tb_project tp on  twt.pro_id = tp.id
-                 left join tb_project_power tpp on tpp.id=sbx.gt_id and tpp.del_flag = 0
-                 left join tb_people tpe on blt.bid_id=tpe.id and peopel_type=0 and tpe.name is not null and tpe.name!=''
-                 left join tb_ls_user tlu on blt.bid_id=tlu.id and peopel_type=1 and tlu.name is not null and tlu.name!=''
-                 left join tb_people_certificate tpc on tpe.id = tpc.people_id and tpc.certificate_type = 1
-                 left join tb_dev_details tddone on blt.id = tddone.dev_id and tddone.dev_type = 0 and tddone.data_code = '电量' and tddone.del_flag = 0
-                 left join tb_dev_details tddtwo on blt.id = tddtwo.dev_id and tddtwo.dev_type = 0 and tddtwo.data_code = '经度' and tddtwo.del_flag = 0
-                 left join tb_dev_details tddthree on blt.id = tddthree.dev_id and tddthree.dev_type = 0 and tddthree.data_code = '纬度'  and tddthree.del_flag = 0
-                 left join tb_dev_details tddfour on blt.id = tddfour.dev_id and tddfour.dev_type = 0 and tddfour.data_code = '温度' and tddfour.del_flag = 0
-                 left join tb_dev_details tddfive on blt.id = tddfive.dev_id and tddfive.dev_type = 0 and tddfive.data_code = '心率' and tddfive.del_flag = 0
-                 left join tb_dev_details tddsix on blt.id = tddsix.dev_id and tddsix.dev_type = 0 and tddsix.data_code = '血压' and tddsix.del_flag = 0
+                left join tb_sh_box sbx on blt.box_id=sbx.id and sbx.del_flag = 0
+                left join t_work_team twt on sbx.team_id = twt.team_id and twt.del_flag= 0
+                left join tb_project_power tpp on tpp.id=sbx.gt_id and tpp.del_flag = 0
+                left join tb_people tpe on blt.bid_id=tpe.id and peopel_type=0 and tpe.name is not null and tpe.name!=''
+                left join tb_ls_user tlu on blt.bid_id=tlu.id and peopel_type=1 and tlu.name is not null and tlu.name!=''
+                left join tb_people_certificate tpc on tpe.id = tpc.people_id and tpc.certificate_type = 1
+                left join tb_dev_details tddone on blt.id = tddone.dev_id and tddone.dev_type = 0 and tddone.data_code = '电量' and tddone.del_flag = 0
+                left join tb_dev_details tddtwo on blt.id = tddtwo.dev_id and tddtwo.dev_type = 0 and tddtwo.data_code = '经度' and tddtwo.del_flag = 0
+                left join tb_dev_details tddthree on blt.id = tddthree.dev_id and tddthree.dev_type = 0 and tddthree.data_code = '纬度'  and tddthree.del_flag = 0
+                left join tb_dev_details tddfour on blt.id = tddfour.dev_id and tddfour.dev_type = 0 and tddfour.data_code = '温度' and tddfour.del_flag = 0
+                left join tb_dev_details tddfive on blt.id = tddfive.dev_id and tddfive.dev_type = 0 and tddfive.data_code = '心率' and tddfive.del_flag = 0
+                left join tb_dev_details tddsix on blt.id = tddsix.dev_id and tddsix.dev_type = 0 and tddsix.data_code = '血压' and tddsix.del_flag = 0
         <where>
             blt.del_flag = 0
-            <if test="proId!=null and proId!=''">
-                and  tp.id=#{proId}
-            </if>
-            <if test="teamId!=null and teamId!=''">
-                and  twt.team_id=#{teamId}
+            <if test="gtId!=null and gtId!=''">
+                and  tpp.id=#{gtId}
             </if>
             <if test="userName!=null and userName!=''">
                 and  (tpe.name=#{userName} or tlu.name=#{userName})
@@ -81,12 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LIMIT 1
     </select>
 
-    <!--切换时获取工程列表-->
-    <select id="getProjectList" resultType="java.util.Map">
-        select id,pro_name as name
-        from tb_project
-        where id != #{proId} and del_flag = 0
-    </select>
+<!--    &lt;!&ndash;切换时获取工程列表&ndash;&gt;-->
+<!--    <select id="getProjectList" resultType="java.util.Map">-->
+<!--        select id,pro_name as name-->
+<!--        from tb_project-->
+<!--        where id != #{proId} and del_flag = 0-->
+<!--    </select>-->
 
     <!--安全帽编号是否重复-->
     <select id="isExistCodeAqm" resultType="com.bonus.common.entity.bracelet.vo.ProjectVo">
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
index 088f7dd..d4a9997 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/WarnReminderMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join tb_project tp on tw.pro_id = tp.id and tp.del_flag = 0
         left join sys_file_source sfs ON tw.dev_id = sfs.source_id AND sfs.source_type = 8 AND sfs.del_flag = 0
         <where>
-            tw.dev_type = 1 and tw.warn_type = 2 and tw.pro_id = 1
+            tw.dev_type = 1 and tw.warn_type = 2
             <if test="proId!=null and proId!=''">
                 and tw.pro_id = #{proId}
             </if>
@@ -56,12 +56,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by  deviceTypeName ASC
     </select>
 
-    <!--切换时获取工程列表-->
-    <select id="getProjectList" resultType="java.util.Map">
-        select id,pro_name as name
-        from tb_project
-        where id != #{proId} and del_flag = 0
-    </select>
-
-
 </mapper>
\ No newline at end of file
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/DeviceServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/DeviceServiceImpl.java
index 51c8cfd..e31cbea 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/DeviceServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/DeviceServiceImpl.java
@@ -52,15 +52,6 @@ public class DeviceServiceImpl implements IDeviceService {
         List<DeviceVo> list = new ArrayList<>();
         try {
             list = deviceMapper.getDeviceLists(data);
-            for (int i = 0; i < list.size(); i++) {
-                if(list.get(i).getLyType()==0){
-                    String name = deviceMapper.getDeviceLyName(list.get(i).getLyId());
-                    list.get(i).setLyName(name);
-                }else if(list.get(i).getLyType()==1){
-                    String name = deviceMapper.getDeviceLyNameTemp(list.get(i).getLyId());
-                    list.get(i).setLyName(name);
-                }
-            }
         } catch (Exception e) {
             log.error(e.toString(), e);
         }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java
index f9194ea..50a8596 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EngineeringServiceImpl.java
@@ -195,6 +195,15 @@ public class EngineeringServiceImpl implements IEngineeringService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult editPro(EngineeringVo vo) {
         try {
+            if(vo.getYzManage()==null || vo.getYzManage().equals("")){
+                vo.setYzManage(null);
+            }
+            if(vo.getSgManage()==null || vo.getSgManage().equals("")){
+                vo.setSgManage(null);
+            }
+            if(vo.getJlManage()==null || vo.getJlManage().equals("")){
+                vo.setJlManage(null);
+            }
             EngineeringVo result = Mapper.isNameExist(vo);
             if (result != null) {
                 return AjaxResult.error("工程名称已存在");
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
index 6df3f46..d8b95da 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
@@ -6,10 +6,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--设备列表-->
     <select id="getDeviceLists" resultType="com.bonus.common.entity.bracelet.vo.DeviceVo">
         select td.id as deviceId,td.dev_type as deviceType,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,
-               tdl.ly_user as lyId,tdl.user_type as lyType,tdd.dict_label AS deviceTypeName,td.dev_index as deviceIndex
+               tdl.ly_user as lyId,tdl.user_type as lyType,tdd.dict_label AS deviceTypeName,td.dev_index as deviceIndex,
+        case
+        WHEN  tdl.user_type=0 then tpe.name
+        WHEN  tdl.user_type=1 then tlu.name
+        ELSE ''
+        END AS lyName
         from tb_device td
-        left join sys_dict_data tdd on tdd.dict_value=td.dev_type AND tdd .dict_type='sys_device_type'
+        left join sys_dict_data tdd on tdd.dict_value=td.dev_type AND tdd.dict_type='sys_device_type'
         left join tb_dev_ly tdl on td.id = tdl.dev_id
+        left join tb_people tpe on tdl.ly_user=tpe.id and tdl.user_type=0
+        left join tb_ls_user tlu on tdl.ly_user=tlu.id and tdl.user_type=1
         where td.del_flag = 0
         <if test="deviceType != null and deviceType!=''">
             AND INSTR(td.dev_type,#{deviceType}) > 0
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
index f7fa980..6338c53 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
@@ -136,9 +136,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="orgName != null and orgName != ''">org_id = #{orgName},</if>
                 <if test="proType != null and proType != ''">pro_type = #{proType},</if>
                 <if test="proStatus != null and proStatus != ''">pro_status = #{proStatus},</if>
-                <if test="yzManage != null and yzManage != ''">yz_manage = #{yzManage},</if>
-                <if test="sgManage != null and sgManage != ''">sg_manage = #{sgManage},</if>
-                <if test="jlManage != null and jlManage != ''">jl_manage = #{jlManage},</if>
+                yz_manage = #{yzManage},
+                sg_manage = #{sgManage},
+                jl_manage = #{jlManage},
                 update_time = now()
             </set>
             where id = #{proId}