Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/constants/TerminalConstant.java

+package com.yeejoin.amos.boot.biz.common.constants;
+
+/**
+ * @Author: xl
+ * @Description: 终端标识
+ * @Date: 2021/11/17 11:40
+ */
+public class TerminalConstant {
+    public final static String APP = "APP";
+    public final static String WEB = "WEB";
+    public final static String APP_WEB = "APP/WEB";
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -349,4 +349,29 @@ public class DataDictionaryController extends BaseController {
 		return ResponseHelper.buildResponse(type);
 	}
 
+
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/gwmcDataDictionaryNotoken/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典不验证token", notes = "根据字典类型查询字典不验证token")
+	public ResponseModel<Object> gwmcDataDictionaryNotoken(@PathVariable String type) throws Exception {
+		// 数据字典生成树方法 原先通过getCode做主键 现修改为 getSequenceNbr 后期数据字典parent字段保存id 而不要保存code by
+		// kongfm 2021-09-08
+		// 数据字典还原 by kongfm 2021-09-09
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<Menu> menus = TreeParser.getTree(null, list, DataDictionary.class.getName(), "getCode", 0, "getName",
+					"getParent", null);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
+
+
 }

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/enums/RuleTypeEnum.java

+package com.yeejoin.amos.boot.biz.common.enums;
+
+import com.yeejoin.amos.boot.biz.common.constants.TerminalConstant;
+
+/**
+ * 规则请求枚举
+ * @author xl
+ *
+ */
+public enum RuleTypeEnum {
+
+	// 防火监督
+	计划提交("计划提交", "addPlan","auditPage", TerminalConstant.WEB),
+	计划审核("计划审核", "planAudit", "auditPage", TerminalConstant.APP_WEB),
+	计划审核完成("计划审核完成", "planAuditAll", "formulatePage", TerminalConstant.APP_WEB),
+	计划生成("计划生成", "addPlanTask", null, TerminalConstant.APP),
+	计划完成("计划完成", "planCompleted", null, TerminalConstant.APP_WEB),
+
+	// 隐患
+	隐患第一次提交("隐患提交", "addLatentDanger", null, null),
+	隐患审核("隐患审核", "dangerAudit", null, null);
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+	/**
+	 * 编码
+	 */
+	private String code;
+	/**
+	 * 跳转地址
+	 */
+	private String url;
+	/**
+	 * 终端标识
+	 */
+	private String terminal;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getTerminal() {
+		return terminal;
+	}
+
+	public void setTerminal(String terminal) {
+		this.terminal = terminal;
+	}
+
+	RuleTypeEnum(String name, String code, String url, String terminal) {
+		this.name = name;
+		this.code = code;
+		this.url = url;
+		this.terminal = terminal;
+	}
+
+	public static RuleTypeEnum getEnumByCode(String field){
+		for (RuleTypeEnum constants : values()) {
+			if (constants.getCode().equals(field)) {
+				return constants;
+			}
+		}
+		return null;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/rule/action/MessageAction.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/rule/action/MessageAction.java

-package com.yeejoin.amos.supervision.rule.action;
+package com.yeejoin.amos.boot.biz.common.rule.action;//package com.yeejoin.amos.latentdanger.business.rule.action;
 
 import com.alibaba.fastjson.JSON;
-import com.yeejoin.amos.component.rule.RuleActionBean;
-import com.yeejoin.amos.component.rule.RuleMethod;
+import com.yeejoin.amos.boot.biz.common.utils.RuleUtils;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
-import com.yeejoin.amos.supervision.business.util.MsgParamUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -17,16 +15,14 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
  * @Date: 2021/11/10 11:49
  */
 @Component
-@RuleActionBean(beanLabel = "消息发送")
 public class MessageAction {
 
     public static final Logger log = LoggerFactory.getLogger(MessageAction.class);
 
-    @RuleMethod(methodLabel = "消息发送", project = "消息")
     public void sendMessage(Object msgObj, String title, String content) {
         MessageModel messageModel = JSON.parseObject(JSON.toJSONString(msgObj), MessageModel.class);
         messageModel.setTitle(title);
-        messageModel.setBody(MsgParamUtils.instedParams(content, msgObj));
+        messageModel.setBody(RuleUtils.instedParams(content, msgObj));
         if (!ValidationUtil.isEmpty(messageModel)) {
             try {
                 Systemctl.messageClient.create(messageModel);

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java

@@ -821,6 +821,13 @@ public class DateUtils {
         return getDate(calendar.getTime());
     }
 
+    public static Date getBeginDateOfMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+        return calendar.getTime();
+    }
+
     /**
      * 将秒数转换为时分秒格式
      *

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -39,6 +39,9 @@ public class RedisKey {
 
     /**联通CTIuser token */
     public static final String CTI_USER_TOKEN = "cti_user_token";
+
+    /** 企业用户注册前缀 */
+    public static final String FLC_USER_TEL = "flc_tel_";
     
     /** 驼峰转下划线(简单写法，效率低于 ) */
 	public static String humpToLine(String str) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RuleUtils.java

+package com.yeejoin.amos.boot.biz.common.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.Map;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2021/11/12 18:37
+ */
+public class RuleUtils {
+
+    public static String instedParams(String content, Object msgObj) {
+        Map<String, Object> strengthMap = JSON.parseObject(JSON.toJSONString(msgObj, SerializerFeature.WriteMapNullValue), Map.class);
+        for (String key : strengthMap.keySet())
+            content = content.replaceAll("\\$\\{" + key + "}", String.valueOf(ValidationUtil.isEmpty(strengthMap.get(key)) ? "" : strengthMap.get(key)));
+        return content;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireBuildingDto.java

@@ -60,6 +60,9 @@ public class FireBuildingDto extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String lat;
 
+    @ApiModelProperty(value = "位置")
+    private String position;
+
     @ApiModelProperty(value = "子节点")
     private List<FireBuildingDto> children;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentAlarmDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentSignalDto.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -14,84 +15,66 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="FireEquipmentAlarmDto", description="设备报警信息表")
-public class FireEquipmentAlarmDto  extends BaseDto {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "站点名称")
- private String stationName;
-
- @ApiModelProperty(value = "站点编码")
- private String stationCode;
-
- private String fireEquipmentName;
-
- @ApiModelProperty(value = "消防设备id")
- private String fireEquipmentMrid;
-
- @ApiModelProperty(value = "设备编码")
- private String iotCode;
+@ApiModel(value = "FireEquipmentSignalDto", description = "设备报警信息表")
+public class FireEquipmentSignalDto extends BaseDto {
 
- @ApiModelProperty(value = "指标名称")
- private String fireEquipmentIndexName;
+    private static final long serialVersionUID = 1L;
 
- @ApiModelProperty(value = "指标编码")
- private String fireEquipmentIndexKey;
+    @ApiModelProperty(value = "站点名称")
+    private String stationName;
 
- @ApiModelProperty(value = "报警值")
- private String fireEquipmentIndexValue;
+    @ApiModelProperty(value = "站点编码")
+    private String stationCode;
 
- @ApiModelProperty(value = "发生频次")
- private Integer frequency;
+    private String fireEquipmentName;
 
- @ApiModelProperty(value = "报警状态：1报警0恢复")
- private Boolean status;
+    @ApiModelProperty(value = "消防设备id")
+    private String fireEquipmentMrid;
 
- @ApiModelProperty(value = "报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）")
- private String type;
+    @ApiModelProperty(value = "设备编码")
+    private String iotCode;
 
+    @ApiModelProperty(value = "指标名称")
+    private String fireEquipmentIndexName;
 
- @ApiModelProperty(value = "更新时间")
- private Date updateDate;
+    @ApiModelProperty(value = "指标编码")
+    private String fireEquipmentIndexKey;
 
- @ApiModelProperty(value = "告警恢复时间")
- private Date recoveryDate;
+    @ApiModelProperty(value = "报警值")
+    private String fireEquipmentIndexValue;
 
- @ApiModelProperty(value = "确认类型")
- private String confirmType;
+    @ApiModelProperty(value = "发生频次")
+    private Integer frequency;
 
- @ApiModelProperty(value = "报警原因")
- private String alamReason;
+    @ApiModelProperty(value = "报警状态：1报警0恢复")
+    private Boolean status;
 
- @ApiModelProperty(value = "处理情况")
- private String resolveResult;
+    @ApiModelProperty(value = "报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）")
+    private String type;
 
- @ApiModelProperty(value = "确警人员")
- private String confirmUser;
 
- @ApiModelProperty(value = "确警人员姓名")
- private String confirmUserName;
+    @ApiModelProperty(value = "更新时间")
+    private Date updateDate;
 
- @ApiModelProperty(value = "确警时间")
- private Date confirmDate;
+    @ApiModelProperty(value = "告警恢复时间")
+    private Date recoveryDate;
 
- @ApiModelProperty(value = "装备所属消防系统code")
- private String systemMrids;
+    @ApiModelProperty(value = "装备所属消防系统code")
+    private String systemMrids;
 
- @ApiModelProperty(value = "装备定义code（冗余字段）")
- private String equipmentDefinitionMrid;
+    @ApiModelProperty(value = "装备定义code（冗余字段）")
+    private String equipmentDefinitionMrid;
 
- @ApiModelProperty(value = "装备定义名称")
- private String equipmentDefinitionName;
+    @ApiModelProperty(value = "装备定义名称")
+    private String equipmentDefinitionName;
 
- @ApiModelProperty(value = "设备位置")
- private String location;
+    @ApiModelProperty(value = "设备位置")
+    private String location;
 
- @ApiModelProperty(value = "经度")
- private String lng;
+    @ApiModelProperty(value = "经度")
+    private String lng;
 
- @ApiModelProperty(value = "纬度")
- private String lat;
+    @ApiModelProperty(value = "纬度")
+    private String lat;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentAlarmLogDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireEquipmentSignalLogDto.java

@@ -15,8 +15,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value = "FireEquipmentAlarmLogDto", description = "设备报警信息日志表")
-public class FireEquipmentAlarmLogDto extends BaseDto {
+@ApiModel(value = "FireEquipmentSignalLogDto", description = "设备报警信息日志表")
+public class FireEquipmentSignalLogDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
@@ -45,10 +45,10 @@ public class FireEquipmentAlarmLogDto extends BaseDto {
     private String fireBuildingMrid;
 
     @ApiModelProperty(value = "报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）")
-    private String alarmType;
+    private String signalType;
 
     @ApiModelProperty(value = "报警类型名称")
-    private String alarmTypeName;
+    private String signalTypeName;
 
     @ApiModelProperty(value = "确认状态：0-未确认 1-已确认")
     private String confirmState;
@@ -94,4 +94,10 @@ public class FireEquipmentAlarmLogDto extends BaseDto {
 
     @ApiModelProperty(value = "换流站纬度")
     private String stationLat;
+
+    @ApiModelProperty(value = "告警日期（冗余查询，为create_date的日期部分,如：2021-11-15")
+    private String signalReportDate;
+
+    @ApiModelProperty(value = "是否为告警信号数据")
+    private Boolean isAlarm;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireAlarmDayStatisticsDto.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireSignalDayStatisticsDto.java

@@ -16,7 +16,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value = "FireAlarmDayStatisticsDto", description = "换流站告警日统计")
-public class FireAlarmDayStatisticsDto extends BaseDto {
+public class FireSignalDayStatisticsDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
@@ -30,19 +30,17 @@ public class FireAlarmDayStatisticsDto extends BaseDto {
     @ApiModelProperty(value = "统计日期")
     private Date collectDate;
 
-    @ApiModelProperty(value = "装备定义mrid")
-    private String equipmentDefinitionMrid;
+    @ApiModelProperty(value = "上报次数")
+    private Integer reportTimes;
 
-    @ApiModelProperty(value = "装备定义名称")
-    private String equipmentDefinitionName;
+    @ApiModelProperty(value = "信号类型")
+    private String signalType;
 
-    @ApiModelProperty(value = "报警次数")
-    private Integer alarmTimes;
+    @ApiModelProperty(value = "信号类型名称")
+    private String signalTypeName;
 
-    @ApiModelProperty(value = "告警类型")
-    private String alarmType;
+    @ApiModelProperty(value = "是否为告警信号数据")
+    private Boolean isAlarm;
 
-    @ApiModelProperty(value = "告警类型名称")
-    private String alarmTypeName;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireWaterDto.java

@@ -54,4 +54,7 @@ public class FireWaterDto extends BaseDto {
     @ApiModelProperty(value = "纬度")
     private String lat;
 
+    @ApiModelProperty(value = "安装位置")
+    private String position;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireBuilding.java

@@ -97,4 +97,9 @@ public class FireBuilding extends BaseEntity {
     @TableField("lat")
     private String lat;
 
+    /**
+     * 详情位置
+     */
+    private String position;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireEquipmentAlarm.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireEquipmentSignal.java

@@ -17,8 +17,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("asf_fire_equipment_alarm")
-public class FireEquipmentAlarm extends BaseEntity {
+@TableName("asf_fire_equipment_signal")
+public class FireEquipmentSignal extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -101,42 +101,6 @@ public class FireEquipmentAlarm extends BaseEntity {
     private Date recoveryDate;
 
     /**
-     * 确认类型
-     */
-    @TableField("confirm_type")
-    private String confirmType;
-
-    /**
-     * 报警原因
-     */
-    @TableField("alam_reason")
-    private String alamReason;
-
-    /**
-     * 处理情况
-     */
-    @TableField("resolve_result")
-    private String resolveResult;
-
-    /**
-     * 确警人员
-     */
-    @TableField("confirm_user")
-    private String confirmUser;
-
-    /**
-     * 确警人员姓名
-     */
-    @TableField("confirm_user_name")
-    private String confirmUserName;
-
-    /**
-     * 确警时间
-     */
-    @TableField("confirm_date")
-    private Date confirmDate;
-
-    /**
      * 装备所属消防系统code
      */
     @TableField("system_mrids")

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireEquipmentAlarmLog.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireEquipmentSignalLog.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.ccs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,8 +17,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("asf_fire_equipment_alarm_log")
-public class FireEquipmentAlarmLog extends BaseEntity {
+@TableName("asf_fire_equipment_signal_log")
+public class FireEquipmentSignalLog extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -72,15 +71,15 @@ public class FireEquipmentAlarmLog extends BaseEntity {
     private String fireBuildingMrid;
 
     /**
-     * 报警类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）
+     * 信号类型:alarm_type_fire（火灾报警）/alarm_type_trouble（故障告警）
      */
-    @TableField("alarm_type")
-    private String alarmType;
+    @TableField("signal_type")
+    private String signalType;
 
     /**
-     * 报警类型名称
+     * 信号类型名称
      */
-    private String alarmTypeName;
+    private String signalTypeName;
 
     /**
      * 确认状态：0-未确认 1-已确认
@@ -160,4 +159,14 @@ public class FireEquipmentAlarmLog extends BaseEntity {
     @TableField("lat")
     private String lat;
 
+    /**
+     * 告警日期（冗余查询，为create_date的日期部分,如：2021-11-15）
+     */
+    private String signalReportDate;
+
+    /**
+     * 是否为告警信号数据
+     */
+    private Boolean isAlarm;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireAlarmDayStatistics.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireSignalDayStatistics.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import java.util.Date;
 
 /**
- * 换流站告警日统计
+ * 设备信号类型上报次数日统计
  *
  * @author system_generator
  * @date 2021-11-09
@@ -17,8 +17,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("asf_fire_alarm_day_statistics")
-public class FireAlarmDayStatistics extends BaseEntity {
+@TableName("asf_fire_signal_day_statistics")
+public class FireSignalDayStatistics extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -41,33 +41,27 @@ public class FireAlarmDayStatistics extends BaseEntity {
     private Date collectDate;
 
     /**
-     * 装备定义mrid
+     * 报警次数
      */
-    @TableField("equipment_definition_mrid")
-    private String equipmentDefinitionMrid;
+    @TableField("report_times")
+    private Integer reportTimes;
 
     /**
-     * 装备定义名称
+     * 信号类型
      */
-    @TableField("equipment_definition_name")
-    private String equipmentDefinitionName;
+    @TableField("signal_type")
+    private String signalType;
 
     /**
-     * 报警次数
+     * 信号类型名称
      */
-    @TableField("alarm_times")
-    private Integer alarmTimes;
+    @TableField("signal_type_name")
+    private String signalTypeName;
 
     /**
-     * 告警类型
+     * 是否为告警信号数据
      */
-    @TableField("alarm_type")
-    private String alarmType;
+    private Boolean isAlarm;
 
-    /**
-     * 告警类型名称
-     */
-    @TableField("alarm_type_name")
-    private String alarmTypeName;
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireWater.java

@@ -92,4 +92,9 @@ public class FireWater extends BaseEntity {
     @TableField("lat")
     private String lat;
 
+    /**
+     * 安装位置
+     */
+    @TableField("position")
+    private String position;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/enums/SignalTypeOfAlarm.java

+package com.yeejoin.amos.boot.module.ccs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import javax.ws.rs.GET;
+
+/**
+ * @author DELL
+ */
+@AllArgsConstructor
+@Getter
+public enum SignalTypeOfAlarm {
+    /**
+     * 特殊统计信号类型枚举
+     */
+    FAULT_ALARM("faultAlarm","故障告警"),
+    FIRE_ALARM("fireAlarm","火灾告警"),
+    SHIELD_ALARM("shieldAlarm","屏蔽"),
+    OIL_LEAK_ALARM("oilLeakAlarm","漏油"),
+    ALARM("alarm","告警");
+
+    private String code;
+    private String name;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireEquipmentAlarmLogMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireEquipmentSignalLogMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmLogDto;
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentAlarmLog;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalLogDto;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentSignalLog;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,7 +15,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2021-11-09
  */
-public interface FireEquipmentAlarmLogMapper extends BaseMapper<FireEquipmentAlarmLog> {
+public interface FireEquipmentSignalLogMapper extends BaseMapper<FireEquipmentSignalLog> {
 
     /**
      * 告警日志
@@ -22,5 +23,13 @@ public interface FireEquipmentAlarmLogMapper extends BaseMapper<FireEquipmentAla
      * @param params 查询参数
      * @return List<FireEquipmentAlarmLogDto>
      */
-    List<FireEquipmentAlarmLogDto> queryAlarmLogList(Map<String, Object> params);
+    List<FireEquipmentSignalLogDto> queryAlarmLogList(Map<String, Object> params);
+
+    /**
+     * 查询指定日期的告警设备（去重）
+     * @param stationCode 换流站编号
+     * @param alarmDate 告警日期
+     * @return List<FireEquipmentDto>
+     */
+    List<FireEquipmentDto> distinctByEquipmentId(@Param("stationCode") String stationCode, @Param("alarmDate") String alarmDate);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireEquipmentAlarmMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireEquipmentSignalMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentAlarm;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentSignal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备报警信息表 Mapper 接口
@@ -9,6 +14,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2021-11-09
  */
-public interface FireEquipmentAlarmMapper extends BaseMapper<FireEquipmentAlarm> {
+public interface FireEquipmentSignalMapper extends BaseMapper<FireEquipmentSignal> {
 
+    /**
+     * 装备定义告警数量统计
+     * @param top 限制条数
+     * @param date 日期
+     * @return List<Map<String, Object>>
+     */
+    List<Map<String, Object>> faultEquipTopCount(@Param("top") Long top, @Param("currentDate") Date date);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireRiskSourceMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRiskSource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 风险点表 Mapper 接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireRiskSourceMapper extends BaseMapper<FireRiskSource> {
 
+    List<FireRiskSourceDto> queryForRpnDescList(@Param("stationCode") String stationCode, @Param("top") String top);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireRpnChangeLogMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 风险点变化流水 Mapper 接口
@@ -11,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FireRpnChangeLogMapper extends BaseMapper<FireRpnChangeLog> {
 
+    Map<String, Object> queryForRiseUp(@Param("stationCode") String stationCode, @Param("type") String type);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireAlarmDayStatisticsMapper.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireSignalDayStatisticsMapper.java

 package com.yeejoin.amos.boot.module.ccs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireAlarmDayStatistics;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireSignalDayStatistics;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,7 +12,7 @@ import java.util.List;
  * @author system_generator
  * @date 2021-11-09
  */
-public interface FireAlarmDayStatisticsMapper extends BaseMapper<FireAlarmDayStatistics> {
+public interface FireSignalDayStatisticsMapper extends BaseMapper<FireSignalDayStatistics> {
 
     /**
      * 告警次数-折线图使用
@@ -22,5 +22,5 @@ public interface FireAlarmDayStatisticsMapper extends BaseMapper<FireAlarmDaySta
      * @param endDate     结束日期
      * @return List<String>
      */
-    List<String> queryAlarmTimesTrend(@Param("stationCode") String stationCode, @Param("beginDate") String beginDate, @Param("endDate") String endDate);
+    List<String> queryAlarmTimesTrend(@Param("stationCode") String stationCode, @Param("beginDate") String beginDate, @Param("endDate") String endDate,@Param("signalType") String signalType);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireStationInfoMapper.java

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.ccs.api.mapper;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireStationInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 站端信息表 Mapper 接口
@@ -20,4 +22,14 @@ public interface FireStationInfoMapper extends BaseMapper<FireStationInfo> {
      * @param orderBy
      */
     List<FireStationInfoDto> queryStationListWithStatistics(String orderBy);
+
+    /**
+     * 换流站装备信息
+     * @param stationCode
+     * @param stationName
+     * @return
+     */
+    List<Map<String, Object>> queryStationEquipInfo(@Param("stationCode") String stationCode, @Param("stationName") String stationName);
+
+    List<Map<String, Object>> lastYearAlarmCount();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireEquipmentAlarmLogService.java

-package com.yeejoin.amos.boot.module.ccs.api.service;
-
-
-/**
- * 设备报警信息日志表接口类
- *
- * @author system_generator
- * @date 2021-11-09
- */
-public interface IFireEquipmentAlarmLogService {
-
-}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireEquipmentService.java

 package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 消防设备资产接口类
  *
@@ -9,4 +13,28 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  */
 public interface IFireEquipmentService {
 
+    /**
+     * 物联接入汇总
+     *
+     * @param stationCode 换流站编号
+     * @return Map<String, Object>
+     */
+    Map<String, Object> selectForMonitorCount(String stationCode) throws ParseException;
+
+    /**
+     * 站端物联设备
+     *
+     * @param stationCode 换流站code
+     * @param stationName
+     * @return List<FireStationInfoDto>
+     */
+    List<Map<String, Object>> stationEquipmentInfo(String stationCode, String stationName);
+
+    /**
+     * 故障设备汇总
+     *
+     * @param top 上限数量
+     * @return List<Map < String, Object>>
+     */
+    List<Map<String, Object>> faultEquipTopCount(Long top);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireAlarmDayStatisticsService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireEquipmentSignalLogService.java

@@ -2,11 +2,11 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
 /**
- * 换流站告警日统计接口类
+ * 设备信号信息日志表类
  *
  * @author system_generator
  * @date 2021-11-09
  */
-public interface IFireAlarmDayStatisticsService {
+public interface IFireEquipmentSignalLogService {
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireEquipmentAlarmService.java → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireEquipmentSignalService.java

@@ -7,6 +7,6 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  * @author system_generator
  * @date 2021-11-09
  */
-public interface IFireEquipmentAlarmService {
+public interface IFireEquipmentSignalService {
 
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireRpnChangeLogService.java

 package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
+import java.util.Map;
+
 /**
  * 风险点变化流水接口类
  *
@@ -9,4 +11,5 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  */
 public interface IFireRpnChangeLogService {
 
+    Map<String,Object> queryForRiseUp(String stationCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireSignalDayStatisticsService.java

+package com.yeejoin.amos.boot.module.ccs.api.service;
+
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * 换流站告警日统计接口类
+ *
+ * @author system_generator
+ * @date 2021-11-09
+ */
+public interface IFireSignalDayStatisticsService {
+
+    /**
+     * 警情信息
+     *
+     * @return Map<String, Object>
+     */
+    Map<String, Object> selectForAlarmCount() throws ParseException;
+
+    /**
+     * 警情变化趋势
+     *
+     * @param beginData 开始日期
+     * @param endData   接受日期
+     * @return Map<String, Object>
+     */
+    Map<String, Object> selectForAlarmTrend(String beginData, String endData);
+
+    /**
+     * 警情类型占比
+     * @param beginData 开始日期
+     * @param endData 结束日期
+     * @return Map<String, Object>
+     */
+    Map<String, Object> todayAlarmPercent(String beginData, String endData);
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IFireStationInfoService.java

 package com.yeejoin.amos.boot.module.ccs.api.service;
 
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
+
 /**
  * 站端信息表接口类
  *
@@ -9,4 +11,10 @@ package com.yeejoin.amos.boot.module.ccs.api.service;
  */
 public interface IFireStationInfoService {
 
+    /**
+     * 详情
+     * @param stationCode
+     * @return
+     */
+    FireStationInfoDto getOneByCode(String stationCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/service/IStatisticsService.java

@@ -23,4 +23,10 @@ public interface IStatisticsService {
      * @return Map<String, Object>
      */
     Map<String, Object> alarmAndDangerTrend(String stationCode, String beginDate, String endDate);
+
+    /**
+     * 近一年警情统计
+     * @return List<Map<String, Object>>
+     */
+    List<Map<String, Object>> lastYearAlarmCount();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentAlarmMapper.xml

-<?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.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentAlarmMapper">
-
-</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentAlarmLogMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalLogMapper.xml

 <?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.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentAlarmLogMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalLogMapper">
 
     <select id="queryAlarmLogList"
-            resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmLogDto">
+            resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalLogDto">
         select
             a.id,
             a.fire_equipment_name,
             a.fire_equipment_index_name,
-            a.alarm_type,
-            a.alarm_type_name,
+            a.signal_type,
+            a.signal_type_name,
             a.create_date,
             s.name as station_name,
             a.station_code,
@@ -27,7 +27,7 @@
             s.lat as stationLat,
             s.lng as stationLng
         from
-            asf_fire_equipment_alarm_log a,
+            asf_fire_equipment_signal_log a,
             asf_fire_station_info s
         where
         a.station_code = s.code
@@ -49,4 +49,15 @@
          limit ${top}
         </if>
     </select>
+    <select id="distinctByEquipmentId" resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto">
+        SELECT
+            distinct(ai.fire_equipment_mrid) as mrid
+        FROM `asf_fire_equipment_signal_log` ai
+        where
+        ai.signal_report_date =#{alarmDate}
+        and ai.is_alarm = true
+        <if test="stationCode != null and stationCode != ''">
+            and ai.station_code =#{stationCode}
+        </if>
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireEquipmentSignalMapper.xml

+<?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.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalMapper">
+
+    <select id="faultEquipTopCount" resultType="java.util.Map">
+        SELECT
+            count(DISTINCT(a.fire_equipment_mrid)) as total,
+            a.equipment_definition_name as name
+        FROM
+            `asf_fire_equipment_signal_log` a
+         where
+            year(a.signal_report_date) = YEAR(#{currentDate})
+            and a.signal_type = 'faultAlarm'
+            group by a.equipment_definition_name
+            ORDER BY total desc
+            <if test="top != null and top != ''">
+                limit #{top}
+            </if>
+    </select>
+</mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRiskSourceMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireRiskSourceMapper">
 
+    <select id="queryForRpnDescList" resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto">
+        SELECT
+            rs.mrid,
+            rs.`name`,
+            rs.parent_mrid,
+            IFNULL(rs.rpn, 0) rpn,
+            IFNULL(rs.rpni, 0) rpni
+        FROM `asf_fire_risk_source` rs
+        where
+        rs.parent_mrid > 0
+        and rs.station_code = #{stationCode}
+        <if test="top != null and top !=''">
+            limit ${top}
+        </if>
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireRpnChangeLogMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireRpnChangeLogMapper">
 
+    <select id="queryForRiseUp" resultType="java.util.Map">
+      select
+		d.countOfType0,
+		d.countOfSource,
+		CONCAT(ROUND(IFNULL(d.countOfType0/d.countOfSource,0)*100,2),'%')type0Rate
+		 from
+		(SELECT
+			count(DISTINCT cl.risk_point_mrid) countOfType0,
+			(select count(1) from asf_fire_risk_source rs where rs.station_code=cl.station_code ) countOfSource
+		FROM
+			asf_fire_rpn_change_log cl
+		WHERE
+			cl.level_change_type = 0
+			and cl.station_code = #{stationCode}
+			<choose>
+                <when test="type = '1'">
+                    and DATE_FORMAT( cl.create_date, '%Y%m' ) = DATE_FORMAT(CURDATE() , '%Y%m')
+                </when>
+                <when test="type = '2'">
+                    and QUARTER(cl.create_date)=QUARTER(now());
+                </when>
+                <when test="type = '3'">
+                    and year(cl.create_date)=year(now())
+                </when>
+            </choose>
+		)d
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireAlarmDayStatisticsMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireSignalDayStatisticsMapper.xml

 <?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.yeejoin.amos.boot.module.ccs.api.mapper.FireAlarmDayStatisticsMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.ccs.api.mapper.FireSignalDayStatisticsMapper">
 
     <select id="queryAlarmTimesTrend" resultType="java.lang.String">
         select
         (SELECT
-        IFNULL(sum(s.alarm_times),0)
-        FROM `asf_fire_alarm_day_statistics` s
+        IFNULL(sum(s.report_times),0)
+        FROM `asf_fire_signal_day_statistics` s
         <where>
             <if test="stationCode != null and stationCode != ''">
-                s.station_code = #{stationCode}
+                and s.station_code = #{stationCode}
             </if>
-            s.collect_date = t.date
+            <if test="signalType != null and signalType != ''">
+                and s.signal_type = #{signalType}
+            </if>
+            and s.collect_date = t.date
+            and s.is_alarm = true
         </where>
         ) as times
         from

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireStationInfoMapper.xml

@@ -5,9 +5,11 @@
     <select id="queryStationListWithStatistics"
             resultType="com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto">
         SELECT
-         i.*,
-        IFNULL((SELECT sum(s.alarm_times) from asf_fire_alarm_day_statistics s where s.collect_date = CURRENT_DATE and s.station_code = i.`code`),0) as todayAlarmTimes,
-        IFNULL((SELECT count(1) from asf_fire_latent_danger d where d.deal_state = 1 and d.station_code = i.`code`),0) as existDangerNumber
+        i.*,
+        IFNULL((SELECT sum(s.report_times) from asf_fire_signal_day_statistics s where s.collect_date = CURRENT_DATE and
+        s.station_code = i.`code`),0) as todayAlarmTimes,
+        IFNULL((SELECT count(1) from asf_fire_latent_danger d where d.deal_state = 1 and d.station_code = i.`code`),0)
+        as existDangerNumber
         FROM
         `asf_fire_station_info` i
         where i.status = false
@@ -15,4 +17,43 @@
             ${orderBy}
         </if>
     </select>
+    <select id="queryStationEquipInfo"
+            resultType="java.util.Map">
+        SELECT
+        si.id,
+        si.code,
+        si.`name`,
+        (select count(1) from ast_fire_equipment e where e.station_code = si.code and e.is_iot = true) as
+        iotEquipmentNumber,
+        (select count(DISTINCT(1)) from asf_fire_equipment_signal_log l where l.station_code = si.code and
+        l.signal_report_date =CURRENT_DATE and l.is_alarm = true) as todayAlarmEquipmentNumber
+        FROM `asf_fire_station_info` si
+        <where>
+            <if test="stationCode != null and stationCode != ''">
+                si.code = #{stationCode}
+            </if>
+            <if test="stationName != null and stationName != ''">
+                si.name like concat('%', #{stationName},'%')
+            </if>
+        </where>
+        order by iotEquipmentNumber desc
+    </select>
+    <select id="lastYearAlarmCount" resultType="java.util.Map">
+        SELECT
+            s.code,
+            s.name,
+        (select
+        count(DISTINCT(l.fire_equipment_mrid))
+        from asf_fire_equipment_signal_log l
+        where l.is_alarm =true and
+        l.signal_report_date >= DATE_sub(CURDATE(),INTERVAL 1 year)
+        and l.signal_report_date <![CDATA[ <= ]]> CURDATE() and l.station_code = s.code) as alarmEquipNumber,
+        ifnull((SELECT sum(ds.report_times) from asf_fire_signal_day_statistics ds
+        where ds.is_alarm =true and
+        ds.collect_date >= DATE_sub(CURDATE(),INTERVAL 1 year)
+        and ds.collect_date <![CDATA[ <= ]]> CURDATE()
+        and ds.station_code = s.code),0) as alarmTimes
+        FROM
+        `asf_fire_station_info` s
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFireFightingDto.java

@@ -44,6 +44,12 @@ public class DutyFireFightingDto implements Serializable {
     
     @ApiModelProperty(value = "微型消防站Id")
     private String fireFightingId;
+
+    @ApiModelProperty(value = "值班区域")
+    private String dutyArea;
+
+    @ApiModelProperty(value = "值班区域Id")
+    private String dutyAreaId;
     
 }
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyFirstAidDto.java

@@ -10,37 +10,43 @@ import lombok.Data;
 @ApiModel(value = "DutyFirstAidDto", description = "120急救站值班")
 public class DutyFirstAidDto implements Serializable {
 	 private static final long serialVersionUID = 1L;
-		
+
 	    @ApiModelProperty(value = "用户id")
 	    private String userId;
-		
+
 	    @ApiModelProperty(value = "用户名称")
 	    private String userName;
-	    
+
 	    @ApiModelProperty(value = "单位ID")
 	    private String teamId;
-	   
+
 	    @ApiModelProperty(value = "单位名称")
 	    private String teamName;
-	    
+
 	    @ApiModelProperty(value = "岗位id")
 	    private String postType;
-	    
+
 	    @ApiModelProperty(value = "岗位名称")
 	    private String postTypeName;
-	    
+
 	    @ApiModelProperty(value = "值班信息")
 	    private List<DutyPersonShiftDto> dutyShift;
-	    
+
 	    @ApiModelProperty(value = "值班开始时间")
 	    private String startTime;
-	    
+
 	    @ApiModelProperty(value = "值班结束时间")
 	    private String endTime;
-	    
+
 	    @ApiModelProperty(value = "120急救站")
 	    private String firstAid;
-	    
+
 	    @ApiModelProperty(value = "120急救站Id")
 	    private String firstAidId;
+
+	    @ApiModelProperty(value = "值班区域")
+        private String dutyArea;
+
+	    @ApiModelProperty(value = "值班区域Id")
+        private String dutyAreaId;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrFormDto.java

@@ -83,8 +83,14 @@ public class OrgUsrFormDto implements Serializable {
 	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
 		  if(dynamicFormAlert!=null) {
 			  dynamicFormAlert.forEach(formValue->{
-				    
-					this.map.put(formValue.getKey(), formValue.getValue());
+				    if("select".equals(formValue.getType())){
+                        this.map.put(formValue.getKey(), formValue.getValueName());
+
+                    }else{
+                        this.map.put(formValue.getKey(), formValue.getValue());
+
+                    }
+
 				});
 		  }
 		

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DutyPersonShiftMapper.java

@@ -134,7 +134,7 @@ public interface DutyPersonShiftMapper extends BaseMapper<DutyPersonShift> {
     
     List<Map<String, Object>>   getFirstAidForTypeCodeAndCompanyId(long company);
 
-    List<Map<String, Object>> queryByCompanyId();
+    List<Map<String, Object>> queryByCompanyId(@Param(value="bizNames") List<String> bizNames);
 
     List<Map<String, Object>>  queryByCompanyNew(String bizOrgName);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -92,5 +92,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<Map<String, Long>> countDeptByCompanyId(@Param("companyIdList") List<String> companyIdList);
 
-    List<Map<String,Object>> queryCompanyId(String bizOrgName);
+    List<Map<String,Object>> queryCompanyId(String bizOrgName,@Param("codes")List<String> codes);
+
+    List<Map<String,Object>> queryCompanyIdNew(String bizOrgName);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDutyPersonService.java

@@ -34,7 +34,7 @@ public interface IDutyPersonService extends IDutyCommonService {
      */
     List<DutyPersonDto> findByDutyAreaId(Long dutyAreaId);
 
-    List<Map<String, Object>> queryByCompanyId();
+    List<Map<String, Object>> queryByCompanyId(List<String> bizNames);
 
     List<Map<String, Object>> queryByCompanyNew(String bizOrgName);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DutyPersonShiftMapper.xml

@@ -358,8 +358,11 @@ AND cft.type_code = (
 			where i.field_code  = 'userId' and i.field_value  is not null) c
 			on cb.instance_id  = c.id3
 			where to_days(cb.duty_date) = to_days(now()) and
-			a.deptId in ( select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援保障部' or
-biz_org_name = '综合办公室' or biz_org_name  = '消防支队' or biz_org_name  = '应急指挥科' )) r )
+			a.deptId in ( select sequence_nbr from cb_org_usr cou where biz_org_name in
+			<foreach item="item" index="index"  collection="bizNames" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		)) r )
     </select>
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -133,6 +133,9 @@
         Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
+        <if test='par.typeCode==null'>
+            and  a.type_code in (116,830)
+        </if>
         <if test='par.typeCode!=null and par.typeCode!=""'>
             and  a.type_code in (#{par.typeCode})
         </if>
@@ -147,7 +150,9 @@
         COUNT(a.sequence_nbr) num
         FROM cb_fire_team a
         where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null
-
+        <if test='par.typeCode==null'>
+            and  a.type_code in (116,830)
+        </if>
         <if test='par.typeCode!=null and par.typeCode!=""'>
             and  a.type_code in (#{par.typeCode})
         </if>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -181,7 +181,7 @@
         cb_firefighters  firefighters
         WHERE
         fire_team_id in ( select sequence_nbr from cb_fire_team cft  where company in (
-        select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援部') )
+        select sequence_nbr from cb_org_usr cou where biz_org_name = '消防救援保障部') )
         <if test="gw != null">
             And job_title_code In
             <foreach item="item" collection="gw" index="index" open="(" separator="," close=")">

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -691,12 +691,30 @@ LEFT JOIN (
         select cou.biz_org_name bizOrgName,cou.sequence_nbr sequenceNbr ,cou .parent_id parentId,
         a.fireManagementPostCode, b.telephone from cb_org_usr cou
         left join (select i.instance_id id1 ,if(i.field_code = 'fireManagementPostCode',
-        i.field_value_label, null) as 'fireManagementPostCode' from cb_dynamic_form_instance i where i.field_code  = 'fireManagementPostCode'
+        i.field_value, null) as 'fireManagementPostCode' from cb_dynamic_form_instance i where i.field_code  = 'fireManagementPostCode'
         and i.field_value_label  is not null) a on cou .sequence_nbr = a.id1
         left join (select i.instance_id id2,if(i.field_code = 'telephone',
         i.field_value, null) as 'telephone' from cb_dynamic_form_instance i where i.field_code  = 'telephone'
         and i.field_value  is not null) b on cou .sequence_nbr = b.id2
         ) d where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
-        and (d.fireManagementPostCode = '消防安全管理人' or d.fireManagementPostCode = '消防安全责任人')
+        and (d.fireManagementPostCode in
+        <foreach item="item" index="index"  collection="codes" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        )
+    </select>
+
+    <select id="queryCompanyIdNew" resultType="map">
+       	select * from (
+        select cou.biz_org_name bizOrgName,cou.sequence_nbr sequenceNbr ,cou .parent_id parentId,
+        a.administrativePositionCode, b.telephone from cb_org_usr cou
+        left join (select i.instance_id id1 ,if(i.field_code = 'administrativePositionCode',
+        i.field_value_label, null) as 'administrativePositionCode' from cb_dynamic_form_instance i where i.field_code  = 'administrativePositionCode'
+        and i.field_value_label  is not null) a on cou .sequence_nbr = a.id1
+        left join (select i.instance_id id2,if(i.field_code = 'telephone',
+        i.field_value, null) as 'telephone' from cb_dynamic_form_instance i where i.field_code  = 'telephone'
+        and i.field_value  is not null) b on cou .sequence_nbr = b.id2
+        ) d where d.parentId in  (select sequence_nbr from cb_org_usr cou where biz_org_name = #{bizOrgName})
+
     </select>
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledRo.java

@@ -26,7 +26,7 @@ public class AlertCalledRo implements Serializable{
 	 * 
 	 * </pre>
 	 */
-	private static final long serialVersionUID = 529623529216238088L;
+	private static final long serialVersionUID = -8755622977733065123L;
 
 	/**
 	 * 通用属性
@@ -73,9 +73,12 @@ public class AlertCalledRo implements Serializable{
     @Label(value = "警情报送类型(0，警情报送，1，警情续报，2，非警情确认，3，警情结案)")
     private String alertWay;
 
-    @Label(value = "警情续报，非警情确认，警情结案，选择人员ids")
+    @Label(value = "警情续报，非警情确认，警情结案，选择人员电话号码")
     private String ids;
 
+    @Label(value = "警情续报，非警情确认，警情结案，选择人员AmousIds")
+    private String usIds;
+
     @Label(value = "警情续报自定义内容")
     private String feedback;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedSMSDto.java

@@ -30,6 +30,9 @@ public class AlertSubmittedSMSDto {
     @ApiModelProperty(value = "联系电话")
     private String userPhone;
 
+    @ApiModelProperty(value = "警情Id")
+    private String alertCallId;
+
     @ApiModelProperty(value = "协调单位")
     private String companyName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml

@@ -15,12 +15,12 @@
         jas.submission_method,
         jas.submission_method_code,
         jas.update_time,
-        jaso.sequence_nbr,
+        jaso.sequence_nbr sequenceNbr,
         jaso.company_name,
         jaso.user_name,
         jaso.user_phone
         from jc_alert_submitted jas
-        left join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
+        right join jc_alert_submitted_object jaso on jas.sequence_nbr = jaso.alert_submitted_id
         where 1=1
         <if test="alertSubmittedDto.alertCalledId != null and alertSubmittedDto.alertCalledId != ''">
             and jas.alert_called_id = #{alertSubmittedDto.alertCalledId}
@@ -68,6 +68,7 @@
     <select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto">
         SELECT
             s.sequence_nbr,
+            s.alert_called_id alertCallId,
             s.submission_time,
             o.user_phone,
             o.company_name,

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/src/main/java/com/yeejoin/amos/latentdanger/common/enums/LatentDangerState.java

@@ -35,51 +35,51 @@ public interface LatentDangerState {
         /**
          * 提交隐患
          */
-        提交隐患("提交隐患", "dangerSubmit", null, null, "0"),
+        提交隐患("提交隐患", "dangerSubmit", null, null, "0", ""),
         /**
          * 现场确认
          */
-        现场确认("现场确认", "onSiteConfirm", "leaderConfirm","onSiteConfirm", "1"),
+        现场确认("现场确认", "onSiteConfirm", "leaderConfirm","onSiteConfirm", "1", ""),
         /**
          * 检查组长确认
          */
-        检查组长确认("检查组长确认", "leaderConfirm", "secondConfirm","onSiteConfirm", "1"),
+        检查组长确认("检查组长确认", "leaderConfirm", "secondConfirm","onSiteConfirm", "1", ""),
         /**
          * 隐患二次审核确认
          */
-        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1"),
+        隐患二次审核确认("隐患二次审核确认", "secondConfirm", "taskDispatch","onSiteConfirm", "1", ""),
         /**
          * 整改任务分配
          */
-        整改任务分配("整改任务分配", "taskDispatch", "governFileSubmit","", "2"),
+        整改任务分配("整改任务分配", "taskDispatch", "governFileSubmit","", "2", "allotRecordPage"),
         /**
          * 提交整改资料
          */
-        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "3"),
+        提交整改资料("提交整改资料", "governFileSubmit", "governChargerConfirm","", "3", "rectifyRecordPage"),
         /**
          * 整改检查组长确认
          */
-        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "4"),
+        整改检查组长确认("整改检查组长确认", "governLeaderConfirm", "governChargerConfirm","governFileSubmit", "4", "auditRecordPage"),
         /**
          * 整改检查负责人确认
          */
-        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "4"),
+        整改检查负责人确认("整改检查负责人确认", "governChargerConfirm", "governLeadershipConfirm","governFileSubmit", "4", "auditRecordPage"),
         /**
          * 整改检查分管领导确认(根据计划类型不同，分管领导确认完流程不同)
          */
-        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "4"),
+        整改检查分管领导确认("整改检查分管领导确认", "governLeadershipConfirm", "governLeaderReviewConfirm","governFileSubmit", "4", "auditRecordPage"),
         /**
          * 整改检查组长复查确认
          */
-        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "4"),
+        整改检查组长复查确认("整改检查组长复查确认", "governLeaderReviewConfirm", "governSecondReviewConfirm","governFileSubmit", "4", "auditRecordPage"),
         /**
          * 整改二次审核确认
          */
-        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "4"),
+        整改二次审核确认("整改二次审核确认", "governSecondReviewConfirm", "endOfGovernance","governFileSubmit", "4", "auditRecordPage"),
         /**
          * 整改完毕
          */
-        整改完毕("整改完毕", "endOfGovernance", "","", "5");
+        整改完毕("整改完毕", "endOfGovernance", "","", "5", "auditRecordPage");
 
         /**
          * 名称，描述
@@ -106,12 +106,18 @@ public interface LatentDangerState {
          */
         private String processState;
 
-        SupervisionDangerStateEnum(String name, String code, String next, String rejectNext, String processState) {
+        /**
+         * 跳转页面
+         */
+        private String url;
+
+        SupervisionDangerStateEnum(String name, String code, String next, String rejectNext, String processState, String url) {
             this.name = name;
             this.code = code;
             this.next = next;
             this.rejectNext = rejectNext;
             this.processState = processState;
+            this.url = url;
         }
 
         public String getName() {
@@ -153,6 +159,14 @@ public interface LatentDangerState {
             this.processState = processState;
         }
 
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
         public static SupervisionDangerStateEnum getEnumByCode(String code) {
             for (SupervisionDangerStateEnum _enum : SupervisionDangerStateEnum.values()) {
                 if (code.equals(_enum.getCode())) {
@@ -173,6 +187,17 @@ public interface LatentDangerState {
             return enumName;
         }
 
+        public static String getEnumUrlByCode(String code) {
+            String enumUrl = "";
+            for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {
+                if (type.getCode().equals(code)) {
+                    enumUrl = type.getUrl();
+                    break;
+                }
+            }
+            return enumUrl;
+        }
+
         public static List<Map<String, String>> getEnumList() {
             List<Map<String, String>> enumList = Lists.newArrayList();
             for(SupervisionDangerStateEnum type: SupervisionDangerStateEnum.values()) {

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/common/enums/RuleTypeEnum.java

@@ -8,13 +8,7 @@ package com.yeejoin.amos.supervision.common.enums;
 public enum RuleTypeEnum {
 
 	GETCONTENT("维保项获取","getContent"),
-	CHECKRESULT("结果校验","checkResult" ),
-
-	// 防火监督
-	计划提交("计划提交", "addPlan"),
-	计划审核("计划审核", "planAudit"),
-	计划生成("计划生成", "addPlanTask"),
-	计划完成("计划完成", "planCompleted");
+	CHECKRESULT("结果校验","checkResult" );
 
 	/**
 	 * 名称，描述

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/TzsCommonParam.java

@@ -37,4 +37,11 @@ public class TzsCommonParam {
     public static final String APPJJ = "APPJJ";
     public static final String DD = "DD";
     public static final String JC = "JC";
+
+    public static final String LICENCE_PIC = "licencePic";
+    public static final String ADMIN_LICENSE_PIC = "adminLicensePic";
+    public static final String QR_CODE = "qrCode";
+    public static final String UNIT_TYPE = "UNIT_TYPE";
+
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoApproveDto.java

@@ -36,4 +36,10 @@ public class UnitInfoApproveDto extends BaseDto {
     @ApiModelProperty(value = "0 注册审批 1 变更审批")
     private Integer approveType;
 
+    @ApiModelProperty(value = "企业入驻时间")
+    private Date approvedTime;
+
+    @ApiModelProperty(value = "提交时间")
+    private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoChangeDto.java

@@ -36,6 +36,9 @@ public class UnitInfoChangeDto extends BaseDto {
     @ApiModelProperty(value = "单位类型code")
     private String unitTypeCode;
 
+    @ApiModelProperty(value = "组织机构编码")
+    private String organizationCode;
+
     @ApiModelProperty(value = "主管部门")
     private String comptentDept;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/UnitInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企业信息表
@@ -25,10 +28,13 @@ public class UnitInfoDto extends BaseDto {
     private String orgName;
 
     @ApiModelProperty(value = "证照类型")
-    private String licenseType;
+    private String licenceType;
 
     @ApiModelProperty(value = "证照类型code")
-    private String licenseTypeCode;
+    private String licenceTypeCode;
+
+    @ApiModelProperty(value = "组织机构编码")
+    private String organizationCode;
 
     @ApiModelProperty(value = "单位类型")
     private String unitType;
@@ -94,10 +100,10 @@ public class UnitInfoDto extends BaseDto {
     private Date createTime;
 
     @ApiModelProperty(value = "单位法人")
-    private String legelPerson;
+    private String legalPerson;
 
     @ApiModelProperty(value = "法人电话")
-    private String legelPersonTel;
+    private String legalPersonTel;
 
     @ApiModelProperty(value = "单位联系人")
     private String contactPerson;
@@ -126,4 +132,37 @@ public class UnitInfoDto extends BaseDto {
     @ApiModelProperty(value = "审批状态 0 审批中 1 审批结束 2 驳回")
     private Integer unitStatus;
 
+   @ApiModelProperty(value = "证照图片")
+   private List<AttachmentDto> licencePic;
+
+   @ApiModelProperty(value = "管理员身份证")
+   private List<AttachmentDto> adminLicensePic;
+
+   @ApiModelProperty(value = "是否变更 0 未变更 1 变更中")
+   private Boolean isChange;
+
+  @ApiModelProperty(value = "提交时间开始")
+  private String submitTimeStart ;
+
+  @ApiModelProperty(value = "提交时间结束")
+  private String submitTimeEnd ;
+
+ @ApiModelProperty(value = "分类名称")
+  private String typeStr;
+
+ @ApiModelProperty(value = "状态名称")
+  private String statusStr;
+
+ @ApiModelProperty(value = "企业二维码")
+  private List<AttachmentDto> qrcode;
+
+ @ApiModelProperty(value = "详细地址全部")
+ private String fullAddress;
+
+ @ApiModelProperty(value = "企业入驻时间")
+ private Date approvedTime;
+
+ @ApiModelProperty(value = "提交时间")
+ private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfo.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -31,14 +32,20 @@ public class UnitInfo extends BaseEntity {
     /**
      * 证照类型
      */
-	@TableField("license_type")
-    private String licenseType;
+	@TableField("licence_type")
+    private String licenceType;
 
     /**
      * 证照类型code
      */
-	@TableField("license_type_code")
-    private String licenseTypeCode;
+	@TableField("licence_type_code")
+    private String licenceTypeCode;
+
+    /**
+     * 组织机构编码
+     */
+    @TableField("organization_code")
+    private String organizationCode;
 
     /**
      * 单位类型
@@ -169,14 +176,14 @@ public class UnitInfo extends BaseEntity {
     /**
      * 单位法人
      */
-	@TableField("legel_person")
-    private String legelPerson;
+	@TableField("legal_person")
+    private String legalPerson;
 
     /**
      * 法人电话
      */
-	@TableField("legel_person_tel")
-    private String legelPersonTel;
+	@TableField("legal_person_tel")
+    private String legalPersonTel;
 
     /**
      * 单位联系人
@@ -232,4 +239,22 @@ public class UnitInfo extends BaseEntity {
 	@TableField("unit_status")
     private Integer unitStatus;
 
+    /**
+     * 是否变更 0 未变更 1 变更中
+     */
+    @TableField(value = "is_change")
+    private Boolean isChange;
+
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/UnitInfoChange.java

@@ -31,14 +31,20 @@ public class UnitInfoChange extends BaseEntity {
     /**
      * 证照类型
      */
-	@TableField("license_type")
-    private String licenseType;
+	@TableField("licence_type")
+    private String licenceType;
 
     /**
      * 证照类型code
      */
-	@TableField("license_type_code")
-    private String licenseTypeCode;
+	@TableField("licence_type_code")
+    private String licenceTypeCode;
+
+    /**
+     * 组织机构编码
+     */
+    @TableField("organization_code")
+    private String organizationCode;
 
     /**
      * 单位类型
@@ -169,14 +175,14 @@ public class UnitInfoChange extends BaseEntity {
     /**
      * 单位法人
      */
-	@TableField("legel_person")
-    private String legelPerson;
+	@TableField("legal_person")
+    private String legalPerson;
 
     /**
      * 法人电话
      */
-	@TableField("legel_person_tel")
-    private String legelPersonTel;
+	@TableField("legal_person_tel")
+    private String legalPersonTel;
 
     /**
      * 单位联系人
@@ -208,4 +214,17 @@ public class UnitInfoChange extends BaseEntity {
 	@TableField("unit_status")
     private Integer unitStatus;
 
+
+    /**
+     * 企业入驻时间
+     */
+    @TableField("approved_time")
+    private Date approvedTime;
+
+    /**
+     * 提交时间
+     */
+    @TableField("submit_time")
+    private Date submitTime;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/service/IUnitInfoService.java

 package com.yeejoin.amos.boot.module.tzs.flc.api.service;
 
 
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoApproveDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
+
 /**
  * 企业信息表接口类
  *
@@ -9,4 +12,12 @@ package com.yeejoin.amos.boot.module.tzs.flc.api.service;
  */
 public interface IUnitInfoService {
 
+    /**
+     * 审批企业注册信息
+     * @param approveDto
+     * @return
+     */
+    UnitInfoDto approve(UnitInfoApproveDto approveDto);
+
+    UnitInfoDto getDtoById(Long sequenceNbr);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireBuildingController.java

@@ -43,11 +43,12 @@ public class FireBuildingController extends BaseController {
             @ApiParam(value = "建筑名称") @RequestParam(value = "name", required = false) String name,
             @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
             @ApiParam(value = "页大小", required = true) @RequestParam(value = "size") int size,
+            @ApiParam(value = "建筑类型") @RequestParam(value = "buildingType") String buildingType,
             @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
         Page<FireBuildingDto> page = new Page<FireBuildingDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingPage(page, name, stationCode));
+        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingPage(page, name, stationCode, buildingType));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireEquipmentAlarmController.java

-package com.yeejoin.amos.boot.module.ccs.biz.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireEquipmentAlarmServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
-/**
- * 设备报警信息表
- *
- * @author system_generator
- * @date 2021-11-09
- */
-@RestController
-@Api(tags = "设备报警信息表Api")
-@RequestMapping(value = "/fire-equipment-alarm")
-public class FireEquipmentAlarmController extends BaseController {
-
-    @Autowired
-    FireEquipmentAlarmServiceImpl fireEquipmentAlarmServiceImpl;
-
-    /**
-     * 新增设备报警信息表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增设备报警信息表", notes = "新增设备报警信息表")
-	public ResponseModel<FireEquipmentAlarmDto> save(@RequestBody FireEquipmentAlarmDto model) {
-	    model = fireEquipmentAlarmServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-	/**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除设备报警信息表", notes = "根据sequenceNbr删除设备报警信息表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(fireEquipmentAlarmServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个设备报警信息表",  notes = "根据sequenceNbr查询单个设备报警信息表")
-	public ResponseModel<FireEquipmentAlarmDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(fireEquipmentAlarmServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "设备报警信息表分页查询",  notes = "设备报警信息表分页查询")
-	public ResponseModel<Page<FireEquipmentAlarmDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FireEquipmentAlarmDto> page = new Page<FireEquipmentAlarmDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(fireEquipmentAlarmServiceImpl.queryForFireEquipmentAlarmPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "设备报警信息表列表全部数据查询",   notes = "设备报警信息表列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FireEquipmentAlarmDto>> selectForList() {
-	    return ResponseHelper.buildResponse(fireEquipmentAlarmServiceImpl.queryForFireEquipmentAlarmList());
-	}
-}

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireEquipmentController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
-import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireEquipmentServiceImpl;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+import java.text.ParseException;
 
 /**
  * 消防设备资产
@@ -29,74 +29,49 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 public class FireEquipmentController extends BaseController {
 
     @Autowired
-    FireEquipmentServiceImpl fireEquipmentServiceImpl;
+    IFireEquipmentService iFireEquipmentService;
 
     /**
-     * 新增消防设备资产
+     * 物联接入汇总
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增消防设备资产", notes = "新增消防设备资产")
-	public ResponseModel<FireEquipmentDto> save(@RequestBody FireEquipmentDto model) {
-	    model = fireEquipmentServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
-	}
+    @ApiOperation(httpMethod = "GET", value = "物联接入汇总", notes = "物联接入汇总")
+    @GetMapping(value = "/iot/count")
+    public ResponseModel selectForMonitorCount(
+            @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) throws ParseException {
+        return ResponseHelper.buildResponse(iFireEquipmentService.selectForMonitorCount(stationCode));
+    }
 
-	/**
-     * 根据sequenceNbr删除
+
+    /**
+     * 站端物联设备
      *
-     * @param sequenceNbr 主键
-     * @return
+     * @param stationCode 换流站code
+     * @return ResponseModel
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防设备资产", notes = "根据sequenceNbr删除消防设备资产")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(fireEquipmentServiceImpl.removeById(sequenceNbr));
+    @ApiOperation(httpMethod = "GET", value = "站端物联设备", notes = "站端物联设备")
+    @GetMapping(value = "/station/info")
+    public ResponseModel stationEquipmentInfo(
+            @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode,
+            @ApiParam(value = "换流站名称") @RequestParam(required = false) String stationName) {
+        return ResponseHelper.buildResponse(iFireEquipmentService.stationEquipmentInfo(stationCode,stationName));
     }
 
-    /**
-     * 根据sequenceNbr查询
-     *
-	 * @param sequenceNbr  主键
-     * @return
-     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个消防设备资产",  notes = "根据sequenceNbr查询单个消防设备资产")
-	public ResponseModel<FireEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(fireEquipmentServiceImpl.queryBySeq(sequenceNbr));
-	}
 
-	/**
-     * 列表分页查询
+    /**
+     * 故障设备top
      *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
+     * @param top 页面展示上限条数
+     * @return List
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "消防设备资产分页查询",  notes = "消防设备资产分页查询")
-	public ResponseModel<Page<FireEquipmentDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<FireEquipmentDto> page = new Page<FireEquipmentDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(fireEquipmentServiceImpl.queryForFireEquipmentPage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
-     *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "消防设备资产列表全部数据查询",   notes = "消防设备资产列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<FireEquipmentDto>> selectForList() {
-	    return ResponseHelper.buildResponse(fireEquipmentServiceImpl.queryForFireEquipmentList());
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "故障设备top", notes = "故障设备top")
+    @GetMapping(value = "/count/fault/list")
+    public ResponseModel faultEquipTop(
+            @ApiParam(value = "页面展示上限条数") @RequestParam(required = false) Long top) {
+        return ResponseHelper.buildResponse(iFireEquipmentService.faultEquipTopCount(top));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireAlarmDayStatisticsController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireEquipmentSignalController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireAlarmDayStatisticsDto;
-import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireAlarmDayStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalDto;
+import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireEquipmentSignalServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
- * 换流站告警日统计
+ * 设备报警信息表
  *
  * @author system_generator
  * @date 2021-11-09
  */
 @RestController
-@Api(tags = "换流站告警日统计Api")
-@RequestMapping(value = "/fire-alarm-day-statistics")
-public class FireAlarmDayStatisticsController extends BaseController {
+@Api(tags = "设备信号信息表Api")
+@RequestMapping(value = "/fire-equipment-signal")
+public class FireEquipmentSignalController extends BaseController {
 
     @Autowired
-    FireAlarmDayStatisticsServiceImpl fireAlarmDayStatisticsServiceImpl;
+    FireEquipmentSignalServiceImpl fireEquipmentSignalServiceImpl;
 
     /**
      * 列表全部数据查询
@@ -36,9 +36,9 @@ public class FireAlarmDayStatisticsController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "换流站告警日统计列表全部数据查询", notes = "换流站告警日统计列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "设备报警信息表列表全部数据查询", notes = "设备报警信息表列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<FireAlarmDayStatisticsDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireAlarmDayStatisticsServiceImpl.queryForFireAlarmDayStatisticsList());
+    public ResponseModel<List<FireEquipmentSignalDto>> selectForList() {
+        return ResponseHelper.buildResponse(fireEquipmentSignalServiceImpl.queryForFireEquipmentAlarmList());
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireEquipmentAlarmLogController.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireEquipmentSignalLogController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmLogDto;
-import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireEquipmentAlarmLogServiceImpl;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalLogDto;
+import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireEquipmentSignalLogServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,12 +26,12 @@ import java.util.List;
  * @date 2021-11-09
  */
 @RestController
-@Api(tags = "设备报警信息日志表Api")
-@RequestMapping(value = "/fire-equipment-alarm-log")
-public class FireEquipmentAlarmLogController extends BaseController {
+@Api(tags = "设备信号信息日志表Api")
+@RequestMapping(value = "/fire-equipment-signal-log")
+public class FireEquipmentSignalLogController extends BaseController {
 
     @Autowired
-    FireEquipmentAlarmLogServiceImpl fireEquipmentAlarmLogServiceImpl;
+    FireEquipmentSignalLogServiceImpl fireEquipmentSignalLogServiceImpl;
 
     /**
      * 列表全部数据查询
@@ -41,8 +41,8 @@ public class FireEquipmentAlarmLogController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "设备报警信息日志表列表", notes = "设备报警信息日志列表")
     @GetMapping(value = "/list")
-    public ResponseModel<List<FireEquipmentAlarmLogDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireEquipmentAlarmLogServiceImpl.fireEquipmentAlarmLogList());
+    public ResponseModel<List<FireEquipmentSignalLogDto>> selectForList() {
+        return ResponseHelper.buildResponse(fireEquipmentSignalLogServiceImpl.fireEquipmentAlarmLogList());
     }
 
     /**
@@ -53,8 +53,8 @@ public class FireEquipmentAlarmLogController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "今日未确认设备报警信息列表", notes = "今日未确认设备报警信息列表，跑马灯使用")
     @GetMapping(value = "/today/list")
-    public ResponseModel<List<FireEquipmentAlarmLogDto>> todayAlarmList(
+    public ResponseModel<List<FireEquipmentSignalLogDto>> todayAlarmList(
             @ApiParam(value = "换流站编号") @RequestParam(required = false) String stationCode) throws ParseException {
-        return ResponseHelper.buildResponse(fireEquipmentAlarmLogServiceImpl.todayAlarmLogList(stationCode));
+        return ResponseHelper.buildResponse(fireEquipmentSignalLogServiceImpl.todayAlarmLogList(stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireFmeaStatisticsController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireFmeaStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,7 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -23,83 +22,13 @@ import java.util.List;
  * @date 2021-11-09
  */
 @RestController
-@Api(tags = "发生率/严重度矩阵统计表Api")
+@Api(tags = "发生率-严重度矩阵统计表Api")
 @RequestMapping(value = "/fire-fmea-statistics")
 public class FireFmeaStatisticsController extends BaseController {
 
     @Autowired
     FireFmeaStatisticsServiceImpl fireFmeaStatisticsServiceImpl;
 
-    /**
-     * 新增发生率/严重度矩阵统计表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增发生率/严重度矩阵统计表", notes = "新增发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> save(@RequestBody FireFmeaStatisticsDto model) {
-        model = fireFmeaStatisticsServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新发生率/严重度矩阵统计表", notes = "根据sequenceNbr更新发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> updateBySequenceNbrFireFmeaStatistics(@RequestBody FireFmeaStatisticsDto model, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
-        model.setId(sequenceNbr);
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除发生率/严重度矩阵统计表", notes = "根据sequenceNbr删除发生率/严重度矩阵统计表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个发生率/严重度矩阵统计表", notes = "根据sequenceNbr查询单个发生率/严重度矩阵统计表")
-    public ResponseModel<FireFmeaStatisticsDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "发生率/严重度矩阵统计表分页查询", notes = "发生率/严重度矩阵统计表分页查询")
-    public ResponseModel<Page<FireFmeaStatisticsDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireFmeaStatisticsDto> page = new Page<>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsPage(page));
-    }
 
     /**
      * 列表全部数据查询
@@ -107,9 +36,10 @@ public class FireFmeaStatisticsController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "发生率/严重度矩阵统计表列表全部数据查询", notes = "发生率/严重度矩阵统计表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireFmeaStatisticsDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsList());
+    @ApiOperation(httpMethod = "GET", value = "发生率-严重度矩阵统计", notes = "发生率-严重度矩阵统计")
+    @GetMapping(value = "/{stationCode}/list")
+    public ResponseModel<List<FireFmeaStatisticsDto>> selectForList(
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireFmeaStatisticsServiceImpl.queryForFireFmeaStatisticsList(stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireRiskSourceController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireRiskSourceServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -13,9 +12,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 风险点表
  *
@@ -30,62 +26,6 @@ public class FireRiskSourceController extends BaseController {
     @Autowired
     FireRiskSourceServiceImpl fireRiskSourceServiceImpl;
 
-    /**
-     * 新增风险点表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增风险点表", notes = "新增风险点表")
-    public ResponseModel<FireRiskSourceDto> save(@RequestBody FireRiskSourceDto model) {
-        model = fireRiskSourceServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除风险点表", notes = "根据sequenceNbr删除风险点表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个风险点表", notes = "根据sequenceNbr查询单个风险点表")
-    public ResponseModel<FireRiskSourceDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "风险点表分页查询", notes = "风险点表分页查询")
-    public ResponseModel<Page<FireRiskSourceDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireRiskSourceDto> page = new Page<FireRiskSourceDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryForFireRiskSourcePage(page));
-    }
 
     /**
      * 列表全部数据查询
@@ -93,9 +33,11 @@ public class FireRiskSourceController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "风险点表列表全部数据查询", notes = "风险点表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireRiskSourceDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.queryForFireRiskSourceList());
+    @ApiOperation(httpMethod = "GET", value = "查询风险点RPN统计", notes = "查询风险点RPN统计")
+    @GetMapping(value = "/{stationCode}/list")
+    public ResponseModel selectForRpnTopList(
+            @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode,
+            @ApiParam(value = "top值") @RequestParam(required = false) String top) {
+        return ResponseHelper.buildResponse(fireRiskSourceServiceImpl.selectForRpnTopList(stationCode, top));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireRpnChangeLogController.java

 package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireRpnChangeLogServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 风险点变化流水
  *
@@ -30,72 +28,16 @@ public class FireRpnChangeLogController extends BaseController {
     @Autowired
     FireRpnChangeLogServiceImpl fireRpnChangeLogServiceImpl;
 
-    /**
-     * 新增风险点变化流水
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增风险点变化流水", notes = "新增风险点变化流水")
-    public ResponseModel<FireRpnChangeLogDto> save(@RequestBody FireRpnChangeLogDto model) {
-        model = fireRpnChangeLogServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除风险点变化流水", notes = "根据sequenceNbr删除风险点变化流水")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个风险点变化流水", notes = "根据sequenceNbr查询单个风险点变化流水")
-    public ResponseModel<FireRpnChangeLogDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET", value = "风险点变化流水分页查询", notes = "风险点变化流水分页查询")
-    public ResponseModel<Page<FireRpnChangeLogDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireRpnChangeLogDto> page = new Page<FireRpnChangeLogDto>();
-        page.setCurrent(current);
-        page.setSize(size);
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForFireRpnChangeLogPage(page));
-    }
 
     /**
-     * 列表全部数据查询
+     * 风险点(PRN)上升百分比
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "风险点变化流水列表全部数据查询", notes = "风险点变化流水列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireRpnChangeLogDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForFireRpnChangeLogList());
+    @ApiOperation(httpMethod = "GET", value = "风险点(PRN)上升百分比", notes = "风险点(PRN)上升百分比")
+    @GetMapping(value = "/{stationCode}/riseUp")
+    public ResponseModel riseUp(@PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireRpnChangeLogServiceImpl.queryForRiseUp(stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireSignalDayStatisticsController.java

+package com.yeejoin.amos.boot.module.ccs.biz.controller;
+
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireSignalDayStatisticsServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.text.ParseException;
+
+/**
+ * 换流站告警日统计
+ *
+ * @author system_generator
+ * @date 2021-11-09
+ */
+@RestController
+@Api(tags = "换流站告警日统计Api")
+@RequestMapping(value = "/fire-signal-day-statistics")
+public class FireSignalDayStatisticsController extends BaseController {
+
+    @Autowired
+    FireSignalDayStatisticsServiceImpl fireSignalDayStatisticsServiceImpl;
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "警情信息统计", notes = "警情信息统计")
+    @GetMapping(value = "/alarm/count")
+    public ResponseModel selectForAlarmCount() throws ParseException {
+        return ResponseHelper.buildResponse(fireSignalDayStatisticsServiceImpl.selectForAlarmCount());
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "警情变化趋势", notes = "警情变化趋势")
+    @GetMapping(value = "/alarm/trend")
+    public ResponseModel selectForAlarmTrend(
+            @ApiParam(value = "开始日期：yyyy-MM-dd", required = true) @RequestParam String beginData,
+            @ApiParam(value = "结束日期：yyyy-MM-dd", required = true) @RequestParam String endData) {
+        return ResponseHelper.buildResponse(fireSignalDayStatisticsServiceImpl.selectForAlarmTrend(beginData, endData));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "警情类型占比", notes = "警情类型占比")
+    @GetMapping(value = "/alarm/percent")
+    public ResponseModel todayAlarmPercent(
+            @ApiParam(value = "开始日期：yyyy-MM-dd", required = true) @RequestParam String beginData,
+            @ApiParam(value = "结束日期：yyyy-MM-dd", required = true) @RequestParam String endData) {
+        return ResponseHelper.buildResponse(fireSignalDayStatisticsServiceImpl.todayAlarmPercent(beginData, endData));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireStationInfoController.java

@@ -8,10 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -46,4 +43,11 @@ public class FireStationInfoController extends BaseController {
             @ApiParam(value = "排序条件") @RequestParam(required = false) String orderBy) throws Exception {
         return ResponseHelper.buildResponse(fireStationInfoServiceImpl.queryForFireStationInfoList(orderBy));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "站端信息详情", notes = "站端信息详情")
+    @GetMapping(value = "/{stationCode}/detail")
+    public ResponseModel getOne(@PathVariable String stationCode) {
+        return ResponseHelper.buildResponse(fireStationInfoServiceImpl.getOneByCode(stationCode));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireVideoController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ccs.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireVideoDto;
+import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireBuildingServiceImpl;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireVideoServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,13 +53,15 @@ public class FireVideoController extends BaseController {
             @ApiParam(value = "换流站code", required = true) @PathVariable String stationCode,
             @ApiParam(value = "所在建筑,多个用逗号分隔") @RequestParam(value = "buildingMrids", required = false) String buildingMrids) {
         List<String> buildingMridList = new ArrayList<>();
-        if(StringUtils.isNotBlank(buildingMrids)){
+        //根节点id(全部建筑时使用，本来可以不送来实现过滤，但是地图前端不支持)
+        String rootMrid = FireBuildingServiceImpl.ROOT_ID;
+        if (StringUtils.isNotBlank(buildingMrids) && !rootMrid.equals(buildingMrids)) {
             buildingMridList = Arrays.stream(buildingMrids.split(",")).collect(Collectors.toList());
         }
         Page<FireVideoDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page, name, stationCode,buildingMridList));
+        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page, name, stationCode, buildingMridList));
     }
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/StatisticsController.java

@@ -46,5 +46,12 @@ public class StatisticsController {
         return ResponseHelper.buildResponse(iStatisticsService.alarmAndDangerTrend(stationCode, beginDate, endDate));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "近一年警情统计", notes = "近一年警情统计")
+    @GetMapping(value = "/station/lastYearAlarm")
+    public ResponseModel lastYearAlarmCount() {
+        return ResponseHelper.buildResponse(iStatisticsService.lastYearAlarmCount());
+    }
+
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireAlarmDayStatisticsServiceImpl.java

-package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireAlarmDayStatisticsDto;
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireAlarmDayStatistics;
-import com.yeejoin.amos.boot.module.ccs.api.mapper.FireAlarmDayStatisticsMapper;
-import com.yeejoin.amos.boot.module.ccs.api.service.IFireAlarmDayStatisticsService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
-
-/**
- * 换流站告警日统计服务实现类
- *
- * @author system_generator
- * @date 2021-11-09
- */
-@Service
-public class FireAlarmDayStatisticsServiceImpl extends BaseService<FireAlarmDayStatisticsDto, FireAlarmDayStatistics, FireAlarmDayStatisticsMapper> implements IFireAlarmDayStatisticsService {
-
-    /**
-     * 列表查询 示例
-     */
-    public List<FireAlarmDayStatisticsDto> queryForFireAlarmDayStatisticsList() {
-        return this.queryForList("", false);
-    }
-
-    public int alarmTimesCount(String stationCode, String beginDate, String endDate) {
-        LambdaQueryWrapper<FireAlarmDayStatistics> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(stationCode), FireAlarmDayStatistics::getStationCode, stationCode);
-        wrapper.ge(FireAlarmDayStatistics::getCollectDate, beginDate);
-        wrapper.le(FireAlarmDayStatistics::getCollectDate, endDate);
-        List<FireAlarmDayStatistics> list = this.list(wrapper);
-        return list.stream().mapToInt(FireAlarmDayStatistics::getAlarmTimes).sum();
-    }
-
-    public List<String> alarmTimesTrend(String stationCode, String beginDate, String endDate) {
-        return this.baseMapper.queryAlarmTimesTrend(stationCode, beginDate, endDate);
-    }
-}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireBuildingServiceImpl.java

@@ -12,6 +12,7 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,17 +25,26 @@ import java.util.stream.Collectors;
  */
 @Service
 public class FireBuildingServiceImpl extends BaseService<FireBuildingDto, FireBuilding, FireBuildingMapper> implements IFireBuildingService {
+
+    public static final String ROOT_ID = "-1";
     /**
      * 分页查询
      */
-    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page, @Condition(Operator.like) String name, @Condition String stationCode) {
-        return this.queryForPage(page, "create_date", false, name, stationCode);
+    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page, @Condition(Operator.like) String name, @Condition String stationCode, String type) {
+        return this.queryForPage(page, "create_date", false, name, stationCode, type);
     }
 
 
     public List<FireBuildingDto> buildingTree(String stationCode) {
         List<FireBuildingDto> dtoList = this.queryForList("create_date", true, stationCode);
-        return dtoList.stream().filter(d -> StringUtils.isBlank(d.getParentMrid()) || "0".equals(d.getParentMrid()) || "-1".equals(d.getParentMrid())).peek(s -> s.setChildren(this.getChildren(s.getMrid(), dtoList))).sorted(Comparator.comparing(BaseDto::getCreateDate)).collect(Collectors.toList());
+        FireBuildingDto parentNode = new FireBuildingDto();
+        parentNode.setId(ROOT_ID);
+        parentNode.setName("全部建筑");
+        parentNode.setMrid(ROOT_ID);
+        parentNode.setTreeMrids(ROOT_ID);
+        List<FireBuildingDto> childrenNode = dtoList.stream().filter(d -> StringUtils.isBlank(d.getParentMrid()) || "0".equals(d.getParentMrid()) || "-1".equals(d.getParentMrid())).peek(s -> s.setChildren(this.getChildren(s.getMrid(), dtoList))).sorted(Comparator.comparing(BaseDto::getCreateDate)).collect(Collectors.toList());
+        parentNode.setChildren(childrenNode);
+        return Collections.singletonList(parentNode);
     }
 
     private List<FireBuildingDto> getChildren(String mrid, List<FireBuildingDto> dtoList) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireEquipmentServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipment;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalLogMapper;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalMapper;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentMapper;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireStationInfoMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 消防设备资产服务实现类
@@ -16,18 +27,35 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireEquipmentServiceImpl extends BaseService<FireEquipmentDto,FireEquipment,FireEquipmentMapper> implements IFireEquipmentService {
-    /**
-     * 分页查询
-     */
-    public Page<FireEquipmentDto> queryForFireEquipmentPage(Page<FireEquipmentDto> page)   {
-        return this.queryForPage(page, null, false);
+public class FireEquipmentServiceImpl extends BaseService<FireEquipmentDto, FireEquipment, FireEquipmentMapper> implements IFireEquipmentService {
+
+    @Autowired
+    FireEquipmentSignalLogMapper fireEquipmentSignalLogMapper;
+    @Autowired
+    FireStationInfoMapper stationInfoMapper;
+    @Autowired
+    FireEquipmentSignalMapper fireEquipmentSignalMapper;
+
+    @Override
+    public Map<String, Object> selectForMonitorCount(String stationCode) throws ParseException {
+        LambdaQueryWrapper<FireEquipment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(FireEquipment::getIsIot, true);
+        wrapper.eq(StringUtils.isNotBlank(stationCode), FireEquipment::getStationCode, stationCode);
+        int totalIotEquipment = this.count(wrapper);
+        List<FireEquipmentDto> logs = fireEquipmentSignalLogMapper.distinctByEquipmentId(stationCode, DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN));
+        Map<String, Object> result = new HashMap<>();
+        result.put("totalIotEquipment", totalIotEquipment);
+        result.put("todayAlarmEquipment", logs.size());
+        return result;
+    }
+
+    @Override
+    public List<Map<String, Object>> stationEquipmentInfo(String stationCode, String stationName) {
+        return stationInfoMapper.queryStationEquipInfo(stationCode,stationName);
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireEquipmentDto> queryForFireEquipmentList()   {
-        return this.queryForList("" , false);
+    @Override
+    public List<Map<String, Object>> faultEquipTopCount(Long top) {
+        return fireEquipmentSignalMapper.faultEquipTopCount(top, new Date());
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireEquipmentAlarmLogServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireEquipmentSignalLogServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmLogDto;
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentAlarmLog;
-import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentAlarmLogMapper;
-import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentAlarmLogService;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalLogDto;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentSignalLog;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalLogMapper;
+import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentSignalLogService;
 import com.yeejoin.amos.boot.module.ccs.biz.util.RequestUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @date 2021-11-09
  */
 @Service
-public class FireEquipmentAlarmLogServiceImpl extends BaseService<FireEquipmentAlarmLogDto, FireEquipmentAlarmLog, FireEquipmentAlarmLogMapper> implements IFireEquipmentAlarmLogService {
+public class FireEquipmentSignalLogServiceImpl extends BaseService<FireEquipmentSignalLogDto, FireEquipmentSignalLog, FireEquipmentSignalLogMapper> implements IFireEquipmentSignalLogService {
 
     @Autowired
     HttpServletRequest request;
@@ -32,13 +32,13 @@ public class FireEquipmentAlarmLogServiceImpl extends BaseService<FireEquipmentA
     /**
      * 告警列表查询-最新告警及跑马灯使用
      */
-    public List<FireEquipmentAlarmLogDto> fireEquipmentAlarmLogList() {
+    public List<FireEquipmentSignalLogDto> fireEquipmentAlarmLogList() {
         Map<String, Object> params = RequestUtil.getRequestParamMap(request);
         return this.getBaseMapper().queryAlarmLogList(params);
     }
 
 
-    public List<FireEquipmentAlarmLogDto> todayAlarmLogList(String stationCode) throws ParseException {
+    public List<FireEquipmentSignalLogDto> todayAlarmLogList(String stationCode) throws ParseException {
         Map<String, Object> params = new HashMap<>();
         //未确认
         params.put("confirmState","0");

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireEquipmentAlarmServiceImpl.java → amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireEquipmentSignalServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
-import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentAlarm;
-import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentAlarmMapper;
-import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentAlarmService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentAlarmDto;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireEquipmentSignal;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireEquipmentSignalMapper;
+import com.yeejoin.amos.boot.module.ccs.api.service.IFireEquipmentSignalService;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireEquipmentSignalDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,18 +16,18 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireEquipmentAlarmServiceImpl extends BaseService<FireEquipmentAlarmDto,FireEquipmentAlarm,FireEquipmentAlarmMapper> implements IFireEquipmentAlarmService {
+public class FireEquipmentSignalServiceImpl extends BaseService<FireEquipmentSignalDto, FireEquipmentSignal, FireEquipmentSignalMapper> implements IFireEquipmentSignalService {
     /**
      * 分页查询
      */
-    public Page<FireEquipmentAlarmDto> queryForFireEquipmentAlarmPage(Page<FireEquipmentAlarmDto> page)   {
+    public Page<FireEquipmentSignalDto> queryForFireEquipmentAlarmPage(Page<FireEquipmentSignalDto> page)   {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireEquipmentAlarmDto> queryForFireEquipmentAlarmList()   {
+    public List<FireEquipmentSignalDto> queryForFireEquipmentAlarmList()   {
         return this.queryForList("" , false);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireFmeaStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireFmeaStatistics;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireFmeaStatisticsMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireFmeaStatisticsService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireFmeaStatisticsDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +17,20 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireFmeaStatisticsServiceImpl extends BaseService<FireFmeaStatisticsDto,FireFmeaStatistics,FireFmeaStatisticsMapper> implements IFireFmeaStatisticsService {
+public class FireFmeaStatisticsServiceImpl extends BaseService<FireFmeaStatisticsDto, FireFmeaStatistics, FireFmeaStatisticsMapper> implements IFireFmeaStatisticsService {
     /**
      * 分页查询
      */
-    public Page<FireFmeaStatisticsDto> queryForFireFmeaStatisticsPage(Page<FireFmeaStatisticsDto> page)   {
+    public Page<FireFmeaStatisticsDto> queryForFireFmeaStatisticsPage(Page<FireFmeaStatisticsDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
+     *
+     * @param stationCode 换流站编号
      */
-    public List<FireFmeaStatisticsDto> queryForFireFmeaStatisticsList()   {
-        return this.queryForList("" , false);
+    public List<FireFmeaStatisticsDto> queryForFireFmeaStatisticsList(String stationCode) {
+        return this.queryForTopList(20, "mutiby", false, stationCode);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireRiskSourceServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRiskSource;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireRiskSourceMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireRiskSourceService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRiskSourceDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +16,9 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireRiskSourceServiceImpl extends BaseService<FireRiskSourceDto,FireRiskSource,FireRiskSourceMapper> implements IFireRiskSourceService {
-    /**
-     * 分页查询
-     */
-    public Page<FireRiskSourceDto> queryForFireRiskSourcePage(Page<FireRiskSourceDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireRiskSourceServiceImpl extends BaseService<FireRiskSourceDto, FireRiskSource, FireRiskSourceMapper> implements IFireRiskSourceService {
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireRiskSourceDto> queryForFireRiskSourceList()   {
-        return this.queryForList("" , false);
+    public List<FireRiskSourceDto> selectForRpnTopList(String stationCode, String top) {
+        return this.baseMapper.queryForRpnDescList(stationCode, top);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireRpnChangeLogServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireRpnChangeLog;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireRpnChangeLogMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireRpnChangeLogService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireRpnChangeLogDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 风险点变化流水服务实现类
@@ -16,18 +17,20 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireRpnChangeLogServiceImpl extends BaseService<FireRpnChangeLogDto,FireRpnChangeLog,FireRpnChangeLogMapper> implements IFireRpnChangeLogService {
-    /**
-     * 分页查询
-     */
-    public Page<FireRpnChangeLogDto> queryForFireRpnChangeLogPage(Page<FireRpnChangeLogDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
+public class FireRpnChangeLogServiceImpl extends BaseService<FireRpnChangeLogDto, FireRpnChangeLog, FireRpnChangeLogMapper> implements IFireRpnChangeLogService {
 
-    /**
-     * 列表查询 示例
-     */
-    public List<FireRpnChangeLogDto> queryForFireRpnChangeLogList()   {
-        return this.queryForList("" , false);
+    @Override
+    public Map<String, Object> queryForRiseUp(String stationCode) {
+        Map<String, Object> result = new HashMap<>();
+        //本月
+        Map resultMonth = this.baseMapper.queryForRiseUp(stationCode, "1");
+        //本季度
+        Map resultSeason = this.baseMapper.queryForRiseUp(stationCode, "2");
+        //本年
+        Map resultYear = this.baseMapper.queryForRiseUp(stationCode, "3");
+        result.put("month", resultMonth);
+        result.put("season", resultSeason);
+        result.put("year", resultYear);
+        return result;
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireSignalDayStatisticsServiceImpl.java

+package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireSignalDayStatisticsDto;
+import com.yeejoin.amos.boot.module.ccs.api.entity.FireSignalDayStatistics;
+import com.yeejoin.amos.boot.module.ccs.api.enums.SignalTypeOfAlarm;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireSignalDayStatisticsMapper;
+import com.yeejoin.amos.boot.module.ccs.api.service.IFireSignalDayStatisticsService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.text.ParseException;
+import java.util.*;
+
+/**
+ * 换流站告警日统计服务实现类
+ *
+ * @author system_generator
+ * @date 2021-11-09
+ */
+@Service
+public class FireSignalDayStatisticsServiceImpl extends BaseService<FireSignalDayStatisticsDto, FireSignalDayStatistics, FireSignalDayStatisticsMapper> implements IFireSignalDayStatisticsService {
+
+
+    public int alarmTimesCount(String stationCode, String beginDate, String endDate) {
+        LambdaQueryWrapper<FireSignalDayStatistics> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(stationCode), FireSignalDayStatistics::getStationCode, stationCode);
+        wrapper.ge(FireSignalDayStatistics::getCollectDate, beginDate);
+        wrapper.le(FireSignalDayStatistics::getCollectDate, endDate);
+        wrapper.eq(FireSignalDayStatistics::getIsAlarm, true);
+        List<FireSignalDayStatistics> list = this.list(wrapper);
+        return list.stream().mapToInt(FireSignalDayStatistics::getReportTimes).sum();
+    }
+
+    public List<String> alarmTimesTrend(String stationCode, String beginDate, String endDate) {
+        return this.baseMapper.queryAlarmTimesTrend(stationCode, beginDate, endDate, null);
+    }
+
+    @Override
+    public Map<String, Object> selectForAlarmCount() throws ParseException {
+        //TODO 统计告警类型的指标信息
+        //今天
+        String today = DateUtils.dateFormat(new Date(), DateUtils.DATE_PATTERN);
+        //昨天
+        Date yesterday = DateUtils.dateAdd(new Date(), 1, false);
+        String yesterdayStr = DateUtils.dateFormat(yesterday, DateUtils.DATE_PATTERN);
+        //本周开始日期
+        Date weekBegin = DateUtils.beginDateOfWeek(new Date());
+        //本月开始日期
+        Date monthBegin = DateUtils.getBeginDateOfMonth(new Date());
+        //今日告警数量
+        int todayAlarmTimes = this.alarmTimesCount(null, today, today);
+        //昨日警情数量
+        int yesterdayAlarmTimes = this.alarmTimesCount(null, yesterdayStr, yesterdayStr);
+        //本周警情数目
+        int weekAlarmTimes = this.alarmTimesCount(null, DateUtils.dateFormat(weekBegin, DateUtils.DATE_PATTERN), today);
+        //本月警情数目
+        int monthAlarmTimes = this.alarmTimesCount(null, DateUtils.dateFormat(monthBegin, DateUtils.DATE_PATTERN), today);
+        Map<String, Object> result = new HashMap<>(8);
+        result.put("todayAlarmTimes", todayAlarmTimes);
+        result.put("yesterdayAlarmTimes", yesterdayAlarmTimes);
+        result.put("weekAlarmTimes", weekAlarmTimes);
+        result.put("monthAlarmTimes", monthAlarmTimes);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> selectForAlarmTrend(String beginData, String endData) {
+        //故障告警
+        List<String> faultAlarm = this.baseMapper.queryAlarmTimesTrend(null, beginData, endData, SignalTypeOfAlarm.FAULT_ALARM.getCode());
+        //火灾告警
+        List<String> fireAlarm = this.baseMapper.queryAlarmTimesTrend(null, beginData, endData, SignalTypeOfAlarm.FIRE_ALARM.getCode());
+        //屏蔽
+        List<String> shieldAlarm = this.baseMapper.queryAlarmTimesTrend(null, beginData, endData, SignalTypeOfAlarm.SHIELD_ALARM.getCode());
+        //漏油
+        List<String> oilAlarm = this.baseMapper.queryAlarmTimesTrend(null, beginData, endData, SignalTypeOfAlarm.OIL_LEAK_ALARM.getCode());
+        //告警
+        List<String> alarm = this.baseMapper.queryAlarmTimesTrend(null, beginData, endData, SignalTypeOfAlarm.ALARM.getCode());
+        Map<String, Object> result = new LinkedHashMap<>(8);
+        result.put("faultAlarm", faultAlarm);
+        result.put("fireAlarm", fireAlarm);
+        result.put("shieldAlarm", shieldAlarm);
+        result.put("oilLeakAlarm", oilAlarm);
+        result.put("alarm", alarm);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> todayAlarmPercent(String beginData, String endData) {
+        Map<String, Object> re = new LinkedHashMap<>(8);
+        //故障告警
+        re.put("faultAlarm", this.signalReportTimesCount(beginData, endData, SignalTypeOfAlarm.FAULT_ALARM.getCode()));
+        //火灾告警
+        re.put("fireAlarm", this.signalReportTimesCount(beginData, endData, SignalTypeOfAlarm.FIRE_ALARM.getCode()));
+        //屏蔽
+        re.put("shieldAlarm", this.signalReportTimesCount(beginData, endData, SignalTypeOfAlarm.SHIELD_ALARM.getCode()));
+        //漏油
+        re.put("oilLeakAlarm", this.signalReportTimesCount(beginData, endData, SignalTypeOfAlarm.OIL_LEAK_ALARM.getCode()));
+        //告警
+        re.put("alarm", this.signalReportTimesCount(beginData, endData, SignalTypeOfAlarm.ALARM.getCode()));
+        return re;
+    }
+
+    private int signalReportTimesCount(String beginDate, String endDate, String signalType) {
+        LambdaQueryWrapper<FireSignalDayStatistics> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ge(FireSignalDayStatistics::getCollectDate, beginDate);
+        wrapper.le(FireSignalDayStatistics::getCollectDate, endDate);
+        wrapper.eq(FireSignalDayStatistics::getSignalType, signalType);
+        List<FireSignalDayStatistics> list = this.list(wrapper);
+        return list.stream().mapToInt(FireSignalDayStatistics::getReportTimes).sum();
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java

@@ -7,7 +7,6 @@ import com.yeejoin.amos.boot.module.ccs.api.mapper.FireStationInfoMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireStationInfoService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.List;
@@ -20,18 +19,28 @@ import java.util.Optional;
  * @date 2021-11-09
  */
 @Service
-public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,FireStationInfo,FireStationInfoMapper> implements IFireStationInfoService {
+public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto, FireStationInfo, FireStationInfoMapper> implements IFireStationInfoService {
     /**
      * 列表查询 示例
+     *
      * @param orderBy
      */
     public List<FireStationInfoDto> queryForFireStationInfoList(String orderBy) throws Exception {
-        if(StringUtils.isNotBlank(orderBy)){
+        if (StringUtils.isNotBlank(orderBy)) {
             Optional<StationOrderByTypeEnum> op = StationOrderByTypeEnum.getEnum(orderBy);
-            op.orElseThrow(()->new Exception("不存在查询排序条件"));
+            op.orElseThrow(() -> new Exception("不存在查询排序条件"));
             return this.baseMapper.queryStationListWithStatistics(op.get().getOrderBy());
         } else {
             return this.baseMapper.queryStationListWithStatistics(null);
         }
     }
+
+    @Override
+    public FireStationInfoDto getOneByCode(String code) {
+        List<FireStationInfoDto> dtos = this.queryForList("", false, code);
+        if (dtos.isEmpty()) {
+            throw new RuntimeException("不存在指定数据");
+        }
+        return dtos.iterator().next();
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/StatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.ccs.api.mapper.FireStationInfoMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,11 +19,14 @@ import java.util.Map;
 public class StatisticsServiceImpl implements IStatisticsService {
 
     @Autowired
-    FireAlarmDayStatisticsServiceImpl fireAlarmDayStatisticsService;
+    FireSignalDayStatisticsServiceImpl fireAlarmDayStatisticsService;
 
     @Autowired
     FireDangerDayStatisticsServiceImpl fireDangerDayStatisticsService;
 
+    @Autowired
+    FireStationInfoMapper fireStationInfoMapper;
+
 
     @Override
     public Map<String, Object> alarmAndDangerNumCount(String stationCode) throws ParseException {
@@ -55,4 +59,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
         result.put("dangerTrend", dangerTrend);
         return result;
     }
+
+    @Override
+    public List<Map<String, Object>> lastYearAlarmCount() {
+        return fireStationInfoMapper.lastYearAlarmCount();
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -496,9 +496,9 @@ public class CommandController extends BaseController {
     @GetMapping(value = "ZQ/list")
     @ApiOperation(httpMethod = "GET", value = "执勤实力列表分页查询", notes = "执勤实力列表分页查询")
     public ResponseModel<IPage<FireTeamZhDto>> ZQlistPage(Integer pageNum, Integer pageSize, RequestData par) {
-        if(par.getTypeCode()==null){
-            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
-        }
+//        if(par.getTypeCode()==null){
+//            par.setTypeCode( AlertStageEnums.ZZZD.getCode()+","+AlertStageEnums.YLJY.getCode());
+//        }
         Page<FireTeamZhDto> pageBean = new Page<>(pageNum, pageSize);
         List<FireTeamZhDto>  list= iFireTeamService.getFireTeamList(pageNum,pageSize,par);
         Integer num=  iFireTeamService.getFireTeamListCount(par);
@@ -1066,9 +1066,6 @@ public class CommandController extends BaseController {
             if (e.get("carState").equals("在位")){
                 e.put("carState",FireCarStatusEnum.执勤.getName());
             }
-
-            e.put("longitude",116.423762);
-            e.put("latitude",39.511552);
             String sequenceNbr = e.get("sequenceNbr").toString();
             //同步力量调派车辆任务状态
             alertFormValue.stream().forEach(v->{

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -557,4 +557,30 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<Map<String, Integer>> getDeptCountByCompanyIds(@RequestParam List<String> companyIdList) throws Exception {
         return ResponseHelper.buildResponse(iOrgUsrService.getDeptCountByCompanyIds(companyIdList));
     }
+
+    /**
+     * 根据机场人员ids获取amos平台人员列表
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据机场人员ids获取amos平台人员列表", notes = "根据机场人员ids获取amos平台人员列表")
+    @GetMapping(value = "/amos/list/{orgUserId}")
+    public ResponseModel<List<AgencyUserModel>> getAmosUserByOrgUser(@PathVariable String orgUserId) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.getAmosUserByOrgUser(orgUserId));
+    }
+
+    /**
+     * 根据机场单位id获取单位人员列表
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据机场单位id获取单位人员列表", notes = "根据机场单位id获取单位人员列表")
+    @GetMapping(value = "/{companyId}/person/list")
+    public ResponseModel<List<OrgUsr>> getPersonListByCompanyId(@PathVariable String companyId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
+    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -224,7 +224,7 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 				this.getGroupCode(), "carId", "carName", "teamName","result.carId");
 		int count =0;
 		for (Map<String, Object> map : equipmentList) {
-			if(map.containsKey("carId") && map.get("carId").equals(carId)) {
+			if(map.containsKey("carId") && map.get("carId").equals(Long.toString(carId))) {
 				count++;
 			}
 		}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java

@@ -286,26 +286,16 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
 	 if(!map20.containsKey(i.get("shiftName").toString())) {
 		 map20.put(ssString, ssString);
 	 }
-		
-		
-		
-		
+
 		System.out.println("ssssssssss");
 	});
 
 
-
-
-		
-		
-		
-		
-		
 	}
 
 	@Override
-    public   List<Map<String, Object>> queryByCompanyId(){
-        return   dutyPersonShiftMapper.queryByCompanyId();
+    public   List<Map<String, Object>> queryByCompanyId(List<String> bizNames){
+        return   dutyPersonShiftMapper.queryByCompanyId(bizNames);
     }
 
     @Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -1600,6 +1600,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 * @param id
 	 * @return
 	 */
+	@Override
 	public List<OrgUsr> getPersonListByParentId(Long id) {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 		wrapper.eq(OrgUsr::getIsDelete, false);
@@ -1866,9 +1867,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return resultMap;
 	}
 
-	public  List<Map<String,Object>> queryCompanyId(String bizOrgName) {
+	public  List<Map<String,Object>> queryCompanyId(String bizOrgName,List<String> codes) {
+
+		return orgUsrMapper.queryCompanyId(bizOrgName,codes);
+	}
+
+	public  List<Map<String,Object>> queryCompanyIdNew(String bizOrgName) {
 
-		return orgUsrMapper.queryCompanyId(bizOrgName);
+		return orgUsrMapper.queryCompanyIdNew(bizOrgName);
 	}
 	
 	
@@ -1884,4 +1890,40 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 	
+
+	public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
+		if (ValidationUtil.isEmpty(orgUserIds)) {
+			throw new Exception("账号不存在");
+		}
+		List<String> orgUserIdList = Lists.newArrayList(orgUserIds.split(","));
+		List<OrgUsr> orgUsr = this.baseMapper
+				.selectList(new LambdaQueryWrapper<OrgUsr>().in(OrgUsr::getSequenceNbr, orgUserIdList));
+		if (ValidationUtil.isEmpty(orgUsr)) {
+			throw new Exception("账号不存在");
+		}
+		String userIds = Joiner.on(",").join(Lists.transform(orgUsr, OrgUsr::getAmosOrgId));
+		List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(userIds, false).getResult();
+		if (ValidationUtil.isEmpty(amosUser)) {
+			throw new Exception("账号不存在");
+		}
+		return amosUser;
+	}
+
+	/**
+	 * 查询组织机构下面的人员列表信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	public List<OrgUsr> getPersonListByCompanyId(String id) {
+		OrgUsr company = this.getById(id);
+		if (ValidationUtil.isEmpty(company)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
+		wrapper.likeRight(OrgUsr::getBizOrgCode, company.getBizOrgCode());
+		return this.baseMapper.selectList(wrapper);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/PlanClassifyTreeController.java

@@ -19,6 +19,8 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 
 @RestController
 @RequestMapping("/api/planClassifyTree")
@@ -29,6 +31,7 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	private IPlanClassifyTreeService planClassifyTreeService;
 
 	@ApiOperation(value = "创建分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	public ResponseModel create(@RequestBody PlanClassifyTree model) {
 		AgencyUserModel user = getUserInfo();
@@ -40,6 +43,7 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	}
 
 	@ApiOperation(value = "修改分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/update", method = RequestMethod.PUT)
 	public ResponseModel update(@RequestBody PlanClassifyTree model) {
 		AgencyUserModel user = getUserInfo();
@@ -51,11 +55,13 @@ public class PlanClassifyTreeController extends AbstractBaseController {
 	}
 
 	@ApiOperation(value = "删除分类")
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{ids}", method = RequestMethod.DELETE)
 	public ResponseModel delete(@PathVariable("ids") String ids) {
 		return CommonResponseUtil2.success(planClassifyTreeService.delete(ids));
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "查询分类树")
     @RequestMapping(value = "/tree", method = RequestMethod.GET)
 	public ResponseModel getTree() {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/StartLoader.java

@@ -49,7 +49,12 @@ public class StartLoader implements ApplicationRunner {
                     String obj = new String(payload);
                     if (!ValidationUtil.isEmpty(obj)) {
                         JSONObject json = JSON.parseObject(obj);
-                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情", json.get("unitInvolvedName")+","+json.get("address")+"，发生警情，请处理。", json.get("id").toString(),  json);
+                        AlertNewsDto alertNewsDto = new AlertNewsDto( "物联警情",
+                                  "物联设备发生警情，发生位置:"+json.get("address")!=null?json.get("address").toString():""+
+                                        ",事发单位:"+json.get("unitInvolvedName")!=null?json.get("unitInvolvedName").toString():""
+                                        +",联系人:"+json.get("contactUser")!=null?json.get("contactUser").toString():""
+                                        +",联系电话:"+json.get("contactPhone")!=null?json.get("contactPhone").toString():""+".请尽快处理！",
+                                   json.get("id").toString(),  json);
                         emqKeeper.getMqttClient().publish(topicweb, JSONObject.toJSON(alertNewsDto).toString().getBytes("UTF-8"), 1, false);
                  }
                 } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

@@ -7,17 +7,22 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
+import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
+import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
 import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedObjectServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
+import com.yeejoin.amos.boot.module.jcs.biz.service.impl.RuleAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.TemplateServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +39,11 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -203,6 +211,8 @@ public class AlertSubmittedController extends BaseController {
             alertSubmittedService.getAlertSubmittedContent(alertCalledId, templateVos, companyName);
         } catch (IllegalAccessException e) {
             throw  new RuntimeException("系统异常");
+        } catch (ParseException e) {
+            e.printStackTrace();
         }
         return ResponseHelper.buildResponse(templateVos);
     }
@@ -216,10 +226,26 @@ public class AlertSubmittedController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
-    public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) {
+    public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) throws ParseException {
         // 获取报送内容
         // 任务 4174  日常值班---融合调度----短信模版中的内容用户可以全部删除掉，按照自定义内容重新录入发送内容 by litw 2021年10月27日
         AlertSubmittedSMSDto schedulingContent = alertSubmittedService.getSchedulingContent(id);
+        AlertCalledObjsDto alertCalledVo  = (AlertCalledObjsDto) alertCalledService.selectAlertCalledByIdNoRedisNew(Long.valueOf(schedulingContent.getAlertCallId()));
+        /**
+         * 构建警情报送规则对象
+         */
+        AlertCalledRo alertCalledRo = new AlertCalledRo();
+        AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+
+        String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
+
+        Map<String, String> definitions = new HashMap<>();
+        definitions.put("$type",alertCalled.getAlertType());
+        definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
+        definitions.put("$replaceContent",replaceContent);
+        definitions.put("$address",alertCalled.getAddress());
+        String content = getTaskInformation( schedulingContent.getSubmissionTemplate(),definitions);
+        schedulingContent.setSubmissionTemplate(content);
         if(!ValidationUtil.isEmpty(schedulingContent.getSubmissionContent())) {
             try {
                 JSON.parseObject(schedulingContent.getSubmissionContent());
@@ -230,5 +256,12 @@ public class AlertSubmittedController extends BaseController {
         }
         return ResponseHelper.buildResponse(schedulingContent);
     }
+
+    private String getTaskInformation(String content, Map<String, String> definitions) {
+        int size = definitions.size();
+        String[] keys = definitions.keySet().toArray(new String[size]);
+        String[] values = definitions.values().toArray(new String[size]);
+        return StringUtils.replaceEach(content, keys, values);
+    }
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -369,7 +369,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				alertCalledObjsDto.setAlertFormValue(alertFormValuelist);
 				// 警情报送
 				// 调用规则  警情初报
-				ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto, AlertBusinessTypeEnum.警情初报.getCode(), null);
+				ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto, AlertBusinessTypeEnum.警情初报.getCode(), null,null,null);
 				// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
 				emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
 				/**
@@ -377,9 +377,6 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				 */
 				eSAlertCalledService.saveAlertCalledToES(alertCalled);
 			}
-
-
-
 			return alertCalledObjsDto;
 		} catch (Exception e) {
 			e.printStackTrace();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java

@@ -330,17 +330,21 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		ResponseModel<List<Map<String, Object>>> result = equipFeignClient.getFireCarListAllcount();
 
 		List<Map<String, Object>> result1 = result.getResult();
-
-		list.forEach(fireTeamZhDto -> {
-			Long sequenceNbr = fireTeamZhDto.getSequenceNbr();
-			result1.forEach(map -> {
-				String mapId = String.valueOf(map.get("teamId"));
-				if (String.valueOf(sequenceNbr).equals(mapId)) {
-					Integer carNum = Integer.valueOf(map.get("carNum").toString());
-					fireTeamZhDto.setCarNum(carNum);
-				}
+        if(result1!=null&&result1.size()> 0){
+			list.forEach(fireTeamZhDto -> {
+				Long sequenceNbr = fireTeamZhDto.getSequenceNbr();
+				result1.forEach(map -> {
+					String mapId = String.valueOf(map.get("teamId"));
+					if (String.valueOf(sequenceNbr).equals(mapId)) {
+						Integer carNum = Integer.valueOf(map.get("carNum").toString());
+						fireTeamZhDto.setCarNum(carNum);
+					}
+				});
 			});
-		});
+		}
+
+
+
 		/*
 		 * 
 		 * if(result1!=null&&result1.size()>0){ Map<String, Object> combineResultMap =
@@ -435,7 +439,7 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
 		LambdaQueryWrapper<FireTeam> queryWrapper = new LambdaQueryWrapper<FireTeam>();
 		queryWrapper.eq(FireTeam::getTypeCode, code);
 		queryWrapper.eq(FireTeam::getIsDelete, false);
-		// queryWrapper.eq(FireTeam::getCompany, companyId);
+		queryWrapper.eq(FireTeam::getCompany, companyId);
 		return	this.baseMapper.selectList(queryWrapper);
 	}
 	

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/dto/LatentDangerRo.java

+package com.yeejoin.amos.latentdanger.business.dto;
+
+import com.yeejoin.amos.component.rule.Label;
+import com.yeejoin.amos.component.rule.RuleFact;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xl
+ * @Description: 隐患规则实体
+ * @Date: 2021/11/12 14:44
+ */
+@Data
+@RuleFact(value = "隐患",project = "消息规则")
+public class LatentDangerRo implements Serializable {
+
+    private static final long serialVersionUID = -2985122485796921797L;
+
+    @Label("隐患名称")
+    private String dangerName;
+
+    @Label(value = "隐患等级名称")
+    private String dangerLevelName;
+
+    @Label(value = "执行方法")
+    private String ruleType;
+
+    @Label(value = "整改类型名称")
+    private String reformTypeName;
+
+    @Label(value = "隐患状态")
+    private String dangerState;
+
+    @Label(value = "隐患状态名称")
+    private String dangerStateName;
+
+    @Label(value = "执行状态")
+    private String excuteStateName;
+
+    @Label(value = "推送时间")
+    private String sendTime;
+
+    @Label(value = "接收人")
+    private List<String> recivers;
+
+    @Label(value = "发送到web标识")
+    private Boolean isSendWeb;
+
+    @Label(value = "发送到app标识")
+    private Boolean isSendApp;
+
+    @Label("关联id")
+    private String relationId;
+
+    @Label("消息类型")
+    private String msgType;
+
+    @Label(value = "终端标识")
+    private String terminal;
+
+    @Label(value = "扩展参数")
+    private Map<String, String> extras;
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -13,6 +13,7 @@ import com.google.common.collect.Sets;
 import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
+import com.yeejoin.amos.boot.biz.common.enums.RuleTypeEnum;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
@@ -49,20 +50,7 @@ import com.yeejoin.amos.latentdanger.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailRiskVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerDetailVo;
 import com.yeejoin.amos.latentdanger.business.vo.LatentDangerListVo;
-import com.yeejoin.amos.latentdanger.common.enums.DangerHandleStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.DictTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.ExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerBizTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerExecuteTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerLevelEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerOvertimeStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerProcessStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerReformTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerStateEnum;
-import com.yeejoin.amos.latentdanger.common.enums.LatentDangerTypeEnum;
-import com.yeejoin.amos.latentdanger.common.enums.OwerEnum;
+import com.yeejoin.amos.latentdanger.common.enums.*;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteSpcService;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWebSocketServer;
 import com.yeejoin.amos.latentdanger.common.remote.RemoteWorkFlowService;
@@ -144,6 +132,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
     private RemoteSpcService remoteSpcService;
     @Autowired
     private AsyncTask asyncTask;
+    @Autowired
+    private RuleDangerService ruleDangerService;
     //    @Autowired
 //    private Business business;
     @Autowired
@@ -288,7 +278,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 latentDanger.setCurrentFlowRecordId(inputRecord.getId());
                 latentDanger.setInstanceId(instance.getString("id"));
                 latentDangerMapper.updateById(latentDanger);
-                asyncTask.sendDangerMsg(RequestContext.cloneRequestContext(), latentDanger, onSiteConfirmRole);
+                ruleDangerService.addLatentDangerRule(latentDanger, RuleTypeEnum.隐患第一次提交.getCode(), onSiteConfirmRole);
             }
 
             // TODO 使用远程调用替换
@@ -2110,7 +2100,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             throw new Exception(executeSubmitDto.getMsg());
         }
         List<String> userIds = workflowExecuteService.getUserIdsByWorkflow(latentDanger.getInstanceId(), executeSubmitDto.getCheckLeaderId());
-        asyncTask.sendDangerSubmitMsg(RequestContext.cloneRequestContext(), latentDanger, userIds, ExecuteTypeEnum.getNameByCode(executeType));
+        ruleDangerService.addDangerSubmitRule(latentDanger, userIds, RuleTypeEnum.隐患审核.getCode(), ExecuteTypeEnum.getNameByCode(executeType));
         return executeSubmitDto;
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/RuleDangerService.java

+package com.yeejoin.amos.latentdanger.business.service.impl;
+
+import com.yeejoin.amos.component.rule.RuleTrigger;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.latentdanger.business.dto.LatentDangerRo;
+import com.yeejoin.amos.latentdanger.business.util.DateUtil;
+import com.yeejoin.amos.latentdanger.common.enums.LatentDangerState;
+import com.yeejoin.amos.latentdanger.dao.entity.LatentDanger;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Author: xl
+ * @Description: 隐患触发规则
+ * @Date: 2021/11/12 14:55
+ */
+@Service
+public class RuleDangerService {
+
+    private final String packageId = "消息/addDangerRule";
+    private final String msgType = "danger";
+
+    private final String APP = "APP";
+    private final String WEB = "WEB";
+    private final String APP_WEB = "APP/WEB";
+
+    @Autowired
+    private RuleTrigger ruleTrigger;
+
+    public Boolean addLatentDangerRule(LatentDanger latentDanger, String ruleType, String roleName) throws Exception {
+        LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
+        latentDangerRo.setTerminal(APP);
+        List<RoleModel> result = Privilege.roleClient.queryRoleList(roleName, null).getResult();
+        if (result.size() > 0) {
+            List<AgencyUserModel> userModels = Privilege.agencyUserClient.queryByRoleId(String.valueOf(result.get(0).getSequenceNbr()), null).getResult();
+            List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
+            latentDangerRo.setRecivers(userIds);
+        }
+        //触发规则
+        ruleTrigger.publish(latentDangerRo, packageId, new String[0]);
+        return true;
+    }
+
+    public Boolean addDangerSubmitRule(LatentDanger latentDanger, List<String> userIds, String ruleType, String excuteStateName) throws Exception {
+        LatentDangerRo latentDangerRo = buildLatentDangerRo(latentDanger, ruleType);
+        Map<String, String> extras = !ValidationUtil.isEmpty(latentDangerRo.getExtras()) ? latentDangerRo.getExtras() : new HashMap<>();
+        // 跳转url
+        String url = LatentDangerState.SupervisionDangerStateEnum.getEnumUrlByCode(latentDanger.getDangerState());
+        extras.put("url", url);
+        latentDangerRo.setExtras(extras);
+        latentDangerRo.setExcuteStateName(excuteStateName);
+        latentDangerRo.setIsSendWeb(true);
+        latentDangerRo.setRecivers(userIds);
+        latentDangerRo.setTerminal(APP_WEB);
+        //触发规则
+        ruleTrigger.publish(latentDangerRo, packageId, new String[0]);
+        return true;
+    }
+
+    private LatentDangerRo buildLatentDangerRo (LatentDanger latentDanger, String ruleType){
+        LatentDangerRo latentDangerRo = new LatentDangerRo();
+        BeanUtils.copyProperties(latentDanger, latentDangerRo);
+        latentDangerRo.setMsgType(msgType);
+        latentDangerRo.setIsSendApp(true);
+        latentDangerRo.setRuleType(ruleType);
+        latentDangerRo.setRelationId(String.valueOf(latentDanger.getId()));
+        latentDangerRo.setSendTime(DateUtil.date2LongStr(new Date()));
+
+        String type = null;
+        latentDanger.getDangerState();
+        LatentDangerState.SupervisionDangerStateEnum stateEnum =
+                LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState());
+        if (!ValidationUtil.isEmpty(stateEnum)) {
+            if (stateEnum.getProcessState().equals("0") || stateEnum.getProcessState().equals("1")) {
+                type = "1";
+            } else if (stateEnum.getProcessState().equals("4")) {
+                type = "2";
+            }
+        }
+
+        if (!ValidationUtil.isEmpty(type)){
+            Map<String, String> map = new HashMap<>();
+            map.put("type", type);
+            latentDangerRo.setExtras(map);
+        }
+        return latentDangerRo;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/LatentDangerController.java

 package com.yeejoin.amos.patrol.business.controller;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
@@ -38,10 +17,28 @@ import com.yeejoin.amos.patrol.business.util.FileHelper;
 import com.yeejoin.amos.patrol.business.vo.DangerTimeAxisVo;
 import com.yeejoin.amos.patrol.common.enums.DictTypeEnum;
 import com.yeejoin.amos.patrol.core.common.response.DangerListResponse;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/latent/danger")
@@ -139,7 +136,6 @@ public class LatentDangerController extends AbstractBaseController {
             }
             return iLatentDangerService.detail(id, user.getUserId(),isFinish);
         } catch (Exception e) {
-            logger.error("隐患详情异常", e.getMessage());
             return CommonResponseUtil.failure("系统繁忙，请稍后再试");
         }
     }
@@ -328,4 +324,11 @@ public class LatentDangerController extends AbstractBaseController {
             return CommonResponseUtil.failure("系统繁忙，请稍后再试");
         }
     }
+
+    @ApiOperation(value = "应急指挥科人员列表", notes = "应急指挥科人员列表")
+    @GetMapping(value = "/emergencyCommandSection/person/list")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    public CommonResponse getPersonListByCompanyId() {
+        return CommonResponseUtil.success(iLatentDangerService.getPersonListByCompanyId());
+    }
 }