diff --git a/src/main/java/com/WisdomSiteApplication.java b/src/main/java/com/WisdomSiteApplication.java
index 959fa30ba..7235cbc3b 100644
--- a/src/main/java/com/WisdomSiteApplication.java
+++ b/src/main/java/com/WisdomSiteApplication.java
@@ -40,8 +40,8 @@ public class WisdomSiteApplication extends SpringBootServletInitializer {
     }
 
     /**
-     *  项目打成war包部署到外部tomcat运行时需要运行放开   
-     *  本地运行或打jar包注释掉
+     * 项目打成war包部署到外部tomcat运行时需要运行放开
+     * 本地运行或打jar包注释掉
      */
     /*@Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
index 7d6346395..d8dba0aca 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
@@ -86,7 +86,7 @@ public class SystemUser implements Serializable {
      * 账号类型，1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号，7项目人员账号
      */
     @Excel(name = "账号类型，1系统管理员，2企业总部管理员账号,3区域账号，4城市账号，5项目账号，6项目子账号，7项目人员账号", width = 15)
-    @ApiModelProperty(value = "账号类型，1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号，6项目子账号，7项目人员账号")
+    @ApiModelProperty(value = "账号类型，1系统管理员：jxjadmin，2企业管理员账号：17512009894，3企业区账号，4企业市账号，5项目账号（thhy，只能看一个项目），6项目子账号（aq，比一个项目更小），7企业子账号：qyyszh（只能看到很多项目的账号）：,8参建单位，9政务")
     private java.lang.Integer accountType;
 
     @ApiModelProperty(value = "项目子账号绑定的劳务人员")
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
index e55876c85..7c4211252 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
@@ -226,6 +226,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             if (count > 0) {
                 throw new OpenAlertException(MessageUtil.get("notDeleteCompanyErr"));
             }
+            companyConfigMapper.delete(new LambdaQueryWrapper<CompanyConfig>().eq(CompanyConfig::getCompanySn, company.getHeadquartersSn()));
         } else if (company.getCompanyType() == 2) {
             QueryWrapper<Company> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(Company::getParentId, company.getCompanyId());
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerWorkCycle.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerWorkCycle.java
index 03a2744ff..7fcbf2d60 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerWorkCycle.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/TowerWorkCycle.java
@@ -1,201 +1,289 @@
 package com.zhgd.xmgl.modules.bigdevice.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * @Description: 塔吊工作循环
  * @author： pds
- * @date：   2020-12-16
+ * @date： 2020-12-16
  * @version： V1.0
  */
 @Data
 @TableName("tower_work_cycle")
-@ApiModel(value="TowerWorkCycle实体类",description="TowerWorkCycle")
+@ApiModel(value = "TowerWorkCycle实体类", description = "TowerWorkCycle")
 public class TowerWorkCycle implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**id*/
+    /**
+     * id
+     */
     @TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value="id")
-    private java.lang.Long id  ;
-    /**设备唯一标识*/
+    @ApiModelProperty(value = "id")
+    private java.lang.Long id;
+    /**
+     * 设备唯一标识
+     */
     @Excel(name = "设备唯一标识", width = 15)
-    @ApiModelProperty(value="设备唯一标识")
-    private java.lang.String devSn  ;
-    /**设备名称*/
+    @ApiModelProperty(value = "设备唯一标识")
+    private java.lang.String devSn;
+    /**
+     * 设备名称
+     */
     @Excel(name = "设备名称", width = 15)
-    @ApiModelProperty(value="设备名称")
-    private java.lang.String devName  ;
-    /**项目sn*/
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String devName;
+    /**
+     * 项目sn
+     */
     @Excel(name = "项目sn", width = 15)
-    @ApiModelProperty(value="项目sn")
-    private java.lang.String projectSn  ;
-    /**倍率*/
+    @ApiModelProperty(value = "项目sn")
+    private java.lang.String projectSn;
+    /**
+     * 倍率
+     */
     @Excel(name = "倍率", width = 15)
-    @ApiModelProperty(value="倍率")
-    private java.lang.Integer workMultiple  ;
-    /**开始时间*/
+    @ApiModelProperty(value = "倍率")
+    private java.lang.Integer workMultiple;
+    /**
+     * 开始时间
+     */
     @Excel(name = "开始时间", width = 15)
-    @ApiModelProperty(value="开始时间")
-    private java.lang.String startTime  ;
-    /**结束时间*/
+    @ApiModelProperty(value = "开始时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    /**
+     * 结束时间
+     */
     @Excel(name = "结束时间", width = 15)
-    @ApiModelProperty(value="结束时间")
-    private java.lang.String endTime  ;
-    /**工作时长,单位（s）*/
+    @ApiModelProperty(value = "结束时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+    /**
+     * 工作时长,单位（s）
+     */
     @Excel(name = "工作时长,单位（s）", width = 15)
-    @ApiModelProperty(value="工作时长,单位（s）")
-    private java.lang.String workTime  ;
-    /**添加时间*/
+    @ApiModelProperty(value = "工作时长,单位（s）")
+    private java.lang.String workTime;
+    /**
+     * 添加时间
+     */
     @Excel(name = "添加时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value="添加时间")
-    private java.util.Date addTime  ;
-    /**司机姓名*/
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "添加时间")
+    private java.util.Date addTime;
+    /**
+     * 司机姓名
+     */
     @Excel(name = "司机姓名", width = 15)
-    @ApiModelProperty(value="司机姓名")
-    private java.lang.String driverName  ;
-    /**司机身份证号*/
+    @ApiModelProperty(value = "司机姓名")
+    private java.lang.String driverName;
+    /**
+     * 司机身份证号
+     */
     @Excel(name = "司机身份证号", width = 15)
-    @ApiModelProperty(value="司机身份证号")
-    private java.lang.String driverIdCard  ;
-    /**工作循环开始高度,单位米*/
+    @ApiModelProperty(value = "司机身份证号")
+    private java.lang.String driverIdCard;
+    /**
+     * 工作循环开始高度,单位米
+     */
     @Excel(name = "工作循环开始高度,单位米", width = 15)
-    @ApiModelProperty(value="工作循环开始高度,单位米")
-    private java.lang.String slingStartHeight  ;
-    /**工作循环结束高度,单位米*/
+    @ApiModelProperty(value = "工作循环开始高度,单位米")
+    private java.lang.String slingStartHeight;
+    /**
+     * 工作循环结束高度,单位米
+     */
     @Excel(name = "工作循环结束高度,单位米", width = 15)
-    @ApiModelProperty(value="工作循环结束高度,单位米")
-    private java.lang.String slingEndHeight  ;
-    /**工作循环开始幅度*/
+    @ApiModelProperty(value = "工作循环结束高度,单位米")
+    private java.lang.String slingEndHeight;
+    /**
+     * 工作循环开始幅度
+     */
     @Excel(name = "工作循环开始幅度", width = 15)
-    @ApiModelProperty(value="工作循环开始幅度")
-    private java.lang.String slingStartRange  ;
-    /**工作循环结束幅度*/
+    @ApiModelProperty(value = "工作循环开始幅度")
+    private java.lang.String slingStartRange;
+    /**
+     * 工作循环结束幅度
+     */
     @Excel(name = "工作循环结束幅度", width = 15)
-    @ApiModelProperty(value="工作循环结束幅度")
-    private java.lang.String slingEndRange  ;
-    /**工作循环开始角度(° )*/
+    @ApiModelProperty(value = "工作循环结束幅度")
+    private java.lang.String slingEndRange;
+    /**
+     * 工作循环开始角度(° )
+     */
     @Excel(name = "工作循环开始角度(° )", width = 15)
-    @ApiModelProperty(value="工作循环开始角度(° )")
-    private java.lang.String slingStartRotation  ;
-    /**工作循环结束角度(° )*/
+    @ApiModelProperty(value = "工作循环开始角度(° )")
+    private java.lang.String slingStartRotation;
+    /**
+     * 工作循环结束角度(° )
+     */
     @Excel(name = "工作循环结束角度(° )", width = 15)
-    @ApiModelProperty(value="工作循环结束角度(° )")
-    private java.lang.String slingEndRotation  ;
-    /**工作循环最大载重比*/
+    @ApiModelProperty(value = "工作循环结束角度(° )")
+    private java.lang.String slingEndRotation;
+    /**
+     * 工作循环最大载重比
+     */
     @Excel(name = "工作循环最大载重比", width = 15)
-    @ApiModelProperty(value="工作循环最大载重比")
-    private java.lang.String peakLoad  ;
-    /**最大载重(kg)*/
+    @ApiModelProperty(value = "工作循环最大载重比")
+    private java.lang.String peakLoad;
+    /**
+     * 最大载重(kg)
+     */
     @Excel(name = "最大载重(kg)", width = 15)
-    @ApiModelProperty(value="最大载重(kg)")
-    private java.lang.String loading  ;
+    @ApiModelProperty(value = "最大载重(kg)")
+    private java.lang.String loading;
 
-    /**工作循环中最大力矩*/
+    /**
+     * 工作循环中最大力矩
+     */
     @Excel(name = "工作循环中最大力矩", width = 15)
-    @ApiModelProperty(value="工作循环中最大力矩")
-    private java.lang.String workMaxForce  ;
-    /**工作循环最大力矩百分比*/
+    @ApiModelProperty(value = "工作循环中最大力矩")
+    private java.lang.String workMaxForce;
+    /**
+     * 工作循环最大力矩百分比
+     */
     @Excel(name = "工作循环最大力矩百分比", width = 15)
-    @ApiModelProperty(value="工作循环最大力矩百分比")
-    private java.lang.String workMaxTorque  ;
-    /**工作循环最大力矩时的幅度*/
+    @ApiModelProperty(value = "工作循环最大力矩百分比")
+    private java.lang.String workMaxTorque;
+    /**
+     * 工作循环最大力矩时的幅度
+     */
     @Excel(name = "工作循环最大力矩时的幅度", width = 15)
-    @ApiModelProperty(value="工作循环最大力矩时的幅度")
-    private java.lang.String workMaxTorqueRange  ;
-    /**循环最大角度*/
+    @ApiModelProperty(value = "工作循环最大力矩时的幅度")
+    private java.lang.String workMaxTorqueRange;
+    /**
+     * 循环最大角度
+     */
     @Excel(name = "循环最大角度", width = 15)
-    @ApiModelProperty(value="循环最大角度")
-    private java.lang.String maxAngle  ;
-    /**循环最小角度*/
+    @ApiModelProperty(value = "循环最大角度")
+    private java.lang.String maxAngle;
+    /**
+     * 循环最小角度
+     */
     @Excel(name = "循环最小角度", width = 15)
-    @ApiModelProperty(value="循环最小角度")
-    private java.lang.String minAngle  ;
-    /**循环最大幅度*/
+    @ApiModelProperty(value = "循环最小角度")
+    private java.lang.String minAngle;
+    /**
+     * 循环最大幅度
+     */
     @Excel(name = "循环最大幅度", width = 15)
-    @ApiModelProperty(value="循环最大幅度")
-    private java.lang.String maxRange  ;
-    /**循环最小幅度*/
+    @ApiModelProperty(value = "循环最大幅度")
+    private java.lang.String maxRange;
+    /**
+     * 循环最小幅度
+     */
     @Excel(name = "循环最小幅度", width = 15)
-    @ApiModelProperty(value="循环最小幅度")
-    private java.lang.String minRange  ;
-    /**循环最大高度(米)*/
+    @ApiModelProperty(value = "循环最小幅度")
+    private java.lang.String minRange;
+    /**
+     * 循环最大高度(米)
+     */
     @Excel(name = "循环最大高度(米)", width = 15)
-    @ApiModelProperty(value="循环最大高度(米)")
-    private java.lang.String maxHeight  ;
-    /**循环最小高度(米)*/
+    @ApiModelProperty(value = "循环最大高度(米)")
+    private java.lang.String maxHeight;
+    /**
+     * 循环最小高度(米)
+     */
     @Excel(name = "循环最小高度(米)", width = 15)
-    @ApiModelProperty(value="循环最小高度(米)")
-    private java.lang.String minHeight  ;
-    /**工作循环最大风速*/
+    @ApiModelProperty(value = "循环最小高度(米)")
+    private java.lang.String minHeight;
+    /**
+     * 工作循环最大风速
+     */
     @Excel(name = "工作循环最大风速", width = 15)
-    @ApiModelProperty(value="工作循环最大风速")
-    private java.lang.String maxWindSpeed  ;
-    /**工作循环中是否出现幅度外限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环最大风速")
+    private java.lang.String maxWindSpeed;
+    /**
+     * 工作循环中是否出现幅度外限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现幅度外限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现幅度外限位报警 0: 正常 1:报警")
-    private java.lang.Integer workMaxRangeAlarm  ;
-    /**工作循环中是否出现幅度内限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现幅度外限位报警 0: 正常 1:报警")
+    private java.lang.Integer workMaxRangeAlarm;
+    /**
+     * 工作循环中是否出现幅度内限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现幅度内限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现幅度内限位报警 0: 正常 1:报警")
-    private java.lang.Integer workMinRangeAlarm  ;
-    /**工作循环中是否出现高度上限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现幅度内限位报警 0: 正常 1:报警")
+    private java.lang.Integer workMinRangeAlarm;
+    /**
+     * 工作循环中是否出现高度上限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现高度上限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现高度上限位报警 0: 正常 1:报警")
-    private java.lang.Integer workHeightAlarm  ;
-    /**工作循环中是否出现高度下限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现高度上限位报警 0: 正常 1:报警")
+    private java.lang.Integer workHeightAlarm;
+    /**
+     * 工作循环中是否出现高度下限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现高度下限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现高度下限位报警 0: 正常 1:报警")
-    private java.lang.Integer workHeightLowerAlarm  ;
-    /**工作循环中是否出现顺时针回转限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现高度下限位报警 0: 正常 1:报警")
+    private java.lang.Integer workHeightLowerAlarm;
+    /**
+     * 工作循环中是否出现顺时针回转限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现顺时针回转限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现顺时针回转限位报警 0: 正常 1:报警")
-    private java.lang.Integer workPosAngleAlarm  ;
-    /**工作循环中是否出现逆时针回转限位报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现顺时针回转限位报警 0: 正常 1:报警")
+    private java.lang.Integer workPosAngleAlarm;
+    /**
+     * 工作循环中是否出现逆时针回转限位报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现逆时针回转限位报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现逆时针回转限位报警 0: 正常 1:报警")
-    private java.lang.Integer workNegAngleAlarm  ;
-    /**工作循环中是否出现力矩报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现逆时针回转限位报警 0: 正常 1:报警")
+    private java.lang.Integer workNegAngleAlarm;
+    /**
+     * 工作循环中是否出现力矩报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现力矩报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现力矩报警 0: 正常 1:报警")
-    private java.lang.Integer workMomentAlarm  ;
-    /**工作循环中是否出现倾角报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现力矩报警 0: 正常 1:报警")
+    private java.lang.Integer workMomentAlarm;
+    /**
+     * 工作循环中是否出现倾角报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现倾角报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现倾角报警 0: 正常 1:报警")
-    private java.lang.Integer workObliguityAlarm  ;
-    /**工作循环中是否出现环境防碰撞报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现倾角报警 0: 正常 1:报警")
+    private java.lang.Integer workObliguityAlarm;
+    /**
+     * 工作循环中是否出现环境防碰撞报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现环境防碰撞报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现环境防碰撞报警 0: 正常 1:报警")
-    private java.lang.Integer workEnvironmentAlarm  ;
-    /**工作循环中是否出现多机防碰撞报警 0: 正常 1:报警*/
+    @ApiModelProperty(value = "工作循环中是否出现环境防碰撞报警 0: 正常 1:报警")
+    private java.lang.Integer workEnvironmentAlarm;
+    /**
+     * 工作循环中是否出现多机防碰撞报警 0: 正常 1:报警
+     */
     @Excel(name = "工作循环中是否出现多机防碰撞报警 0: 正常 1:报警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现多机防碰撞报警 0: 正常 1:报警")
-    private java.lang.Integer workMultiAlarm  ;
-    /**工作循环中是否出现力矩预警 0: 正常 1:预警*/
+    @ApiModelProperty(value = "工作循环中是否出现多机防碰撞报警 0: 正常 1:报警")
+    private java.lang.Integer workMultiAlarm;
+    /**
+     * 工作循环中是否出现力矩预警 0: 正常 1:预警
+     */
     @Excel(name = "工作循环中是否出现力矩预警 0: 正常 1:预警", width = 15)
-    @ApiModelProperty(value="工作循环中是否出现力矩预警 0: 正常 1:预警")
-    private java.lang.Integer workMomentPreAlarm  ;
-    /**工作循环中是否有风速报警 0: 正常 1:报警 2:预警*/
+    @ApiModelProperty(value = "工作循环中是否出现力矩预警 0: 正常 1:预警")
+    private java.lang.Integer workMomentPreAlarm;
+    /**
+     * 工作循环中是否有风速报警 0: 正常 1:报警 2:预警
+     */
     @Excel(name = "工作循环中是否有风速报警 0: 正常 1:报警 2:预警", width = 15)
-    @ApiModelProperty(value="工作循环中是否有风速报警 0: 正常 1:报警 2:预警")
-    private java.lang.Integer workWindSpeedAlarm  ;
+    @ApiModelProperty(value = "工作循环中是否有风速报警 0: 正常 1:报警 2:预警")
+    private java.lang.Integer workWindSpeedAlarm;
 
-    /**工作循环吊程*/
+    /**
+     * 工作循环吊程
+     */
     @TableField(exist = false)
-    @ApiModelProperty(value="工作循环吊程")
-    private java.lang.String workMileage  ;
+    @ApiModelProperty(value = "工作循环吊程")
+    private java.lang.String workMileage;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
index 2337a997a..3c8c5eea4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerAlarmMapper.xml
@@ -1,6 +1,40 @@
 <?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.zhgd.xmgl.modules.bigdevice.mapper.TowerAlarmMapper">
+    <sql id="isAlarm">
+        <!--是否报警-->
+        case when
+        moment_alarm=1 or
+        wind_speed_alarm=1 or
+        height_alarm=1 or
+        height_lower_alarm=1 or
+        min_range_alarm=1 or
+        max_range_alarm=1 or
+        pos_angle_alarm=1 or
+        neg_angle_alarm=1 or
+        obliguity_alarm=1 or
+        environment_alarm=1 or
+        multi_alarm=1 or
+        standard_high_alarm=1
+        then 1 else 0 end
+    </sql>
+    <sql id="isWarning">
+        <!--是否预警-->
+        case when
+        moment_alarm=2 or
+        wind_speed_alarm=2 or
+        height_alarm=2 or
+        height_lower_alarm=2 or
+        min_range_alarm=2 or
+        max_range_alarm=2 or
+        pos_angle_alarm=2 or
+        neg_angle_alarm=2 or
+        obliguity_alarm=2 or
+        environment_alarm=2 or
+        multi_alarm=2 or
+        standard_high_alarm=2
+        then 1 else 0 end
+    </sql>
 
     <select id="queryTowerAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
         SELECT a.*,date_format(a.add_time, '%Y-%m-%d %H:%i:%S') alarm_time
@@ -9,7 +43,7 @@
         <if test="param.pushPersonId != null">
             and find_in_set(#{param.pushPersonId}, a.push_person_ids)
         </if>
-        <if test="param.devSn!=null and param.devSn!=''">
+        <if test="param.devSn != null and param.devSn != ''">
             and a.dev_sn=#{param.devSn}
         </if>
         <if test="param.status!=null and param.status gt 0">
@@ -123,34 +157,10 @@
     </select>
     <select id="selectCurrentAlarmCount" resultType="java.util.Map">
         select count(1) totalAlarmNum,
-        IFNULL(SUM((case when
-        moment_alarm=1 or
-        wind_speed_alarm=1 or
-        height_alarm=1 or
-        height_lower_alarm=1 or
-        min_range_alarm=1 or
-        max_range_alarm=1 or
-        pos_angle_alarm=1 or
-        neg_angle_alarm=1 or
-        obliguity_alarm=1 or
-        environment_alarm=1 or
-        multi_alarm=1 or
-        standard_high_alarm=1
-        then 1 else 0 end)),0) alarmNum, <!--报警数-->
-        IFNULL(SUM((case when
-        moment_alarm=2 or
-        wind_speed_alarm=2 or
-        height_alarm=2 or
-        height_lower_alarm=2 or
-        min_range_alarm=2 or
-        max_range_alarm=2 or
-        pos_angle_alarm=2 or
-        neg_angle_alarm=2 or
-        obliguity_alarm=2 or
-        environment_alarm=2 or
-        multi_alarm=2 or
-        standard_high_alarm=2
-        then 1 else 0 end)),0) warningNum <!--预警数-->
+        IFNULL(SUM(<include refid="isAlarm">
+    </include>),0) alarmNum,
+        IFNULL(SUM((<include refid="isWarning">
+    </include>)),0) warningNum <!--预警数-->
         from tower_alarm a
         where a.project_sn=#{projectSn}
         <if test="devSn != null and devSn != ''">
@@ -172,11 +182,13 @@
     </select>
     <select id="selectHourTowerAlarmCount" resultType="java.util.Map">
         select DATE_FORMAT(a.add_time,"%H") hourTitle,
-        IFNULL(SUM((case when a.alarm_type=1 then 1 else 0 end)),0) alarmNum,
-        IFNULL(SUM((case when a.alarm_type=2 then 1 else 0 end)),0) warningNum
+        IFNULL(SUM((<include refid="isAlarm">
+    </include>)),0) alarmNum,
+        IFNULL(SUM((<include refid="isWarning">
+    </include>)),0) warningNum
         from tower_alarm a
         where a.project_sn=#{projectSn}
-        <if test="devSn!=null and devSn!=''">
+        <if test="devSn != null and devSn != ''">
             and a.dev_sn=#{devSn}
         </if>
         AND a.add_time &gt;=CONCAT(DATE_FORMAT(now(),"%Y-%m-%d"),' 00:00:00')
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
index c0204f483..0f1359d63 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
@@ -29,6 +29,7 @@ import com.zhgd.xmgl.modules.bigdevice.service.ITowerFaultService;
 import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.util.DataObjUtils;
+import com.zhgd.xmgl.util.DateUtil;
 import com.zhgd.xmgl.util.JxlExcelUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -444,8 +445,8 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
             towerWorkCycle.setDevName(tower.getDevName());
             towerWorkCycle.setDevSn(tower.getDevSn());
             towerWorkCycle.setProjectSn(tower.getProjectSn());
-            towerWorkCycle.setStartTime(dataJson.getString("liftingPointDate"));
-            towerWorkCycle.setEndTime(dataJson.getString("uploadingPointDate"));
+            towerWorkCycle.setStartTime(DateUtil.parseDateTime(dataJson.getString("liftingPointDate")));
+            towerWorkCycle.setEndTime(DateUtil.parseDateTime(dataJson.getString("uploadingPointDate")));
             towerWorkCycle.setSlingStartHeight(DataObjUtils.divide(dataJson.getString("liftingPointHeight"), "10"));
             towerWorkCycle.setSlingEndHeight(DataObjUtils.divide(dataJson.getString("uploadingPointHeight"), "10"));
             towerWorkCycle.setSlingStartRange(DataObjUtils.divide(dataJson.getString("liftingPointRadius"), "10"));
@@ -458,5 +459,4 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
         }
     }
 
-
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
index 89bfe175d..5b80205d5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
@@ -7,7 +7,6 @@ import com.gexin.fastjson.JSON;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.car.entity.CarPassRecord;
-import com.zhgd.xmgl.modules.car.entity.vo.EntryAndExitRecordsTodayVo;
 import com.zhgd.xmgl.modules.car.entity.vo.TodayOutInNumber;
 import com.zhgd.xmgl.modules.car.service.ICarCameraService;
 import com.zhgd.xmgl.modules.car.service.ICarPassRecordService;
@@ -71,7 +70,7 @@ public class CarPassRecordController {
             @ApiImplicitParam(name = "type", value = "类型，1查询临时车通行记录，2查询白名单车通行记录，不传查所有", paramType = "query", required = false, dataType = "String"),
     })
     @PostMapping(value = "/getCarPassRecordList")
-    public Result<List<EntityMap>> getCarPassRecordList(@RequestBody Map<String, Object> map) {
+    public Result<List<CarPassRecord>> getCarPassRecordList(@RequestBody Map<String, Object> map) {
         return Result.success(carPassRecordService.getCarPassRecordList(map));
     }
 
@@ -169,8 +168,6 @@ public class CarPassRecordController {
             log.info(JSONUtil.toJsonStr(data));
         } else if ("offline".equals(type)) {
             Map<String, Object> resultMap = carPassRecordService.saveCameraCarPassRecord(plate_num, car_logo, car_color, park_id, cam_id, vdc_type, picture, closeup_pic);
-            data.put("error_num", 0);
-            data.put("error_str", "not error");
         } else if ("heartbeat".equals(type)) {
             //log.info("车牌心跳" + "车场ID：" + park_id + "相机ID：" + cam_id);
             Map<String, Object> resultMap = new HashMap<>();
@@ -237,13 +234,6 @@ public class CarPassRecordController {
         return Result.success(carPassRecordService.list(Wrappers.<CarPassRecord>lambdaQuery().eq(CarPassRecord::getProjectSn, projectSn).last("limit 3")));
     }
 
-    @ApiOperation(value = "当日出入场记录", notes = "当日出入场记录")
-    @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String")
-    @GetMapping(value = "/getEntryAndExitRecordsToday")
-    public Result<List<EntryAndExitRecordsTodayVo>> getEntryAndExitRecordsToday(String projectSn) {
-        return Result.success(carPassRecordService.getEntryAndExitRecordsToday(projectSn));
-    }
-
     @ApiOperation(value = "查询最新一条车辆通行记录信息", notes = "查询最新一条车辆通行记录信息", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "carType", value = "查询类型，1白名单，2黑名单，3临时车辆", paramType = "query", required = false, dataType = "String"),
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarPassRecord.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarPassRecord.java
index 7747b872a..f87c17313 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarPassRecord.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarPassRecord.java
@@ -1,41 +1,46 @@
 package com.zhgd.xmgl.modules.car.entity;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
 /**
  * @Description: 车辆通行记录
  * @author： pds
- * @date：   2020-09-29
+ * @date： 2020-09-29
  * @version： V1.0
  */
 @Data
 @TableName("car_pass_record")
-@ApiModel(value="CarPassRecord实体类",description="CarPassRecord")
+@ApiModel(value = "CarPassRecord实体类", description = "CarPassRecord")
 public class CarPassRecord implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**车辆进出表*/
+    /**
+     * 车辆进出表
+     */
     @TableId(type = IdType.ASSIGN_ID)
-   @ApiModelProperty(value="车辆进出表")
-	private java.lang.Long id  ;
-	/**车牌号*/
-	@Excel(name = "车牌号", width = 15)
-   @ApiModelProperty(value="车牌号")
-	private java.lang.String carNumber  ;
-	/**进出类型1为出 0为进*/
-	@Excel(name = "进出类型1为出 0为进", width = 15)
-   @ApiModelProperty(value="进出类型1为出 0为进")
-	private java.lang.Integer type  ;
+    @ApiModelProperty(value = "车辆进出表")
+    private java.lang.Long id;
+    /**
+     * 车牌号
+     */
+    @Excel(name = "车牌号", width = 15)
+    @ApiModelProperty(value = "车牌号")
+    private java.lang.String carNumber;
+    /**
+     * 进出类型1为出 0为进
+     */
+    @Excel(name = "进出类型1为出 0为进", width = 15)
+    @ApiModelProperty(value = "进出类型1为出 0为进")
+    private java.lang.Integer type;
     /**
      * 通过时间
      */
@@ -54,12 +59,16 @@ public class CarPassRecord implements Serializable {
     @Excel(name = "车辆颜色", width = 15)
     @ApiModelProperty(value = "车辆颜色")
     private java.lang.String carColor;
-	/**进出位置*/
-	@Excel(name = "进出位置", width = 15)
-   @ApiModelProperty(value="进出位置")
-	private java.lang.String location  ;
-	/**项目SN*/
-	@Excel(name = "项目SN", width = 15)
+    /**
+     * 进出位置
+     */
+    @Excel(name = "进出位置", width = 15)
+    @ApiModelProperty(value = "进出位置")
+    private java.lang.String location;
+    /**
+     * 项目SN
+     */
+    @Excel(name = "项目SN", width = 15)
     @ApiModelProperty(value = "项目SN")
     private java.lang.String projectSn;
     /**
@@ -84,7 +93,32 @@ public class CarPassRecord implements Serializable {
     @ApiModelProperty(value = "司机数据")
     private java.lang.String driverData;
 
+    @ApiModelProperty(value = "是否放行 1放行 0不放行")
+    private Integer isOpen;
+
     @ApiModelProperty(value = "车辆类型 1白名单，2黑名单，临时车")
     @TableField(exist = false)
     private java.lang.Integer carType;
+
+    @TableField(exist = false)
+    private Integer isBlack;
+
+    @ApiModelProperty(value = "入场口")
+    @TableField(exist = false)
+    private java.lang.String entrance;
+    @ApiModelProperty(value = "入场时间")
+    @TableField(exist = false)
+    private java.lang.String entranceTime;
+    @ApiModelProperty(value = "出场口")
+    @TableField(exist = false)
+    private java.lang.String exit;
+    @ApiModelProperty(value = "出场时间")
+    @TableField(exist = false)
+    private java.lang.String exitTime;
+    @ApiModelProperty(value = "放行操作（正常放行、不放行）")
+    @TableField(exist = false)
+    private java.lang.String releaseOperation;
+    @ApiModelProperty(value = "车辆状态名称（未出场、已出场）")
+    @TableField(exist = false)
+    private java.lang.String vehicleStateName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/EntryAndExitRecordsTodayVo.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/EntryAndExitRecordsTodayVo.java
index 0897dbc38..eed6e182d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/EntryAndExitRecordsTodayVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/vo/EntryAndExitRecordsTodayVo.java
@@ -11,7 +11,8 @@ public class EntryAndExitRecordsTodayVo {
     private java.lang.String location;
     @ApiModelProperty(value = "通过时间", hidden = true)
     private java.lang.String passTime;
-
+    @ApiModelProperty(value = "是否放行 1放行 0不放行", hidden = true)
+    private Integer isOpen;
     @ApiModelProperty(value = "车牌号")
     private java.lang.String carNumber;
     @ApiModelProperty(value = "入场口")
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java
index ade08e25b..1c4a811cd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarPassRecordMapper.java
@@ -24,7 +24,7 @@ public interface CarPassRecordMapper extends BaseMapper<CarPassRecord> {
 
     List<EntityMap> getCarPassRecordListByType(Map<String, Object> map);
 
-    List<EntityMap> getCarPassRecordListByCameraId(Map<String, Object> map);
+    List<CarPassRecord> getCarPassRecordList(Map<String, Object> map);
 
     int getTotalCarNumByCameraId(Map<String, Object> map);
 
@@ -42,7 +42,5 @@ public interface CarPassRecordMapper extends BaseMapper<CarPassRecord> {
 
     EntityMap getTodayOutInNumber(String projectSn);
 
-    List<EntryAndExitRecordsTodayVo> getEntryAndExitRecordsToday(String projectSn);
-
     CarPassRecord queryNewestCarPassRecord(Map<String, Object> map);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
index 817796575..20e1ebd1a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
@@ -20,7 +20,7 @@
         and a.pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
         ORDER BY a.pass_time DESC
     </select>
-    <select id="getCarPassRecordListByCameraId" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
+    <select id="getCarPassRecordList" resultType="com.zhgd.xmgl.modules.car.entity.CarPassRecord">
         SELECT a.*, b.is_black
         FROM car_pass_record a
         LEFT JOIN car_info b ON (a.project_sn = b.project_sn AND a.car_number = b.car_number)
@@ -205,32 +205,6 @@
         AND pass_time >= CONCAT(DATE_FORMAT(now(), "%Y-%m-%d"), ' 00:00:00')
     </select>
 
-    <select id="getEntryAndExitRecordsToday"
-            resultType="com.zhgd.xmgl.modules.car.entity.vo.EntryAndExitRecordsTodayVo">
-        SELECT t.*
-        FROM (SELECT cpr.car_number,
-        cpr.type,
-        cpr.location,
-        cpr.pass_time,
-        cin.location as entrance,
-        cin.pass_time as entranceTime
-        FROM car_pass_record cpr
-        LEFT JOIN (
-        SELECT *
-        FROM car_pass_record
-        WHERE id IN (SELECT MAX(id)
-        FROM car_pass_record
-        WHERE project_sn = #{projectSn}
-        and type = 0
-        and date_format(pass_time, '%Y-%m-%d') = curdate()
-        GROUP BY car_number)) cin ON cin.car_number = cpr.car_number
-        AND cpr.type = 1
-        where cpr.project_sn = #{projectSn}
-        and date_format(cpr.pass_time, '%Y-%m-%d') = curdate()
-        ORDER BY cpr.pass_time DESC) t
-        GROUP BY t.car_number
-    </select>
-
     <select id="queryNewestCarPassRecord" resultType="com.zhgd.xmgl.modules.car.entity.CarPassRecord">
         select a.*,
         (case
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java
index 61b896573..3b09029a4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/ICarPassRecordService.java
@@ -22,7 +22,7 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
 
     Map<String, Object> saveCameraCarPassRecord(String plate_num, String car_logo, String car_color, String park_id, String cam_id, String vdc_type, String picture, String closeup_pic);
 
-    List<EntityMap> getCarPassRecordList(Map<String, Object> map);
+    List<CarPassRecord> getCarPassRecordList(Map<String, Object> map);
 
     List<TodayOutInNumber> selectCarPassRecordInOutCount(Map<String, Object> map);
 
@@ -34,7 +34,5 @@ public interface ICarPassRecordService extends IService<CarPassRecord> {
 
     EntityMap getTodayOutInNumber(String projectSn);
 
-    List<EntryAndExitRecordsTodayVo> getEntryAndExitRecordsToday(String projectSn);
-
     CarPassRecord queryNewestCarPassRecord(Map<String, Object> map);
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java
index dd12a1cbe..5f05f671a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarPassRecordServiceImpl.java
@@ -113,13 +113,15 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
         queryWrapper.lambda().eq(CarInfo::getProjectSn, park_id)
                 .eq(CarInfo::getCarNumber, plate_num);
         CarInfo carInfo = carInfoMapper.selectOne(queryWrapper);
+        CarPassRecord carPassRecord = new CarPassRecord();
         if (carInfo != null && carInfo.getIsBlack() == 0) {
             resultMap.put("action", "on");
+            carPassRecord.setIsOpen(1);
         } else {
             resultMap.put("action", "off");
+            carPassRecord.setIsOpen(0);
         }
         //resultMap.put("action","on");
-        CarPassRecord carPassRecord = new CarPassRecord();
         carPassRecord.setProjectSn(park_id);
         carPassRecord.setCarLogo(car_logo);
         carPassRecord.setCarColor(car_color);
@@ -348,8 +350,23 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
     }
 
     @Override
-    public List<EntityMap> getCarPassRecordList(Map<String, Object> map) {
-        return carPassRecordMapper.getCarPassRecordListByCameraId(map);
+    public List<CarPassRecord> getCarPassRecordList(Map<String, Object> map) {
+        List<CarPassRecord> carPassRecordList = carPassRecordMapper.getCarPassRecordList(map);
+        for (CarPassRecord cpr : carPassRecordList) {
+            //进
+            if (Objects.equals(cpr.getType(), 0)) {
+                cpr.setEntrance(cpr.getLocation());
+                cpr.setEntranceTime(cpr.getPassTime());
+                cpr.setVehicleStateName("未出场");
+            } else if (Objects.equals(cpr.getType(), 1)) {
+                cpr.setExit(cpr.getLocation());
+                cpr.setExitTime(cpr.getPassTime());
+                cpr.setVehicleStateName("已出场");
+            }
+
+            cpr.setReleaseOperation(cpr.getIsOpen().equals(1) ? "正常放行" : "不放行");
+        }
+        return carPassRecordList;
     }
 
     @Override
@@ -404,25 +421,6 @@ public class CarPassRecordServiceImpl extends ServiceImpl<CarPassRecordMapper, C
         return carPassRecordMapper.getTodayOutInNumber(projectSn);
     }
 
-    @Override
-    public List<EntryAndExitRecordsTodayVo> getEntryAndExitRecordsToday(String projectSn) {
-        List<EntryAndExitRecordsTodayVo> voList = carPassRecordMapper.getEntryAndExitRecordsToday(projectSn);
-        for (EntryAndExitRecordsTodayVo vo : voList) {
-            //进
-            if (Objects.equals(vo.getType(), 0)) {
-                vo.setEntrance(vo.getLocation());
-                vo.setEntranceTime(vo.getPassTime());
-                vo.setVehicleStateName("未出场");
-            } else if (Objects.equals(vo.getType(), 1)) {
-                vo.setExit(vo.getLocation());
-                vo.setExitTime(vo.getPassTime());
-                vo.setVehicleStateName("已出场");
-            }
-            vo.setReleaseOperation("正常放行");
-        }
-        return voList;
-    }
-
     @Override
     public CarPassRecord queryNewestCarPassRecord(Map<String, Object> map) {
         return carPassRecordMapper.queryNewestCarPassRecord(map);
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmCountTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmCountTotalVo.java
index 183bdc8d8..bd07ef6fa 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmCountTotalVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/vo/EnvironmentAlarmCountTotalVo.java
@@ -11,7 +11,7 @@ public class EnvironmentAlarmCountTotalVo {
     private Integer pm25Num;
     @ApiModelProperty(value = "pm10报警数")
     private Integer pm10Num;
-    @ApiModelProperty(value = "白天噪音或夜晚噪音报警数")
+    @ApiModelProperty(value = "白天噪音和夜晚噪音报警数")
     private Integer noiseNum;
     @ApiModelProperty(value = "风速报警数")
     private Integer windspeedNum;
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java
index 11b501cb9..53015e7a9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/EnvironmentAlarmMapper.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.environment.entity.*;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo;
 import com.zhgd.xmgl.modules.project.entity.qo.QueryProjectTodayAlarmInfoQO;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +28,7 @@ public interface EnvironmentAlarmMapper extends BaseMapper<EnvironmentAlarm> {
 
     List<Map<String, Object>> selectHistoryEnvironmentAlarmList(Map<String, Object> param);
 
-    Map<String, Object> selectEnvironmentAlarmCountTotal(Map<String, Object> param);
+    EnvironmentAlarmCountTotalVo selectEnvironmentAlarmCountTotal(Map<String, Object> param);
 
     List<Map<String, Object>> selectCompanyEnvironmentAlarmList(Map<String, Object> param);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
index 0c0877ca4..4c21e730c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/EnvironmentAlarmMapper.xml
@@ -1,156 +1,170 @@
 <?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.zhgd.xmgl.modules.environment.mapper.EnvironmentAlarmMapper">
-
     <select id="queryEnvironmentAlarmPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT a.*,ifnull(a.avg_data-a.alarm_value,0) exceed_val,b.alarm_type
-        alarm_type_name,c.device_name,date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S')
+        SELECT a.*,
+        ifnull(a.avg_data - a.alarm_value, 0) exceed_val,
+        b.alarm_type
+        alarm_type_name,
+        c.device_name,
+        date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S')
         temp_alarm_time
-        FROM
-        environment_alarm a
-        LEFT JOIN environment_alarm_type b ON b.id =a.alarm_type_id
-        LEFT JOIN environment_dev c ON (a.device_id =c.device_id and a.project_sn=c.project_sn)
-        where a.project_sn=#{param.projectSn}
-        <if test="param.type!=null and param.type!='' or param.type=='0'.toString()">
-            and a.type=#{param.type}
+        FROM environment_alarm a
+        LEFT JOIN environment_alarm_type b ON b.id = a.alarm_type_id
+        LEFT JOIN environment_dev c ON (a.device_id = c.device_id and a.project_sn = c.project_sn)
+        where a.project_sn = #{param.projectSn}
+        <if test="param.type != null and param.type != '' or param.type == '0'.toString()">
+            and a.type = #{param.type}
         </if>
-        <if test="param.deviceId!=null and param.deviceId!=''">
-            and a.device_id=#{param.deviceId}
+        <if test="param.deviceId != null and param.deviceId != ''">
+            and a.device_id = #{param.deviceId}
         </if>
-        <if test="param.alarmTypeId!=null and param.alarmTypeId!=''">
-            and a.alarm_type_id=#{param.alarmTypeId}
+        <if test="param.alarmTypeId != null and param.alarmTypeId != ''">
+            and a.alarm_type_id = #{param.alarmTypeId}
         </if>
         <if test="param.startTime != null and param.startTime != ''">
-            AND a.alarm_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
+            AND a.alarm_time &gt;= CONCAT(DATE_FORMAT(#{param.startTime}, '%Y-%m-%d'), ' 00:00:00')
         </if>
         <if test="param.endTime != null and param.endTime != ''">
-            AND a.alarm_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
+            AND a.alarm_time &lt;= CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' 23:59:59')
         </if>
         order by a.alarm_time desc
     </select>
     <select id="selectNewEnvironmentAlarmList"
             resultType="com.zhgd.xmgl.modules.environment.entity.vo.NewEnvironmentAlarmVo">
-        SELECT a.*,b.alarm_type alarm_type_name,c.device_name,date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S')
+        SELECT a.*,
+        b.alarm_type alarm_type_name,
+        c.device_name,
+        date_format(a.alarm_time, '%Y-%m-%d %H:%i:%S')
         temp_alarm_time
-        FROM
-        environment_alarm a
-        LEFT JOIN environment_alarm_type b ON b.id =a.alarm_type_id
-        LEFT JOIN environment_dev c ON (a.device_id =c.device_id and a.project_sn=c.project_sn)
-        where a.project_sn=#{projectSn}
+        FROM environment_alarm a
+        LEFT JOIN environment_alarm_type b ON b.id = a.alarm_type_id
+        LEFT JOIN environment_dev c ON (a.device_id = c.device_id and a.project_sn = c.project_sn)
+        where a.project_sn = #{projectSn}
         order by a.alarm_time desc
         limit 10
     </select>
     <select id="selectHistoryEnvironmentAlarmList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT DATE_FORMAT(w1.alarm_time,"%Y-%m-%d") titleTime,COUNT(1) num
-        from environment_alarm w1 INNER JOIN project a ON w1.project_sn=a.project_sn
-                                  INNER JOIN company cp ON a.company_sn=cp.company_sn
-                                  INNER JOIN company b ON cp.parent_id=b.company_id
-                                  Left JOIN company f ON b.parent_id=f.company_id
+        SELECT DATE_FORMAT(w1.alarm_time, "%Y-%m-%d") titleTime, COUNT(1) num
+        from environment_alarm w1
+        INNER JOIN project a ON w1.project_sn = a.project_sn
+        INNER JOIN company cp ON a.company_sn = cp.company_sn
+        INNER JOIN company b ON cp.parent_id = b.company_id
+        Left JOIN company f ON b.parent_id = f.company_id
         <where>
             <if test="dateType == '1'.toString()">
                 and YEARWEEK(w1.alarm_time) = YEARWEEK(now())
             </if>
             <if test="dateType == '2'.toString()">
-              and DATE_FORMAT(w1.alarm_time,"%Y-%m")=DATE_FORMAT(now(),"%Y-%m")
+                and DATE_FORMAT(w1.alarm_time, "%Y-%m") = DATE_FORMAT(now(), "%Y-%m")
             </if>
             <if test="companyType == '1'.toString()">
-                and  f.company_sn=#{sn}
+                and f.company_sn = #{sn}
             </if>
             <if test="companyType == '2'.toString()">
-                and  f.company_sn=#{sn}
+                and f.company_sn = #{sn}
             </if>
             <if test="companyType == '3'.toString()">
-                and b.company_sn=#{sn}
+                and b.company_sn = #{sn}
             </if>
             <if test="companyType == '4'.toString()">
-                and a.project_sn=#{sn}
+                and a.project_sn = #{sn}
             </if>
             <if test="companyType == '5'.toString()">
-                and cp.company_sn=#{sn}
+                and cp.company_sn = #{sn}
             </if>
         </where>
-        GROUP BY DATE_FORMAT(w1.alarm_time,"%Y-%m-%d")
-        ORDER BY DATE_FORMAT(w1.alarm_time,"%Y-%m-%d")
-
-
+        GROUP BY DATE_FORMAT(w1.alarm_time, "%Y-%m-%d")
+        ORDER BY DATE_FORMAT(w1.alarm_time, "%Y-%m-%d")
     </select>
-    <select id="selectEnvironmentAlarmCountTotal" resultType="java.util.Map">
+    <select id="selectEnvironmentAlarmCountTotal"
+            resultType="com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo">
         SELECT COUNT(1) totalAlarm,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-               IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
-        from environment_alarm w1 INNER JOIN project a ON w1.project_sn=a.project_sn
-        INNER JOIN company cp ON a.company_sn=cp.company_sn
-                                  INNER JOIN company b ON cp.parent_id=b.company_id
-                                  Left JOIN company f ON b.parent_id=f.company_id
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)), 0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
+        from environment_alarm w1
+        INNER JOIN project a ON w1.project_sn = a.project_sn
+        INNER JOIN company cp ON a.company_sn = cp.company_sn
+        INNER JOIN company b ON cp.parent_id = b.company_id
+        Left JOIN company f ON b.parent_id = f.company_id
         <where>
             <if test="companyType == '1'.toString()">
-                and f.headquarters_sn=#{sn}
+                and f.headquarters_sn = #{sn}
             </if>
             <if test="companyType == '2'.toString()">
-                and f.company_sn=#{sn}
+                and f.company_sn = #{sn}
             </if>
             <if test="companyType == '3'.toString()">
-                and b.company_sn=#{sn}
+                and b.company_sn = #{sn}
             </if>
             <if test="companyType == '4'.toString()">
-                and w1.project_sn=#{sn}
+                and w1.project_sn = #{sn}
             </if>
             <if test="companyType == '5'.toString()">
-                and cp.company_sn=#{sn}
+                and cp.company_sn = #{sn}
             </if>
             <if test="selectType == '1'.toString()">
-                AND w1.alarm_time &gt;=CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 00:00:00')
+                AND w1.alarm_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
+            </if>
+            <if test="projectSn != null and projectSn != ''">
+                and w1.project_sn = #{projectSn}
             </if>
-
         </where>
-
     </select>
     <select id="selectCompanyEnvironmentAlarmList" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT
-        IFNULL(SUM(IFNULL(d.totalAlarm,0)),0) totalAlarm,
-        IFNULL(SUM(IFNULL(d.pm25Num,0)),0) pm25Num,
-        IFNULL(SUM(IFNULL(d.pm10Num,0)),0) pm10Num,
-        IFNULL(SUM(IFNULL(d.noiseNum,0)),0) noiseNum,
-        IFNULL(SUM(IFNULL(d.windspeedNum,0)),0) windspeedNum,
-        IFNULL(SUM(IFNULL(d.tspNum,0)),0) tspNum,
-        IFNULL(SUM(IFNULL(d.temperatureNum,0)),0) temperatureNum,
-        IFNULL(SUM(IFNULL(d.humidityNum,0)),0) humidityNum
+        SELECT IFNULL(SUM(IFNULL(d.totalAlarm, 0)), 0) totalAlarm,
+        IFNULL(SUM(IFNULL(d.pm25Num, 0)), 0) pm25Num,
+        IFNULL(SUM(IFNULL(d.pm10Num, 0)), 0) pm10Num,
+        IFNULL(SUM(IFNULL(d.noiseNum, 0)), 0) noiseNum,
+        IFNULL(SUM(IFNULL(d.windspeedNum, 0)), 0) windspeedNum,
+        IFNULL(SUM(IFNULL(d.tspNum, 0)), 0) tspNum,
+        IFNULL(SUM(IFNULL(d.temperatureNum, 0)), 0) temperatureNum,
+        IFNULL(SUM(IFNULL(d.humidityNum, 0)), 0) humidityNum
         <if test="companyType == '1'.toString()">
-            ,a.company_name name
+            ,
+            a.company_name name
         </if>
         <if test="companyType == '2'.toString()">
-            ,b.company_name name
+            ,
+            b.company_name name
         </if>
         <if test="companyType == '3'.toString()">
-            ,cp.company_name name
+            ,
+            cp.company_name name
         </if>
         <if test="companyType == '4'.toString()">
-            ,c.project_name name
+            ,
+            c.project_name name
         </if>
         <if test="companyType == '5'.toString()">
-            ,c.project_name name
+            ,
+            c.project_name name
         </if>
-        FROM company a LEFT JOIN company b ON b.parent_id=a.company_id
-        LEFT JOIN company cp ON b.company_id=cp.parent_id
-        LEFT JOIN project c ON cp.company_sn=c.company_sn
+        FROM company a
+        LEFT JOIN company b ON b.parent_id = a.company_id
+        LEFT JOIN company cp ON b.company_id = cp.parent_id
+        LEFT JOIN project c ON cp.company_sn = c.company_sn
         LEFT JOIN (SELECT w1.project_sn,
         COUNT(1) totalAlarm,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(
+        SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)),
+        0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
         from environment_alarm w1
-        GROUP BY w1.project_sn) d ON c.project_sn=d.project_sn
+        GROUP BY w1.project_sn) d ON c.project_sn = d.project_sn
         <if test="companyType == '1'.toString()">
-            WHERE a.headquarters_sn=#{sn}  AND a.company_type=2
+            WHERE a.headquarters_sn = #{sn}
+            AND a.company_type = 2
             GROUP BY a.company_id
         </if>
         <if test="companyType == '2'.toString()">
@@ -171,114 +185,124 @@
     </select>
     <select id="selectCurrentDayEnvironmentAlarmCountTotal" resultType="java.util.Map">
         SELECT COUNT(1) totalAlarm,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
-        from environment_alarm w1 INNER JOIN project a ON w1.project_sn=a.project_sn
-        INNER JOIN company cp ON a.company_sn=cp.company_sn
-        INNER JOIN company b ON cp.parent_id=b.company_id
-        Left JOIN company f ON b.parent_id=f.company_id
-        where  w1.alarm_time &gt;=CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 00:00:00')
-            <if test="companyType == '1'.toString()">
-                and f.headquarters_sn=#{sn}
-            </if>
-            <if test="companyType == '2'.toString()">
-                and f.company_sn=#{sn}
-            </if>
-            <if test="companyType == '3'.toString()">
-                and b.company_sn=#{sn}
-            </if>
-            <if test="companyType == '4'.toString()">
-                and w1.project_sn=#{sn}
-            </if>
-            <if test="companyType == '5'.toString()">
-                and cp.company_sn=#{sn}
-            </if>
-    </select>
-    <select id="selectEnvironmentSevenDayAlarmList" resultType="java.util.Map" parameterType="map">
-        SELECT DATE_FORMAT(w1.alarm_time,"%Y-%m-%d") titleName,count(1) num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
-        from environment_alarm w1 INNER JOIN project a ON w1.project_sn=a.project_sn
-        INNER JOIN company cp ON a.company_sn=cp.company_sn
-        INNER JOIN company b ON cp.parent_id=b.company_id
-        Left JOIN company f ON b.parent_id=f.company_id
-        where  w1.alarm_time &gt;=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -6 DAY),'%Y-%m-%d'),' 00:00:00')
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)), 0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
+        from environment_alarm w1
+        INNER JOIN project a ON w1.project_sn = a.project_sn
+        INNER JOIN company cp ON a.company_sn = cp.company_sn
+        INNER JOIN company b ON cp.parent_id = b.company_id
+        Left JOIN company f ON b.parent_id = f.company_id
+        where w1.alarm_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
         <if test="companyType == '1'.toString()">
-            and f.headquarters_sn=#{sn}
+            and f.headquarters_sn = #{sn}
         </if>
         <if test="companyType == '2'.toString()">
-            and f.company_sn=#{sn}
+            and f.company_sn = #{sn}
         </if>
         <if test="companyType == '3'.toString()">
-            and b.company_sn=#{sn}
+            and b.company_sn = #{sn}
         </if>
         <if test="companyType == '4'.toString()">
-            and w1.project_sn=#{sn}
+            and w1.project_sn = #{sn}
         </if>
         <if test="companyType == '5'.toString()">
-            and cp.company_sn=#{sn}
+            and cp.company_sn = #{sn}
+        </if>
+    </select>
+    <select id="selectEnvironmentSevenDayAlarmList" resultType="java.util.Map" parameterType="map">
+        SELECT DATE_FORMAT(w1.alarm_time, "%Y-%m-%d") titleName,
+        count(1) num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)), 0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
+        from environment_alarm w1
+        INNER JOIN project a ON w1.project_sn = a.project_sn
+        INNER JOIN company cp ON a.company_sn = cp.company_sn
+        INNER JOIN company b ON cp.parent_id = b.company_id
+        Left JOIN company f ON b.parent_id = f.company_id
+        where w1.alarm_time &gt;= CONCAT(DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -6 DAY), '%Y-%m-%d'), ' 00:00:00')
+        <if test="companyType == '1'.toString()">
+            and f.headquarters_sn = #{sn}
+        </if>
+        <if test="companyType == '2'.toString()">
+            and f.company_sn = #{sn}
+        </if>
+        <if test="companyType == '3'.toString()">
+            and b.company_sn = #{sn}
+        </if>
+        <if test="companyType == '4'.toString()">
+            and w1.project_sn = #{sn}
+        </if>
+        <if test="companyType == '5'.toString()">
+            and cp.company_sn = #{sn}
         </if>
         group by titleName
     </select>
     <select id="selectComapnyEnvironmentAlarmCount" resultType="java.util.Map">
-        SELECT
-        IFNULL(SUM(IFNULL(d.totalAlarm,0)),0) totalAlarm,
-        IFNULL(SUM(IFNULL(d.pm25Num,0)),0) pm25Num,
-        IFNULL(SUM(IFNULL(d.pm10Num,0)),0) pm10Num,
-        IFNULL(SUM(IFNULL(d.noiseNum,0)),0) noiseNum,
-        IFNULL(SUM(IFNULL(d.windspeedNum,0)),0) windspeedNum,
-        IFNULL(SUM(IFNULL(d.tspNum,0)),0) tspNum,
-        IFNULL(SUM(IFNULL(d.temperatureNum,0)),0) temperatureNum,
-        IFNULL(SUM(IFNULL(d.humidityNum,0)),0) humidityNum
+        SELECT IFNULL(SUM(IFNULL(d.totalAlarm, 0)), 0) totalAlarm,
+        IFNULL(SUM(IFNULL(d.pm25Num, 0)), 0) pm25Num,
+        IFNULL(SUM(IFNULL(d.pm10Num, 0)), 0) pm10Num,
+        IFNULL(SUM(IFNULL(d.noiseNum, 0)), 0) noiseNum,
+        IFNULL(SUM(IFNULL(d.windspeedNum, 0)), 0) windspeedNum,
+        IFNULL(SUM(IFNULL(d.tspNum, 0)), 0) tspNum,
+        IFNULL(SUM(IFNULL(d.temperatureNum, 0)), 0) temperatureNum,
+        IFNULL(SUM(IFNULL(d.humidityNum, 0)), 0) humidityNum
         <if test="companyType == '1'.toString()">
-            ,a.company_name name
+            ,
+            a.company_name name
         </if>
         <if test="companyType == '2'.toString()">
-            ,b.company_name name
+            ,
+            b.company_name name
         </if>
         <if test="companyType == '3'.toString()">
-            ,cp.company_name name
+            ,
+            cp.company_name name
         </if>
         <if test="companyType == '4'.toString()">
-            ,c.project_name name
+            ,
+            c.project_name name
         </if>
         <if test="companyType == '5'.toString()">
-            ,c.project_name name
+            ,
+            c.project_name name
         </if>
-        FROM company a LEFT JOIN company b ON b.parent_id=a.company_id
-        LEFT JOIN company cp ON b.company_id=cp.parent_id
-        LEFT JOIN project c ON cp.company_sn=c.company_sn
+        FROM company a
+        LEFT JOIN company b ON b.parent_id = a.company_id
+        LEFT JOIN company cp ON b.company_id = cp.parent_id
+        LEFT JOIN project c ON cp.company_sn = c.company_sn
         LEFT JOIN (SELECT w1.project_sn,
         COUNT(1) totalAlarm,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)),
+        0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
         from environment_alarm w1
         <where>
             <if test="selectType == '2'.toString()">
-                 w1.alarm_time &gt;=CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 00:00:00')
+                w1.alarm_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
             </if>
             <if test="selectType == '1'.toString()">
-                 w1.alarm_time &gt;=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -6 DAY),'%Y-%m-%d'),' 00:00:00')
+                w1.alarm_time &gt;=CONCAT(DATE_FORMAT(DATE_ADD(NOW(),INTERVAL -6 DAY),'%Y-%m-%d'),' 00:00:00')
             </if>
         </where>
-        GROUP BY w1.project_sn) d ON c.project_sn=d.project_sn
+        GROUP BY w1.project_sn) d ON c.project_sn = d.project_sn
         <if test="companyType == '1'.toString()">
-            WHERE a.headquarters_sn=#{sn}  AND a.company_type=2
+            WHERE a.headquarters_sn = #{sn}
+            AND a.company_type = 2
             GROUP BY a.company_id
         </if>
         <if test="companyType == '2'.toString()">
@@ -301,16 +325,16 @@
 
     <select id="selectTodayEnvironmentAlarmCount" resultType="java.util.Map">
         SELECT COUNT(1) totalAlarm,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=1 THEN 1 ELSE 0 END)),0) pm25Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=2 THEN 1 ELSE 0 END)),0) pm10Num,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=3 or w1.alarm_type_id=4 THEN 1 ELSE 0 END)),0) noiseNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=5 THEN 1 ELSE 0 END)),0) windspeedNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=6 THEN 1 ELSE 0 END)),0) tspNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=7 THEN 1 ELSE 0 END)),0) temperatureNum,
-        IFNULL(SUM((CASE WHEN w1.alarm_type_id=8 THEN 1 ELSE 0 END)),0) humidityNum
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 1 THEN 1 ELSE 0 END)), 0) pm25Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 2 THEN 1 ELSE 0 END)), 0) pm10Num,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 3 or w1.alarm_type_id = 4 THEN 1 ELSE 0 END)), 0) noiseNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 5 THEN 1 ELSE 0 END)), 0) windspeedNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 6 THEN 1 ELSE 0 END)), 0) tspNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 7 THEN 1 ELSE 0 END)), 0) temperatureNum,
+        IFNULL(SUM((CASE WHEN w1.alarm_type_id = 8 THEN 1 ELSE 0 END)), 0) humidityNum
         from environment_alarm w1
-        where  w1.alarm_time &gt;=CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 00:00:00')
-          and w1.project_sn=#{projectSn}
+        where w1.alarm_time &gt;= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
+        and w1.project_sn = #{projectSn}
     </select>
     <select id="selectEnvironmentDevTodayAlarmCount" resultType="java.util.Map">
         SELECT COUNT(1)                                                                                   totalAlarm,
@@ -330,8 +354,8 @@
     <!--企业权限关联项目-->
     <select id="queryProjectTodayAlarmNum"
             resultType="com.zhgd.xmgl.modules.environment.entity.ProjectTodayAlarmNum">
-        SELECT IFNULL(SUM(IF(ea.type = 1, 1, 0)),0) today_pre_alarm_num,
-        IFNULL(SUM(IF(ea.type = 0, 1, 0)),0) today_alarm_num,
+        SELECT IFNULL(SUM(IF(ea.type = 1, 1, 0)), 0) today_pre_alarm_num,
+        IFNULL(SUM(IF(ea.type = 0, 1, 0)), 0) today_alarm_num,
         a.project_name
         FROM project a
         INNER JOIN company cp ON a.company_sn = cp.company_sn
@@ -341,20 +365,23 @@
         DATE_FORMAT(ea.alarm_time, "%Y%m%d") = DATE_FORMAT(NOW(), "%Y%m%d")
         <where>
             <if test="accountType == 2">
-                AND f.company_sn IN (SELECT cs.company_sn FROM company cs WHERE cs.headquarters_sn=(
-                SELECT cs.headquarters_sn FROM company cs
+                AND f.company_sn IN (SELECT cs.company_sn
+                FROM company cs
+                WHERE cs.headquarters_sn = (
+                SELECT cs.headquarters_sn
+                FROM company cs
                 inner join system_user su on su.sn = cs.company_sn
-                where su.user_id=#{userId}
-                ) )
+                where su.user_id = #{userId}
+                ))
             </if>
             <if test="accountType == 3">
-                AND f.company_sn = (SELECT su.sn from system_user su where su.user_id=#{userId})
+                AND f.company_sn = (SELECT su.sn from system_user su where su.user_id = #{userId})
             </if>
             <if test="accountType == 4">
-                AND b.company_sn = (SELECT su.sn from system_user su where su.user_id=#{userId})
+                AND b.company_sn = (SELECT su.sn from system_user su where su.user_id = #{userId})
             </if>
             <if test="accountType == 5">
-                AND cp.company_sn = (SELECT su.sn from system_user su where su.user_id=#{userId})
+                AND cp.company_sn = (SELECT su.sn from system_user su where su.user_id = #{userId})
             </if>
         </where>
         GROUP BY a.project_sn;
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
index 30f46250a..392a5ce8b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java
@@ -882,10 +882,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
 
     @Override
     public EnvironmentAlarmCountTotalVo selectEnvironmentAlarmCountTotal(Map<String, Object> map) {
-        map.put("companyType", "4");
-        Map<String, Object> rtMap = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
-        EnvironmentAlarmCountTotalVo vo = BeanUtil.toBeanIgnoreCase(rtMap, EnvironmentAlarmCountTotalVo.class, true);
-        return vo;
+        return environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
     }
 
     @Override
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java
index b50aba410..a8584c6ef 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentDevServiceImpl.java
@@ -8,6 +8,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
 import com.zhgd.xmgl.modules.bigdevice.entity.BigDeviceVideo;
 import com.zhgd.xmgl.modules.bigdevice.mapper.BigDeviceVideoMapper;
 import com.zhgd.xmgl.modules.environment.entity.*;
+import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentAlarmCountTotalVo;
 import com.zhgd.xmgl.modules.environment.entity.vo.EnvironmentDevAlaramCountListVo;
 import com.zhgd.xmgl.modules.environment.mapper.*;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService;
@@ -126,7 +127,7 @@ public class EnvironmentDevServiceImpl extends ServiceImpl<EnvironmentDevMapper,
         Map<String, Object> data = new HashMap<>();
         Map<String, Object> map = companyService.getCompanyType(param);
         List<Map<String, Object>> devList = environmentDevMapper.selectCompanyDevCountStatistics(map);
-        Map<String, Object> alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
+        EnvironmentAlarmCountTotalVo alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
         List<Map<String, Object>> alarmList = environmentAlarmMapper.selectCompanyEnvironmentAlarmList(map);
         data.put("devList", devList);
         data.put("alarmTotal", alarmTotal);
@@ -181,7 +182,7 @@ public class EnvironmentDevServiceImpl extends ServiceImpl<EnvironmentDevMapper,
         //统计扬尘设备
         Map<String, Object> environmentDevCount = environmentDevMapper.selectEnvironmentDevCount(map);
         param.put("selectType", "1");
-        Map<String, Object> alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
+        EnvironmentAlarmCountTotalVo alarmTotal = environmentAlarmMapper.selectEnvironmentAlarmCountTotal(map);
         data.put("devTotal", environmentDevCount);
         data.put("alarmTotal", alarmTotal);
         return data;