listDriverWarnAnalysis(WarnAnalysisListReq req) {
+ return warnAnalysisManage.listDriverWarnAnalysis(req);
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/IndustryStandards.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/IndustryStandards.java
new file mode 100644
index 0000000..9c05069
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/IndustryStandards.java
@@ -0,0 +1,54 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 行业标准
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@TableName("nd_industry_standards")
+@ApiModel(value = "IndustryStandards对象", description = "")
+public class IndustryStandards implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("创建人")
+ private Long createBy;
+
+ private String name;
+
+ @ApiModelProperty("标准类型")
+ private Integer type;
+
+ @ApiModelProperty("文件ID")
+ private Long fileId;
+
+ @ApiModelProperty("下载次数")
+ private Integer downCount;
+
+ @ApiModelProperty("区域ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业ID")
+ private Long companyId;
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageGrade.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageGrade.java
new file mode 100644
index 0000000..48f9eb1
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageGrade.java
@@ -0,0 +1,62 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全管理综合评级
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-13
+ */
+@Data
+@TableName("nd_security_manage_grade")
+@ApiModel(value = "SecurityManageGrade对象", description = "安全管理综合评级")
+public class SecurityManageGrade implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("安全评级")
+ private String securityLevel;
+
+ @ApiModelProperty("综合得分")
+ private Integer score;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageResultEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageResultEval.java
new file mode 100644
index 0000000..79e745c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityManageResultEval.java
@@ -0,0 +1,77 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全制度建设分析评估
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_security_manage_result_eval")
+@ApiModel(value = "SecurityManageResultEval对象", description = "安全制度建设分析评估")
+public class SecurityManageResultEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("出现次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("出险扣分")
+ private Integer dangerScore;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("死亡人数扣分")
+ private Integer deadScore;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("受伤人数扣分")
+ private Integer injuredScore;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityRiskEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityRiskEval.java
new file mode 100644
index 0000000..167f8db
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecurityRiskEval.java
@@ -0,0 +1,80 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全责任体系分析评估
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_security_risk_eval")
+@ApiModel(value = "SecurityRiskEval对象", description = "安全责任体系分析评估")
+public class SecurityRiskEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("安全承诺得分")
+ private Integer promiseScore;
+
+ @ApiModelProperty("安全责任得分")
+ private Integer riskScore;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("检查地址")
+ private String checkAddress;
+
+ @ApiModelProperty("检查人")
+ private String checkUser;
+
+ @ApiModelProperty("检查部门")
+ private String checkDept;
+
+ @ApiModelProperty("检查内容")
+ private String checkContent;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecuritySystemBuildingEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecuritySystemBuildingEval.java
new file mode 100644
index 0000000..1fd79dd
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/SecuritySystemBuildingEval.java
@@ -0,0 +1,74 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全制度建设分析评估
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_security_system_building_eval")
+@ApiModel(value = "SecuritySystemBuildingEval对象", description = "安全制度建设分析评估")
+public class SecuritySystemBuildingEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("检查地址")
+ private String checkAddress;
+
+ @ApiModelProperty("检查人")
+ private String checkUser;
+
+ @ApiModelProperty("检查部门")
+ private String checkDept;
+
+ @ApiModelProperty("检查内容")
+ private String checkContent;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleAccidentEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleAccidentEval.java
new file mode 100644
index 0000000..841eae9
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleAccidentEval.java
@@ -0,0 +1,77 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 车辆事故情况评估
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+@Data
+@TableName("nd_vehicle_accident_eval")
+@ApiModel(value = "VehicleAccidentEval对象", description = "车辆事故情况评估")
+public class VehicleAccidentEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("车辆ID")
+ private Long carId;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计事故次数")
+ private Integer accidentCount;
+
+ @ApiModelProperty("万公里事故次数")
+ private Integer avgAccidentCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleOverSpeedEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleOverSpeedEval.java
new file mode 100644
index 0000000..e52dfd6
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleOverSpeedEval.java
@@ -0,0 +1,77 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 车辆超速情况评估
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+@Data
+@TableName("nd_vehicle_over_speed_eval")
+@ApiModel(value = "VehicleOverSpeedEval对象", description = "车辆超速情况评估")
+public class VehicleOverSpeedEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("车辆ID")
+ private Long carId;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("万公里超速次数")
+ private Integer avgOverSpeedCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleServiceLife.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleServiceLife.java
new file mode 100644
index 0000000..d8954c2
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleServiceLife.java
@@ -0,0 +1,69 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 车辆使用年限
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@TableName("nd_vehicle_service_life")
+@ApiModel(value = "VehicleServiceLife对象", description = "车辆使用年限")
+public class VehicleServiceLife implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车辆ID")
+ private Long carId;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("购置时间")
+ private LocalDate buyTime;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleViolationEval.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleViolationEval.java
new file mode 100644
index 0000000..e993b1d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/VehicleViolationEval.java
@@ -0,0 +1,77 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 车辆违章情况评估
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@TableName("nd_vehicle_violation_eval")
+@ApiModel(value = "VehicleViolationEval对象", description = "车辆违章情况评估")
+public class VehicleViolationEval implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("车辆ID")
+ private Long carId;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计违章次数")
+ private Integer violationCount;
+
+ @ApiModelProperty("万公里违章次数")
+ private Integer avgViolationCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCar.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCar.java
new file mode 100644
index 0000000..27e5013
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCar.java
@@ -0,0 +1,80 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 车辆综合预警分析
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_warn_analysis_car")
+@ApiModel(value = "WarnAnalysisCar对象", description = "车辆综合预警分析")
+public class WarnAnalysisCar implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("出现次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("车辆风险分值")
+ private Integer dangerScore;
+
+ @ApiModelProperty("车辆ID")
+ private Long carId;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCompany.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCompany.java
new file mode 100644
index 0000000..8a2de0f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisCompany.java
@@ -0,0 +1,71 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 企业综合预警分析
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_warn_analysis_company")
+@ApiModel(value = "WarnAnalysisCompany对象", description = "企业综合预警分析")
+public class WarnAnalysisCompany implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+ @ApiModelProperty("出现次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisDriver.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisDriver.java
new file mode 100644
index 0000000..615b913
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/WarnAnalysisDriver.java
@@ -0,0 +1,79 @@
+package com.ningdatech.carapi.analysis.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * 驾驶员综合预警分析
+ *
+ *
+ * @author WendyYang
+ * @since 2022-11-01
+ */
+@Data
+@TableName("nd_warn_analysis_driver")
+@ApiModel(value = "WarnAnalysisDriver对象", description = "驾驶员综合预警分析")
+public class WarnAnalysisDriver implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("出险次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("驾驶员风险分值")
+ private Integer dangerScore;
+
+ @ApiModelProperty("司机ID")
+ private Long driverId;
+
+ @ApiModelProperty("驾驶员姓名")
+ private String driverName;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/CompanyWarnStatisticsDto.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/CompanyWarnStatisticsDto.java
new file mode 100644
index 0000000..dd737cd
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/CompanyWarnStatisticsDto.java
@@ -0,0 +1,22 @@
+package com.ningdatech.carapi.analysis.entity.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * CompanyWarnStatisticsDto
+ *
+ *
+ * @author WendyYang
+ * @since 16:18 2022/10/25
+ */
+@Data
+public class CompanyWarnStatisticsDto {
+
+ private Integer count;
+
+ private Long regionId;
+
+ private Integer dangerLevel;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/OutDangerImportDto.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/OutDangerImportDto.java
new file mode 100644
index 0000000..2c2d9f4
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/OutDangerImportDto.java
@@ -0,0 +1,64 @@
+package com.ningdatech.carapi.analysis.entity.dto;
+
+import java.math.BigDecimal;
+
+import lombok.Data;
+
+/**
+ * @author CMM
+ * @description
+ * @since 2022/11/16 17:01
+ */
+@Data
+public class OutDangerImportDto {
+ /**
+ * 序号
+ */
+ private Integer id;
+
+ /**
+ * 所属区域
+ */
+ private String regionName;
+
+ /**
+ * 车牌号
+ */
+ private String carNo;
+
+ /**
+ * 保险公司
+ */
+ private String insureCompany;
+
+ /**
+ * 企业名称
+ */
+ private String companyName;
+
+
+ /**
+ * 事故地点
+ */
+ private String accidentAddress;
+
+ /**
+ * 事故时间
+ */
+ private String accidentTime;
+
+ /**
+ * 受伤人数
+ */
+ private Integer injuries;
+
+ /**
+ * 死亡人数
+ */
+ private Integer deathToll;
+
+ /**
+ * 理赔金额
+ */
+ private BigDecimal compensateAmount;
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleAccidentImportDto.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleAccidentImportDto.java
new file mode 100644
index 0000000..d82f2a5
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleAccidentImportDto.java
@@ -0,0 +1,70 @@
+package com.ningdatech.carapi.analysis.entity.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * VehicleAccidentImportDto
+ *
+ *
+ * @author WendyYang
+ * @since 11:17 2022/10/17
+ */
+@Data
+public class VehicleAccidentImportDto {
+
+ /**
+ * 序号
+ */
+ private Integer id;
+
+ /**
+ * 城市
+ */
+ private String city;
+
+ /**
+ * 区（县）
+ */
+ private String zone;
+
+ /**
+ * 企业名称
+ */
+ private String companyName;
+
+ /**
+ * 车牌号
+ */
+ private String carNo;
+
+ /**
+ * 车架号
+ */
+ private String chassisNumber;
+
+ /**
+ * 行驶里程
+ */
+ private Integer mileage;
+
+ /**
+ * 累计出险次数
+ */
+ private Integer accidentCount;
+
+ /**
+ * 万公里出险次数
+ */
+ private Integer avgAccidentCount;
+
+ /**
+ * 风险评估
+ */
+ private String riskEvaluation;
+
+ /**
+ * 备注
+ */
+ private String remark;
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleOverSpeedImportDto.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleOverSpeedImportDto.java
new file mode 100644
index 0000000..752b234
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleOverSpeedImportDto.java
@@ -0,0 +1,70 @@
+package com.ningdatech.carapi.analysis.entity.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * VehicleOverSpeedDto
+ *
+ *
+ * @author WendyYang
+ * @since 11:17 2022/10/17
+ */
+@Data
+public class VehicleOverSpeedImportDto {
+
+ /**
+ * 序号
+ */
+ private Integer id;
+
+ /**
+ * 城市
+ */
+ private String city;
+
+ /**
+ * 区（县）
+ */
+ private String zone;
+
+ /**
+ * 企业名称
+ */
+ private String companyName;
+
+ /**
+ * 车牌号
+ */
+ private String carNo;
+
+ /**
+ * 车架号
+ */
+ private String chassisNumber;
+
+ /**
+ * 行驶里程
+ */
+ private Integer mileage;
+
+ /**
+ * 累计出险次数
+ */
+ private Integer overSpeedCount;
+
+ /**
+ * 万公里出险次数
+ */
+ private Integer avgOverSpeedCount;
+
+ /**
+ * 风险评估
+ */
+ private String riskEvaluation;
+
+ /**
+ * 备注
+ */
+ private String remark;
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleViolationImportDto.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleViolationImportDto.java
new file mode 100644
index 0000000..4e2e328
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/dto/VehicleViolationImportDto.java
@@ -0,0 +1,71 @@
+package com.ningdatech.carapi.analysis.entity.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * VehicleViolationImportDto
+ *
+ *
+ * @author WendyYang
+ * @since 11:17 2022/10/17
+ */
+@Data
+public class VehicleViolationImportDto {
+
+ /**
+ * 序号
+ */
+ private Integer id;
+
+ /**
+ * 城市
+ */
+ private String city;
+
+ /**
+ * 区（县）
+ */
+ private String zone;
+
+ /**
+ * 企业名称
+ */
+ private String companyName;
+
+ /**
+ * 车牌号
+ */
+ private String carNo;
+
+ /**
+ * 车架号
+ */
+ private String chassisNumber;
+
+ /**
+ * 行驶里程
+ */
+ private Integer mileage;
+
+ /**
+ * 累计违章次数
+ */
+ private Integer violationCount;
+
+ /**
+ * 万公里违章次数
+ */
+ private Integer avgViolationCount;
+
+ /**
+ * 风险评估
+ */
+ private String riskEvaluation;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/DangerLevel.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/DangerLevel.java
new file mode 100644
index 0000000..359f255
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/DangerLevel.java
@@ -0,0 +1,40 @@
+package com.ningdatech.carapi.analysis.entity.enumeration;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ *
+ * DangerLevel
+ *
+ *
+ * @author WendyYang
+ * @since 17:18 2022/10/25
+ */
+@Getter
+public enum DangerLevel {
+ /**
+ * 预警
+ */
+ RED(1, "红色预警"),
+ ORANGE(2, "橙色预警"),
+ YELLOW(3, "黄色预警"),
+ BLUE(4, "蓝色预警");
+
+ private final Integer code;
+ private final String name;
+
+ DangerLevel(Integer code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static DangerLevel getByCode(Integer code) {
+ return Arrays.stream(values())
+ .filter(w -> w.getCode().equals(code))
+ .findFirst()
+ .orElseThrow(() -> new IllegalArgumentException("预警级别编码无效"));
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/IndustryStandardsType.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/IndustryStandardsType.java
new file mode 100644
index 0000000..da0598d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/IndustryStandardsType.java
@@ -0,0 +1,43 @@
+package com.ningdatech.carapi.analysis.entity.enumeration;
+
+import lombok.Getter;
+
+/**
+ *
+ * IndustryStandardsType
+ *
+ *
+ * @author WendyYang
+ * @since 10:08 2022/10/15
+ */
+@Getter
+public enum IndustryStandardsType {
+
+ /**
+ * 车属企业安全管理规范
+ */
+ SAFETY_MANAGEMENT_SPECIFICATION(1),
+ /**
+ * 车辆安全设备规范
+ */
+ SAFETY_EQUIPMENT_SPECIFICATION(2),
+ /**
+ * 车辆驾驶安全标准
+ */
+ DRIVING_SAFETY_STANDARDS(3),
+ /**
+ * 安全生产管理人员标准
+ */
+ STANDARDS_FOR_SAFETY_PRODUCTION_MANAGEMENT_PERSONNEL(4),
+ /**
+ * 驾驶员教育考核标准
+ */
+ EVALUATION_CRITERIA_FOR_DRIVER_EDUCATION(5);
+
+ private final Integer code;
+
+ IndustryStandardsType(Integer code) {
+ this.code = code;
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/InsuranceDangerLevel.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/InsuranceDangerLevel.java
new file mode 100644
index 0000000..5e233eb
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/enumeration/InsuranceDangerLevel.java
@@ -0,0 +1,31 @@
+package com.ningdatech.carapi.analysis.entity.enumeration;
+
+import lombok.Getter;
+
+/**
+ *
+ * 保险风险评估-风险等级枚举
+ *
+ *
+ * @author WendyYang
+ * @since 10:59 2022/11/2
+ */
+@Getter
+public enum InsuranceDangerLevel {
+ /**
+ * 风险等级
+ */
+ HIGH(1, "高级风险"),
+ HIGH_2ND(2, "次高及风险"),
+ MID(3, "中级风险"),
+ LOW(4, "低级风险");
+
+ private final Integer code;
+ private final String value;
+
+ InsuranceDangerLevel(Integer code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsListReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsListReq.java
new file mode 100644
index 0000000..659c7b7
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsListReq.java
@@ -0,0 +1,36 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * IndustryStandardsListReq
+ *
+ *
+ * @author WendyYang
+ * @since 10:25 2022/10/15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IndustryStandardsListReq extends PagePo {
+
+ @NotNull(message = "行业标准类型不能为空")
+ @ApiModelProperty("行业规范类型：1 车属企业安全管理规范、2 车辆安全设备规范、3 车辆驾驶安全标准、4 安全生产管理人员标准、5 驾驶员教育考核标准")
+ private Integer type;
+
+ @ApiModelProperty("文件名称")
+ private String fileName;
+
+ @ApiModelProperty("开始时间")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty("结束时间")
+ private LocalDateTime endTime;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsSaveReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsSaveReq.java
new file mode 100644
index 0000000..b8803ef
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/IndustryStandardsSaveReq.java
@@ -0,0 +1,34 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 行业标准新增实体
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel(value = "行业标准新增实体")
+public class IndustryStandardsSaveReq {
+
+ @ApiModelProperty("行业标准说明")
+ @NotBlank(message = "行业标准说明不能为空")
+ private String name;
+
+ @ApiModelProperty("标准类型")
+ @NotNull(message = "标准类型不能为空")
+ private Integer type;
+
+ @ApiModelProperty("文件ID")
+ @NotNull(message = "文件ID不能为空")
+ private Long fileId;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityManageGradeListReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityManageGradeListReq.java
new file mode 100644
index 0000000..b5b5d0b
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityManageGradeListReq.java
@@ -0,0 +1,27 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import com.ningdatech.basic.model.PagePo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *
+ * SecurityManagementGradeListReq
+ *
+ *
+ * @author WendyYang
+ * @since 14:56 2022/10/13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SecurityManageGradeListReq extends PagePo {
+
+ private Long regionId;
+
+ private Integer year;
+
+ private String securityLevel;
+
+ private String companyName;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalListReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalListReq.java
new file mode 100644
index 0000000..4a33ffb
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalListReq.java
@@ -0,0 +1,55 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import cn.hutool.core.util.StrUtil;
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+
+/**
+ *
+ * SecurityRiskEvaluationListReq
+ *
+ *
+ * @author WendyYang
+ * @since 09:27 2022/10/14
+ */
+@ApiModel("安全责任体系分析评估列表参数类")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SecurityRiskEvalListReq extends PagePo {
+
+ private Long regionId;
+
+ private Integer year;
+
+ @ApiModelProperty("总分值：格式为-XX，XX-XX，XX-")
+ private String scoreRange;
+
+ private String companyName;
+
+ private transient Pair scoreRanges;
+
+ public void setScoreRange(String scoreRange) {
+ this.scoreRange = scoreRange;
+ this.setScoreRanges();
+ }
+
+ private void setScoreRanges() {
+ if (StringUtils.isNotBlank(this.scoreRange)) {
+ String[] scoreArray = StrUtil.strip(scoreRange, "-").split("-");
+ int indexOf = scoreRange.indexOf("-");
+ if (indexOf == scoreRange.length() - 1) {
+ scoreRanges = Pair.of(Integer.valueOf(scoreArray[0]), null);
+ } else if (indexOf == 0) {
+ scoreRanges = Pair.of(null, Integer.valueOf(scoreArray[0]));
+ } else {
+ scoreRanges = Pair.of(Integer.valueOf(scoreArray[0]), Integer.valueOf(scoreArray[1]));
+ }
+ }
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalSaveReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalSaveReq.java
new file mode 100644
index 0000000..4716bf3
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecurityRiskEvalSaveReq.java
@@ -0,0 +1,78 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全责任体系分析评估
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Data
+@ApiModel("安全责任体系分析评估新增参数类")
+public class SecurityRiskEvalSaveReq {
+
+ @ApiModelProperty("年度")
+ @NotNull(message = "考核年度不能为空")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ @NotNull(message = "企业编码不能为空")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ @NotBlank(message = "企业名称不能为空")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ @NotNull(message = "综合得分不能为空")
+ private Integer totalScore;
+
+ @ApiModelProperty("安全承诺得分")
+ @NotNull(message = "安全承诺得分不能为空")
+ private Integer promiseScore;
+
+ @ApiModelProperty("安全责任得分")
+ @NotNull(message = "安全责任得分不能为空")
+ private Integer riskScore;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("检查地址")
+ private String checkAddress;
+
+ @ApiModelProperty("检查人")
+ private String checkUser;
+
+ @ApiModelProperty("检查部门")
+ private String checkDept;
+
+ @ApiModelProperty("检查内容")
+ @NotBlank(message = "检查内容不能为空")
+ private String checkContent;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecuritySystemBuildingEvalSaveReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecuritySystemBuildingEvalSaveReq.java
new file mode 100644
index 0000000..09a046c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/SecuritySystemBuildingEvalSaveReq.java
@@ -0,0 +1,70 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 安全制度建设分析评估新增参数类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Data
+@ApiModel("安全制度建设分析评估新增参数类")
+public class SecuritySystemBuildingEvalSaveReq {
+
+ @ApiModelProperty("年度")
+ @NotNull(message = "考核年度不能为空")
+ private Integer year;
+
+ @ApiModelProperty("地区ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业编码")
+ @NotNull(message = "企业编码不能为空")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ @NotBlank(message = "企业名称不能为空")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ @NotNull(message = "综合得分不能为空")
+ private Integer totalScore;
+
+ @ApiModelProperty("创建人ID")
+ private Long createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("修改人ID")
+ private Long updateBy;
+
+ @ApiModelProperty("修改时间")
+ private LocalDateTime updateOn;
+
+ @ApiModelProperty("检查地址")
+ private String checkAddress;
+
+ @ApiModelProperty("检查人")
+ private String checkUser;
+
+ @ApiModelProperty("检查部门")
+ private String checkDept;
+
+ @ApiModelProperty("检查内容")
+ @NotBlank(message = "检查内容不能为空")
+ private String checkContent;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleAccidentEvalModReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleAccidentEvalModReq.java
new file mode 100644
index 0000000..a904ed8
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleAccidentEvalModReq.java
@@ -0,0 +1,41 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 车辆出险情况修改参数
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆出险情况修改参数")
+public class VehicleAccidentEvalModReq {
+
+ @ApiModelProperty("主键")
+ @NotNull(message = "id不能为空")
+ private Integer id;
+
+ @ApiModelProperty("车牌号")
+ @NotBlank(message = "车牌号不能为空")
+ private String carNo;
+
+ @ApiModelProperty("累计违章次数")
+ @NotNull(message = "累计违章次数不能为空")
+ private Integer accidentCount;
+
+ @ApiModelProperty("万公里出险次数")
+ @NotNull(message = "万公里出险次数不能为空")
+ private Integer avgAccidentCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleOverSpeedEvalModReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleOverSpeedEvalModReq.java
new file mode 100644
index 0000000..859f1df
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleOverSpeedEvalModReq.java
@@ -0,0 +1,41 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 车辆超速情况修改参数
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆超速情况修改参数")
+public class VehicleOverSpeedEvalModReq {
+
+ @ApiModelProperty("主键")
+ @NotNull(message = "id不能为空")
+ private Integer id;
+
+ @ApiModelProperty("车牌号")
+ @NotBlank(message = "车牌号不能为空")
+ private String carNo;
+
+ @ApiModelProperty("累计超速次数")
+ @NotNull(message = "累计超速次数不能为空")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("万公里超速次数")
+ @NotNull(message = "万公里超速次数不能为空")
+ private Integer avgOverSpeedCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleServiceLifeListReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleServiceLifeListReq.java
new file mode 100644
index 0000000..c00d609
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleServiceLifeListReq.java
@@ -0,0 +1,42 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+/**
+ *
+ * VehicleServiceLifeListReq
+ *
+ *
+ * @author WendyYang
+ * @since 14:24 2022/10/15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("车辆使用年限列表查询参数")
+public class VehicleServiceLifeListReq extends PagePo {
+
+ @ApiModelProperty("车辆购置时间（开始）")
+ private LocalDate buyTimeStart;
+
+ @ApiModelProperty("车辆购置时间（结束）")
+ private LocalDate buyTimeEnd;
+
+ @ApiModelProperty("地域ID")
+ private Long regionId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleViolationEvalModReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleViolationEvalModReq.java
new file mode 100644
index 0000000..fb81664
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/VehicleViolationEvalModReq.java
@@ -0,0 +1,41 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * 车辆违章情况修改参数
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆违章情况修改参数")
+public class VehicleViolationEvalModReq {
+
+ @ApiModelProperty("主键")
+ @NotNull(message = "id不能为空")
+ private Integer id;
+
+ @ApiModelProperty("车牌号")
+ @NotBlank(message = "车牌号不能为空")
+ private String carNo;
+
+ @ApiModelProperty("累计违章次数")
+ @NotNull(message = "累计违章次数不能为空")
+ private Integer violationCount;
+
+ @ApiModelProperty("万公里违章次数")
+ @NotNull(message = "万公里违章次数不能为空")
+ private Integer avgViolationCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/WarnAnalysisListReq.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/WarnAnalysisListReq.java
new file mode 100644
index 0000000..0f31ffb
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/req/WarnAnalysisListReq.java
@@ -0,0 +1,42 @@
+package com.ningdatech.carapi.analysis.entity.req;
+
+import com.ningdatech.basic.model.PagePo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ *
+ * WarnAnalysisListReq
+ *
+ *
+ * @author WendyYang
+ * @since 16:42 2022/10/14
+ */
+@Data
+@ApiModel("预警分析列表查询参数")
+@EqualsAndHashCode(callSuper = true)
+public class WarnAnalysisListReq extends PagePo {
+
+ @ApiModelProperty("地域ID")
+ private Long regionId;
+ private List regionIds;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("驾驶员姓名")
+ private String driverName;
+
+ private String dataScopeSql;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/CompanyWarnStatisticsVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/CompanyWarnStatisticsVo.java
new file mode 100644
index 0000000..f3c650b
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/CompanyWarnStatisticsVo.java
@@ -0,0 +1,39 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
+
+/**
+ *
+ * CompanyWarnStatisticsVo
+ *
+ *
+ * @author WendyYang
+ * @since 17:04 2022/10/25
+ */
+@Data
+@Builder
+public class CompanyWarnStatisticsVo {
+
+ @Tolerate
+ public CompanyWarnStatisticsVo() {
+ }
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("企业地址")
+ private String companyAddress;
+
+ @ApiModelProperty("经度")
+ private String longitude;
+
+ @ApiModelProperty("纬度")
+ private String latitude;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/IndustryStandardsListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/IndustryStandardsListVo.java
new file mode 100644
index 0000000..7188be9
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/IndustryStandardsListVo.java
@@ -0,0 +1,32 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ *
+ * IndustryStandardsListVo
+ *
+ *
+ * @author WendyYang
+ * @since 10:19 2022/10/15
+ */
+@Data
+public class IndustryStandardsListVo {
+
+ private String name;
+
+ private LocalDateTime createOn;
+
+ private Integer downCount;
+
+ private Long fileId;
+
+ private Long id;
+ private Long regionId;
+ private String regionName;
+ private Long companyId;
+ private String companyName;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageGradeVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageGradeVo.java
new file mode 100644
index 0000000..4df5637
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageGradeVo.java
@@ -0,0 +1,40 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 安全管理综合评级列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 14:41 2022/10/13
+ */
+@Data
+@ApiModel("安全管理综合评级列表视图类")
+public class SecurityManageGradeVo {
+
+ @ApiModelProperty("所属地区")
+ private List regions;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("安全评级")
+ private String securityLevel;
+
+ @ApiModelProperty("综合得分")
+ private Integer score;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageResultEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageResultEvalListVo.java
new file mode 100644
index 0000000..113479c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityManageResultEvalListVo.java
@@ -0,0 +1,66 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 安全制度建设分析评估
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@TableName("nd_security_manage_result_eval")
+@ApiModel(value = "SecurityManageResultEval对象", description = "安全制度建设分析评估")
+public class SecurityManageResultEvalListVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("地区")
+ private List regions;
+
+ @ApiModelProperty("企业ID")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("出险次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("出险扣分")
+ private Integer dangerScore;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("死亡扣分")
+ private Integer deadScore;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("受伤扣分")
+ private Integer injuredScore;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityRiskEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityRiskEvalListVo.java
new file mode 100644
index 0000000..b69053c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecurityRiskEvalListVo.java
@@ -0,0 +1,53 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
+
+import java.util.List;
+
+/**
+ *
+ * SecurityRiskEvaluationListVo
+ *
+ *
+ * @author WendyYang
+ * @since 10:17 2022/10/14
+ */
+@Data
+@Builder
+@ApiModel("安全责任分析评估列表视图类")
+public class SecurityRiskEvalListVo {
+
+ @Tolerate
+ public SecurityRiskEvalListVo() {
+ }
+
+ @ApiModelProperty("所属地区")
+ private List regions;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("总分值")
+ private Integer totalScore;
+
+ @ApiModelProperty("安全责任得分")
+ private Integer riskScore;
+
+ @ApiModelProperty("安全承诺得分")
+ private Integer promiseScore;
+
+ @ApiModelProperty("检查内容")
+ private String checkContent;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecuritySystemBuildingEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecuritySystemBuildingEvalListVo.java
new file mode 100644
index 0000000..b75760c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/SecuritySystemBuildingEvalListVo.java
@@ -0,0 +1,47 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
+
+import java.util.List;
+
+/**
+ *
+ * 安全制度建设分析评估列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 10:17 2022/10/14
+ */
+@Data
+@Builder
+@ApiModel("安全制度建设分析评估列表视图类")
+public class SecuritySystemBuildingEvalListVo {
+
+ @Tolerate
+ public SecuritySystemBuildingEvalListVo() {
+ }
+
+ @ApiModelProperty("所属地区")
+ private List regions;
+
+ @ApiModelProperty("年度")
+ private Integer year;
+
+ @ApiModelProperty("企业编码")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("总分值")
+ private Integer totalScore;
+
+ @ApiModelProperty("检查内容")
+ private String checkContent;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleAccidentEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleAccidentEvalListVo.java
new file mode 100644
index 0000000..c5b6e71
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleAccidentEvalListVo.java
@@ -0,0 +1,55 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆出险情况评估列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆出险情况评估列表视图类")
+public class VehicleAccidentEvalListVo {
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("企业id")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车辆风险等级名称")
+ private String dangerLevelName;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计出险次数")
+ private Integer accidentCount;
+
+ @ApiModelProperty("地域")
+ private List regions;
+
+ @ApiModelProperty("万公里出险次数")
+ private Integer avgAccidentCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleOverSpeedEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleOverSpeedEvalListVo.java
new file mode 100644
index 0000000..b79a888
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleOverSpeedEvalListVo.java
@@ -0,0 +1,55 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆超速情况评估列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆超速情况评估列表视图类")
+public class VehicleOverSpeedEvalListVo {
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("企业id")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车辆风险等级名称")
+ private String dangerLevelName;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("地域")
+ private List regions;
+
+ @ApiModelProperty("万公里超速次数")
+ private Integer avgOverSpeedCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleServiceLifeListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleServiceLifeListVo.java
new file mode 100644
index 0000000..5e4bb78
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleServiceLifeListVo.java
@@ -0,0 +1,60 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Tolerate;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ *
+ * 车辆使用年限列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@Builder
+@ApiModel("车辆使用年限列表视图类")
+public class VehicleServiceLifeListVo {
+
+ @Tolerate
+ public VehicleServiceLifeListVo() {
+ }
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("地域信息")
+ private List regions;
+
+ @ApiModelProperty("企业")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("购置时间")
+ private LocalDate buyTime;
+
+ @ApiModelProperty("车辆使用时间")
+ private Integer usedTime;
+
+ @ApiModelProperty("车辆使用年限占比（报废年限）")
+ private Integer usedTimePercent;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleViolationEvalListVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleViolationEvalListVo.java
new file mode 100644
index 0000000..c641366
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/VehicleViolationEvalListVo.java
@@ -0,0 +1,59 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆违章情况评估列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Data
+@ApiModel("车辆违章情况评估列表视图类")
+public class VehicleViolationEvalListVo {
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("企业id")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("车辆风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车辆风险等级名称")
+ private String dangerLevelName;
+
+ @ApiModelProperty("车架号")
+ private String carFrameNo;
+
+ @ApiModelProperty("行驶里程")
+ private Integer mileage;
+
+ @ApiModelProperty("累计违章次数")
+ private Integer violationCount;
+
+ @ApiModelProperty("地域")
+ private List regions;
+
+ @ApiModelProperty("万公里违章次数")
+ private Integer avgViolationCount;
+
+ @ApiModelProperty("备注")
+ private String remark;
+
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCarVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCarVo.java
new file mode 100644
index 0000000..a26fc76
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCarVo.java
@@ -0,0 +1,58 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆综合预警分析
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@ApiModel(value = "车辆综合预警分析列表视图类", description = "")
+public class WarnAnalysisByCarVo {
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private List regions;
+
+ @ApiModelProperty("企业Id")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("出险次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("车辆风险分值")
+ private Integer dangerScore;
+
+ @ApiModelProperty("车牌号")
+ private String carNo;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCompanyVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCompanyVo.java
new file mode 100644
index 0000000..067b90d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByCompanyVo.java
@@ -0,0 +1,54 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 企业综合预警分析列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@ApiModel("企业综合预警分析列表视图类")
+public class WarnAnalysisByCompanyVo {
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ private List regions;
+
+ @ApiModelProperty("企业id")
+ private String companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("综合得分")
+ private Integer totalScore;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+ @ApiModelProperty("出险次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("车辆数")
+ private Integer carCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByDriverVo.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByDriverVo.java
new file mode 100644
index 0000000..3a80e10
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/entity/vo/WarnAnalysisByDriverVo.java
@@ -0,0 +1,59 @@
+package com.ningdatech.carapi.analysis.entity.vo;
+
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ * 驾驶员综合预警分析列表视图类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Data
+@ApiModel("驾驶员综合预警分析列表视图类")
+public class WarnAnalysisByDriverVo {
+
+
+ @ApiModelProperty("主键")
+ private Integer id;
+
+ @ApiModelProperty("地区ID")
+ private List regions;
+
+ @ApiModelProperty("企业id")
+ private Long companyId;
+
+ @ApiModelProperty("企业名称")
+ private String companyName;
+
+ @ApiModelProperty("受伤人数")
+ private Integer injuredCount;
+
+ @ApiModelProperty("死亡人数")
+ private Integer deadCount;
+
+ @ApiModelProperty("出险次数")
+ private Integer dangerCount;
+
+ @ApiModelProperty("车辆风险分值")
+ private Integer dangerScore;
+
+ @ApiModelProperty("驾驶员姓名")
+ private String driverName;
+
+ @ApiModelProperty("风险等级")
+ private Integer dangerLevel;
+
+ @ApiModelProperty("超速次数")
+ private Integer overSpeedCount;
+
+ @ApiModelProperty("违章次数")
+ private Integer violationCount;
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/AnalysisEvalDataViewManage.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/AnalysisEvalDataViewManage.java
new file mode 100644
index 0000000..eabfa5e
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/AnalysisEvalDataViewManage.java
@@ -0,0 +1,312 @@
+package com.ningdatech.carapi.analysis.manage;
+
+import cn.hutool.core.map.MapUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.carapi.analysis.common.DangerLevelEnum;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCompany;
+import com.ningdatech.carapi.analysis.entity.enumeration.DangerLevel;
+import com.ningdatech.carapi.analysis.entity.vo.CompanyWarnStatisticsVo;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCarService;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCompanyService;
+import com.ningdatech.carapi.common.model.DataChartVo;
+import com.ningdatech.carapi.common.model.MapDataVO;
+import com.ningdatech.carapi.safe.entity.NdInsureInfo;
+import com.ningdatech.carapi.safe.service.INdInsureInfoService;
+import com.ningdatech.carapi.sys.entity.dto.CompanyDTO;
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import com.ningdatech.carapi.sys.helper.CompaniesCacheHelper;
+import com.ningdatech.carapi.sys.helper.RegionsCacheHelper;
+import com.ningdatech.carapi.sys.service.CompanyService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.function.ToIntFunction;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * DataViewController
+ *
+ *
+ * @author WendyYang
+ * @since 15:34 2022/10/25
+ */
+@Component
+@AllArgsConstructor
+public class AnalysisEvalDataViewManage {
+
+ private final INdInsureInfoService insureInfoService;
+ private final IWarnAnalysisCompanyService companyWarnAnalysisService;
+ private final IWarnAnalysisCarService carWarnAnalysisService;
+
+ private final RegionsCacheHelper regionsCacheHelper;
+ private final CompaniesCacheHelper companiesCacheHelper;
+ private final CompanyService companyService;
+
+ public List insuranceOrgStatistics(Long regionId) {
+ List childIds = regionsCacheHelper.listChildRegionId(regionId);
+ QueryWrapper query = Wrappers.query();
+ query.select("count(distinct car_plate) as `count`, insure_company as groupKey");
+ query.in("region_id", childIds);
+ query.groupBy("insure_company");
+ List> maps = insureInfoService.listMaps(query);
+ if (maps.isEmpty()) {
+ return Collections.emptyList();
+ }
+ int total = CollUtils.sum(maps, (ToIntFunction>) w -> Long.valueOf(w.get("count").toString()).intValue());
+ return maps.stream().map(w -> {
+ DataChartVo vo = new DataChartVo();
+ vo.setLabel(w.get("groupKey").toString());
+ vo.setValue(Long.valueOf(w.get("count").toString()).intValue());
+ String percent = BigDecimal.valueOf(vo.getValue() * 100)
+ .divide(BigDecimal.valueOf(total), 2, RoundingMode.HALF_UP)
+ .stripTrailingZeros().toPlainString();
+ vo.setPercent(percent);
+ return vo;
+ }).collect(Collectors.toList());
+ }
+
+ public List companyWarnStatistics(Long regionId) {
+ List regionIds = regionsCacheHelper.listChildRegionId(regionId);
+ QueryWrapper query = Wrappers.query();
+ query.select("company_id companyId, danger_level dangerLevel");
+ query.in("region_id", regionIds);
+ List> analysisCompanies = companyWarnAnalysisService.listMaps(query);
+ if (analysisCompanies.size() == 0) {
+ return Collections.emptyList();
+ }
+ List result = new ArrayList<>();
+ analysisCompanies.forEach(w -> {
+ CompanyDTO company = companiesCacheHelper.getById(MapUtil.getLong(w, "companyId"));
+ if (Objects.isNull(company)) {
+ return;
+ }
+ CompanyWarnStatisticsVo vo = CompanyWarnStatisticsVo.builder()
+ .companyAddress(company.getAddress())
+ .companyName(company.getName())
+ .dangerLevel(MapUtil.getInt(w, "dangerLevel"))
+ .longitude(company.getLongitude())
+ .latitude(company.getLatitude())
+ .build();
+ result.add(vo);
+ });
+ return result;
+ }
+
+ public List carWarnStatistics(Long regionId) {
+ List regionIds = regionsCacheHelper.listChildRegionId(regionId);
+ QueryWrapper query = Wrappers.query();
+ query.select("count(1) `count`, region_id regionId");
+ query.in("region_id", regionIds);
+ query.groupBy("region_id");
+ List> carAnalysis = carWarnAnalysisService.listMaps(query);
+ if (carAnalysis.size() == 0) {
+ return Collections.emptyList();
+ }
+ Map> childrenMap = regionsCacheHelper.getChildrenMap(regionId, true);
+ List result = new ArrayList<>();
+ childrenMap.forEach((k, v) -> {
+ MapDataVO mapData = MapDataVO.builder()
+ .regionName(k.getRegionName())
+ .regionCode(k.getRegionCode())
+ .regionId(k.getId())
+ .value(0)
+ .build();
+ carAnalysis.removeIf(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ mapData.setValue(MapUtil.getInt(w, "count") + mapData.getValue());
+ return true;
+ }
+ return false;
+ });
+ result.add(mapData);
+ });
+ return result;
+ }
+
+ private QueryWrapper buildCountQueryGroupByRegion(List regionIds, Integer dangerLevel) {
+ QueryWrapper query = Wrappers.query();
+ query.select("count(1) as `count`, region_id as regionId");
+ query.in("region_id", regionIds);
+ query.eq(Objects.nonNull(dangerLevel),"danger_level", dangerLevel);
+ query.groupBy("region_id");
+ return query;
+ }
+
+ public List companyWarnStatisticsByLevel(Long regionId, Integer dangerLevel) {
+ List result = new ArrayList<>();
+ List regionIds = regionsCacheHelper.listChildRegionId(regionId);
+ //QueryWrapper query = buildCountQueryGroupByRegion(regionIds, dangerLevel);
+ //List> analysisCompanies = companyWarnAnalysisService.listMaps(query);
+
+ // 获取红色预警的数据
+ QueryWrapper queryRed = buildCountQueryGroupByRegion(regionIds, DangerLevel.RED.getCode());
+ List> analysisCompaniesRed = companyWarnAnalysisService.listMaps(queryRed);
+ // 获取橙色预警的数据
+ QueryWrapper queryOrange = buildCountQueryGroupByRegion(regionIds, DangerLevel.ORANGE.getCode());
+ List> analysisCompaniesOrange = companyWarnAnalysisService.listMaps(queryOrange);
+ // 获取黄色预警的数据
+ QueryWrapper queryYellow = buildCountQueryGroupByRegion(regionIds, DangerLevel.YELLOW.getCode());
+ List> analysisCompaniesYellow = companyWarnAnalysisService.listMaps(queryYellow);
+ // 获取蓝色预警的数据
+ QueryWrapper queryBlue = buildCountQueryGroupByRegion(regionIds, DangerLevel.BLUE.getCode());
+ List> analysisCompaniesBlue = companyWarnAnalysisService.listMaps(queryBlue);
+
+ Map> childrenMap = regionsCacheHelper.getChildrenMap(regionId, true);
+ // 如果是区县一级的,只返回区县一级的名字和数量
+ if (childrenMap.size() == 0) {
+ RegionDTO regionDto = regionsCacheHelper.getByRegionId(regionId);
+ String regionName = regionDto.getRegionName();
+ DataChartVo voRed = new DataChartVo(regionName, 0);
+ analysisCompaniesRed.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (regionId.equals(currRegionId)) {
+ voRed.setValue(voRed.getValue() + MapUtil.getInt(w, "count"));
+ voRed.setDangerLevel(DangerLevel.RED.getCode());
+ }
+ });
+ result.add(voRed);
+
+ DataChartVo voOrange = new DataChartVo(regionName, 0);
+ analysisCompaniesOrange.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (regionId.equals(currRegionId)) {
+ voOrange.setValue(voOrange.getValue() + MapUtil.getInt(w, "count"));
+ voOrange.setDangerLevel(DangerLevel.ORANGE.getCode());
+ }
+ });
+ result.add(voOrange);
+
+ DataChartVo voYellow = new DataChartVo(regionName, 0);
+ analysisCompaniesYellow.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (regionId.equals(currRegionId)) {
+ voYellow.setValue(voYellow.getValue() + MapUtil.getInt(w, "count"));
+ voYellow.setDangerLevel(DangerLevel.YELLOW.getCode());
+ }
+ });
+ result.add(voYellow);
+
+ DataChartVo voBlue = new DataChartVo(regionName, 0);
+ analysisCompaniesBlue.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (regionId.equals(currRegionId)) {
+ voBlue.setValue(voBlue.getValue() + MapUtil.getInt(w, "count"));
+ voBlue.setDangerLevel(DangerLevel.BLUE.getCode());
+ }
+ });
+ result.add(voBlue);
+ return result;
+ } else {
+ childrenMap.forEach((k, v) -> {
+ DataChartVo voRed = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesRed.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voRed.setValue(voRed.getValue() + MapUtil.getInt(w, "count"));
+ voRed.setDangerLevel(DangerLevel.RED.getCode());
+ }
+ });
+ result.add(voRed);
+
+ DataChartVo voOrange = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesOrange.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voOrange.setValue(voOrange.getValue() + MapUtil.getInt(w, "count"));
+ voOrange.setDangerLevel(DangerLevel.ORANGE.getCode());
+ }
+ });
+ result.add(voOrange);
+
+ DataChartVo voYellow = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesYellow.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voYellow.setValue(voYellow.getValue() + MapUtil.getInt(w, "count"));
+ voYellow.setDangerLevel(DangerLevel.YELLOW.getCode());
+ }
+ });
+ result.add(voYellow);
+
+ DataChartVo voBlue = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesBlue.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voBlue.setValue(voBlue.getValue() + MapUtil.getInt(w, "count"));
+ voBlue.setDangerLevel(DangerLevel.BLUE.getCode());
+ }
+ });
+ result.add(voBlue);
+ });
+ return result;
+ }
+ }
+
+ public List carWarnStatisticsByLevel(Long regionId, Integer dangerLevel) {
+ List result = new ArrayList<>();
+ List regionIds = regionsCacheHelper.listChildRegionId(regionId);
+ List> analysisCompanies = Lists.newArrayList();
+ // 获取红色预警的数据
+ QueryWrapper queryRed = buildCountQueryGroupByRegion(regionIds, DangerLevel.RED.getCode());
+ List> analysisCompaniesRed = carWarnAnalysisService.listMaps(queryRed);
+ // 获取橙色预警的数据
+ QueryWrapper queryOrange = buildCountQueryGroupByRegion(regionIds, DangerLevel.ORANGE.getCode());
+ List> analysisCompaniesOrange = carWarnAnalysisService.listMaps(queryOrange);
+ // 获取黄色预警的数据
+ QueryWrapper queryYellow = buildCountQueryGroupByRegion(regionIds, DangerLevel.YELLOW.getCode());
+ List> analysisCompaniesYellow = carWarnAnalysisService.listMaps(queryYellow);
+ // 获取蓝色预警的数据
+ QueryWrapper queryBlue = buildCountQueryGroupByRegion(regionIds, DangerLevel.BLUE.getCode());
+ List> analysisCompaniesBlue = carWarnAnalysisService.listMaps(queryBlue);
+ Map> childrenMap = regionsCacheHelper.getChildrenMap(regionId, true);
+ childrenMap.forEach((k, v) -> {
+ DataChartVo voRed = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesRed.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voRed.setValue(voRed.getValue() + MapUtil.getInt(w, "count"));
+ voRed.setDangerLevel(DangerLevel.RED.getCode());
+ }
+ });
+ result.add(voRed);
+ DataChartVo voOrange = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesOrange.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voOrange.setValue(voOrange.getValue() + MapUtil.getInt(w, "count"));
+ voOrange.setDangerLevel(DangerLevel.ORANGE.getCode());
+ }
+ });
+ result.add(voOrange);
+ DataChartVo voYellow = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesYellow.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voYellow.setValue(voYellow.getValue() + MapUtil.getInt(w, "count"));
+ voYellow.setDangerLevel(DangerLevel.YELLOW.getCode());
+ }
+ });
+ result.add(voYellow);
+ DataChartVo voBlue = new DataChartVo(k.getRegionName(), 0);
+ analysisCompaniesBlue.forEach(w -> {
+ Long currRegionId = MapUtil.getLong(w, "regionId");
+ if (v.contains(currRegionId)) {
+ voBlue.setValue(voBlue.getValue() + MapUtil.getInt(w, "count"));
+ voBlue.setDangerLevel(DangerLevel.BLUE.getCode());
+ }
+ });
+ result.add(voBlue);
+ });
+ return result;
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/IndustryStandardsManage.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/IndustryStandardsManage.java
new file mode 100644
index 0000000..5f77ecc
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/IndustryStandardsManage.java
@@ -0,0 +1,132 @@
+package com.ningdatech.carapi.analysis.manage;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.springframework.aop.framework.AopContext;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.carapi.analysis.entity.IndustryStandards;
+import com.ningdatech.carapi.analysis.entity.req.IndustryStandardsListReq;
+import com.ningdatech.carapi.analysis.entity.req.IndustryStandardsSaveReq;
+import com.ningdatech.carapi.analysis.entity.vo.IndustryStandardsListVo;
+import com.ningdatech.carapi.analysis.service.IIndustryStandardsService;
+import com.ningdatech.carapi.common.constant.UserRoleTypeEnum;
+import com.ningdatech.carapi.common.contants.DefValConstants;
+import com.ningdatech.carapi.common.util.CodeUtil;
+import com.ningdatech.carapi.datascope.aop.LambdaDataScope;
+import com.ningdatech.carapi.datascope.contants.LambdaDataScopeTypeEnum;
+import com.ningdatech.carapi.user.security.auth.model.UserInfoDetails;
+import com.ningdatech.carapi.user.util.LoginUserUtil;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+
+/**
+ *
+ * IndustryStandardsManage
+ *
+ *
+ * @author WendyYang
+ * @since 10:24 2022/10/15
+ */
+@Component
+@RequiredArgsConstructor
+public class IndustryStandardsManage {
+
+ private final IIndustryStandardsService industryStandardsService;
+
+ public PageVo list(IndustryStandardsListReq req) {
+ Integer pageNumber = req.getPageNumber();
+ Integer pageSize = req.getPageSize();
+
+ UserInfoDetails userInfoDetails = LoginUserUtil.loginUserDetail();
+ Long roleId = userInfoDetails.getRoleId();
+
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(IndustryStandards.class);
+ IndustryStandardsManage context = (IndustryStandardsManage) AopContext.currentProxy();
+ context.buildQuery(query,req);
+
+ List standardsList = industryStandardsService.list(query);
+ // 省级部门上传的文件(上传企业所属区域为省级)，按照文件类型，下级账号也要能看到
+ if (!UserRoleTypeEnum.SYSTEM_ADMIN_ROLE_ID.getId().equals(roleId)) {
+ List standards = industryStandardsService.list(Wrappers.lambdaQuery(IndustryStandards.class)
+ .eq(IndustryStandards::getRegionId, DefValConstants.ZJREGION_ID)
+ .eq(IndustryStandards::getType,req.getType()));
+ standardsList.addAll(standards);
+ }
+
+ if (CollUtil.isEmpty(standardsList)){
+ return PageVo.empty();
+ }
+
+ List records = standardsList.stream()
+ .skip((long) (pageNumber - 1) * pageSize)
+ .limit(pageSize)
+ .collect(Collectors.toList());
+
+ //Page page = industryStandardsService.page(req.page(), query);
+
+ List data = CollUtils.convert(records, w -> {
+ IndustryStandardsListVo vo = BeanUtil.copyProperties(w, IndustryStandardsListVo.class);
+ CodeUtil.searchCompanyNameAndRegionName(vo);
+ return vo;
+ });
+ return PageVo.of(data, standardsList.size());
+ }
+ @LambdaDataScope
+ public void buildQuery(LambdaQueryWrapper query,IndustryStandardsListReq req) {
+ query.orderByDesc(IndustryStandards::getId).eq(IndustryStandards::getType, req.getType())
+ .like(StrUtil.isNotBlank(req.getFileName()), IndustryStandards::getName, req.getFileName())
+ .ge(req.getStartTime() != null, IndustryStandards::getCreateOn, req.getStartTime())
+ .le(req.getEndTime() != null, IndustryStandards::getCreateOn, req.getEndTime());
+ }
+
+ public void save(IndustryStandardsSaveReq req) {
+ IndustryStandards industryStandards = BeanUtil.copyProperties(req, IndustryStandards.class);
+ industryStandards.setCreateBy(LoginUserUtil.getUserId());
+ industryStandards.setCreateOn(LocalDateTime.now());
+ industryStandards.setRegionId(LoginUserUtil.loginUserDetail().getRegionId());
+ industryStandards.setCompanyId(LoginUserUtil.loginUserDetail().getCompanyId());
+ industryStandardsService.save(industryStandards);
+ }
+
+ public void incrementDownCount(Long id) {
+ industryStandardsService.incrementDownCount(id);
+ }
+
+ public void deleteStandardFile(Long id, Long roleId) {
+
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(IndustryStandards.class);
+ IndustryStandardsManage context = (IndustryStandardsManage) AopContext.currentProxy();
+ context.buildStandardFileQuery(wrapper, id);
+ IndustryStandards standards = industryStandardsService.getOne(wrapper);
+ if (Objects.isNull(standards)){
+ throw new BizException("文件无法删除!");
+ }
+ // IndustryStandards standards = industryStandardsService.getById(id);
+ // 如果文件是省级部门上传的文件，只有省级管理员角色可以删除
+ Long regionId = standards.getRegionId();
+ if (Objects.nonNull(regionId) &&
+ DefValConstants.ZJREGION_ID.equals(regionId)){
+ // 判断登录用户角色是否为省管理员
+ if (!UserRoleTypeEnum.SYSTEM_ADMIN_ROLE_ID.getId().equals(roleId)){
+ throw new BizException("您没有权限删除该文件!");
+ }
+ }
+ industryStandardsService.deleteById(id);
+ }
+ @LambdaDataScope(type = LambdaDataScopeTypeEnum.ALL)
+ public void buildStandardFileQuery(LambdaQueryWrapper wrapper, Long id) {
+ wrapper.eq(IndustryStandards::getId,id);
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/InsuranceRiskEvalManage.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/InsuranceRiskEvalManage.java
new file mode 100644
index 0000000..f808977
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/InsuranceRiskEvalManage.java
@@ -0,0 +1,568 @@
+package com.ningdatech.carapi.analysis.manage;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.carapi.analysis.common.DangerLevelEnum;
+import com.ningdatech.carapi.analysis.entity.VehicleAccidentEval;
+import com.ningdatech.carapi.analysis.entity.VehicleOverSpeedEval;
+import com.ningdatech.carapi.analysis.entity.VehicleServiceLife;
+import com.ningdatech.carapi.analysis.entity.VehicleViolationEval;
+import com.ningdatech.carapi.analysis.entity.dto.OutDangerImportDto;
+import com.ningdatech.carapi.analysis.entity.dto.VehicleAccidentImportDto;
+import com.ningdatech.carapi.analysis.entity.dto.VehicleOverSpeedImportDto;
+import com.ningdatech.carapi.analysis.entity.dto.VehicleViolationImportDto;
+import com.ningdatech.carapi.analysis.entity.req.VehicleAccidentEvalModReq;
+import com.ningdatech.carapi.analysis.entity.req.VehicleOverSpeedEvalModReq;
+import com.ningdatech.carapi.analysis.entity.req.VehicleServiceLifeListReq;
+import com.ningdatech.carapi.analysis.entity.req.VehicleViolationEvalModReq;
+import com.ningdatech.carapi.analysis.entity.vo.VehicleAccidentEvalListVo;
+import com.ningdatech.carapi.analysis.entity.vo.VehicleOverSpeedEvalListVo;
+import com.ningdatech.carapi.analysis.entity.vo.VehicleServiceLifeListVo;
+import com.ningdatech.carapi.analysis.entity.vo.VehicleViolationEvalListVo;
+import com.ningdatech.carapi.analysis.service.IVehicleAccidentEvalService;
+import com.ningdatech.carapi.analysis.service.IVehicleOverSpeedEvalService;
+import com.ningdatech.carapi.analysis.service.IVehicleServiceLifeService;
+import com.ningdatech.carapi.analysis.service.IVehicleViolationEvalService;
+import com.ningdatech.carapi.car.vehicle.model.NdVehicleBaseInfo;
+import com.ningdatech.carapi.car.vehicle.service.IVehicleBaseInfoService;
+import com.ningdatech.carapi.common.aop.BuildChildrenRegionWrapper;
+import com.ningdatech.carapi.common.util.CodeUtil;
+import com.ningdatech.carapi.datascope.aop.LambdaDataScope;
+import com.ningdatech.carapi.datascope.contants.LambdaDataScopeTypeEnum;
+import com.ningdatech.carapi.safe.entity.NdInsureInfo;
+import com.ningdatech.carapi.safe.entity.NdInsureOutDanger;
+import com.ningdatech.carapi.safe.service.INdInsureInfoService;
+import com.ningdatech.carapi.safe.service.INdInsureOutDangerService;
+import com.ningdatech.carapi.safe.service.IVehicleAccidentReportService;
+import com.ningdatech.carapi.scheduler.enums.DataTypeEnum;
+import com.ningdatech.carapi.sys.entity.Company;
+import com.ningdatech.carapi.sys.entity.constant.ImportTemplateConstant;
+import com.ningdatech.carapi.sys.entity.enumeration.ImportTemplateEnum;
+import com.ningdatech.carapi.sys.helper.RegionsCacheHelper;
+import com.ningdatech.carapi.sys.service.CompanyService;
+import com.ningdatech.carapi.user.util.LoginUserUtil;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.poi.excel.ExcelReader;
+import cn.hutool.poi.excel.ExcelUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ *
+ * InsuranceRiskEvalManage
+ *
+ *
+ * @author WendyYang
+ * @since 14:31 2022/10/15
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class InsuranceRiskEvalManage {
+
+ private final IVehicleServiceLifeService vehicleServiceLifeService;
+ private final IVehicleViolationEvalService vehicleViolationEvalService;
+ private final IVehicleOverSpeedEvalService vehicleOverSpeedEvalService;
+ private final IVehicleAccidentEvalService vehicleAccidentEvalService;
+ private final INdInsureOutDangerService ndInsureOutDangerService;
+ private final RegionsCacheHelper regionsCacheHelper;
+ private final IVehicleBaseInfoService vehicleBaseInfoService;
+ private final CompanyService companyService;
+ private final INdInsureInfoService insureInfoService;
+
+ private final ApplicationContext applicationContext;
+
+ private final IVehicleAccidentReportService vehicleAccidentReportService;
+
+ /**
+ * 车辆使用年限列表
+ */
+ public PageVo vehicleServiceLifeList(VehicleServiceLifeListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(VehicleServiceLife.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildVehicleServiceLife(query,req);
+ Page page = vehicleServiceLifeService.page(req.page(), query);
+ List res = page.getRecords().stream().map(w -> {
+ VehicleServiceLifeListVo vo = BeanUtil.copyProperties(w,VehicleServiceLifeListVo.class);
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ int usedTime = Optional.ofNullable(w.getBuyTime())
+ .flatMap(time -> Optional.ofNullable((int) ChronoUnit.YEARS.between(time, LocalDate.now())))
+ .orElse(0);
+ vo.setUsedTime(usedTime);
+ // TODO 车辆使用年限百分比
+ vo.setUsedTimePercent(0);
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildVehicleServiceLife(LambdaQueryWrapper query,VehicleServiceLifeListReq req) {
+ query.ge(req.getBuyTimeStart() != null, VehicleServiceLife::getBuyTime, req.getBuyTimeStart())
+ .le(req.getBuyTimeEnd() != null, VehicleServiceLife::getBuyTime, req.getBuyTimeEnd())
+ .like(StrUtil.isNotBlank(req.getCompanyName()), VehicleServiceLife::getCompanyName, req.getCompanyName())
+ .like(StrUtil.isNotBlank(req.getCarNo()), VehicleServiceLife::getCarNo, req.getCarNo())
+ .eq(Objects.nonNull(req.getDangerLevel()), VehicleServiceLife::getDangerLevel, req.getDangerLevel());
+ }
+
+ /**
+ * 车辆违章情况列表
+ *
+ */
+ public PageVo vehicleViolationEvalList(VehicleServiceLifeListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(VehicleViolationEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildVehicleViolationEvalQuery(query,req);
+ buildVehicleViolationEvalQuery(query,req);
+ Page page = vehicleViolationEvalService.page(req.page(), query);
+ List res = page.getRecords().stream().map(w -> {
+ VehicleViolationEvalListVo vo = BeanUtil.copyProperties(w,VehicleViolationEvalListVo.class);
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ vo.setDangerLevelName(DangerLevelEnum.getDescByCode(w.getDangerLevel()));
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildVehicleViolationEvalQuery(LambdaQueryWrapper query,VehicleServiceLifeListReq req) {
+ query.like(StrUtil.isNotBlank(req.getCompanyName()),VehicleViolationEval::getCompanyName, req.getCompanyName())
+ .like(StrUtil.isNotBlank(req.getCarNo()),VehicleViolationEval::getCarNo, req.getCarNo())
+ .eq(Objects.nonNull(req.getDangerLevel()),VehicleViolationEval::getDangerLevel, req.getDangerLevel());
+ }
+
+ /**
+ * 车辆出险情况列表
+ */
+ public PageVo vehicleAccidentList(VehicleServiceLifeListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(VehicleAccidentEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildVehicleAccident(query,req);
+ Page page = vehicleAccidentEvalService.page(req.page(), query);
+ List res = page.getRecords().stream().map(w -> {
+ VehicleAccidentEvalListVo vo = BeanUtil.copyProperties(w,VehicleAccidentEvalListVo.class);
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ vo.setDangerLevelName(DangerLevelEnum.getDescByCode(w.getDangerLevel()));
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res,page.getTotal());
+ }
+
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildVehicleAccident(LambdaQueryWrapper query,VehicleServiceLifeListReq req) {
+ query.like(StrUtil.isNotBlank(req.getCompanyName()), VehicleAccidentEval::getCompanyName, req.getCompanyName())
+ .like(StrUtil.isNotBlank(req.getCarNo()), VehicleAccidentEval::getCarNo, req.getCarNo())
+ .eq(Objects.nonNull(req.getDangerLevel()), VehicleAccidentEval::getDangerLevel, req.getDangerLevel());
+ }
+
+ /**
+ * 车辆超速情况列表
+ */
+ public PageVo vehicleOverSpeedList(VehicleServiceLifeListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(VehicleOverSpeedEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildVehicleOverSpeed(query,req);
+ Page page = vehicleOverSpeedEvalService.page(req.page(), query);
+ List res = page.getRecords().stream().map(w -> {
+ VehicleOverSpeedEvalListVo vo = BeanUtil.copyProperties(w,VehicleOverSpeedEvalListVo.class);
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ vo.setDangerLevelName(DangerLevelEnum.getDescByCode(w.getDangerLevel()));
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res,page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildVehicleOverSpeed(LambdaQueryWrapper query,VehicleServiceLifeListReq req) {
+ query.like(StrUtil.isNotBlank(req.getCompanyName()), VehicleOverSpeedEval::getCompanyName, req.getCompanyName())
+ .like(StrUtil.isNotBlank(req.getCarNo()), VehicleOverSpeedEval::getCarNo, req.getCarNo())
+ .eq(Objects.nonNull(req.getDangerLevel()), VehicleOverSpeedEval::getDangerLevel, req.getDangerLevel());
+ }
+
+ public void vehicleViolationEvalMod(VehicleViolationEvalModReq req) {
+ VehicleViolationEval violationEval = BeanUtil.copyProperties(req, VehicleViolationEval.class);
+ violationEval.setRemark(StrUtil.nullToEmpty(violationEval.getRemark()));
+ violationEval.setUpdateBy(LoginUserUtil.getUserId());
+ violationEval.setUpdateOn(LocalDateTime.now());
+ boolean update = vehicleViolationEvalService.updateById(violationEval);
+ Assert.isTrue(update, "记录不存在");
+ }
+
+ public void vehicleAccidentEvalMod(VehicleAccidentEvalModReq req) {
+ VehicleAccidentEval accidentEval = BeanUtil.copyProperties(req, VehicleAccidentEval.class);
+ accidentEval.setRemark(StrUtil.nullToEmpty(accidentEval.getRemark()));
+ accidentEval.setUpdateBy(LoginUserUtil.getUserId());
+ accidentEval.setUpdateOn(LocalDateTime.now());
+ boolean update = vehicleAccidentEvalService.updateById(accidentEval);
+ Assert.isTrue(update, "记录不存在");
+ }
+
+ public void vehicleOverSpeedEvalMod(VehicleOverSpeedEvalModReq req) {
+ VehicleOverSpeedEval overSpeedEval = BeanUtil.copyProperties(req, VehicleOverSpeedEval.class);
+ overSpeedEval.setRemark(StrUtil.nullToEmpty(overSpeedEval.getRemark()));
+ overSpeedEval.setUpdateBy(LoginUserUtil.getUserId());
+ overSpeedEval.setUpdateOn(LocalDateTime.now());
+ boolean update = vehicleOverSpeedEvalService.updateById(overSpeedEval);
+ Assert.isTrue(update, "记录不存在");
+ }
+
+ public void vehicleViolationEvalDel(Integer id) {
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(VehicleViolationEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildQuery(wrapper, id);
+ VehicleViolationEval violationEval = vehicleViolationEvalService.getOne(wrapper);
+ if (Objects.isNull(violationEval)){
+ throw new BizException("文件无法删除!");
+ }
+ vehicleViolationEvalService.removeById(id);
+ }
+
+ @LambdaDataScope(type = LambdaDataScopeTypeEnum.ALL)
+ public void buildQuery(LambdaQueryWrapper wrapper, Integer id) {
+ wrapper.eq(VehicleViolationEval::getId,id);
+ }
+
+ public void vehicleAccidentEvalDel(Integer id) {
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(VehicleAccidentEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildAccidentEvalQuery(wrapper, id);
+ VehicleAccidentEval accidentEval = vehicleAccidentEvalService.getOne(wrapper);
+ if (Objects.isNull(accidentEval)){
+ throw new BizException("文件无法删除!");
+ }
+ vehicleAccidentEvalService.removeById(id);
+ }
+
+ @LambdaDataScope(type = LambdaDataScopeTypeEnum.ALL)
+ public void buildAccidentEvalQuery(LambdaQueryWrapper wrapper, Integer id) {
+ wrapper.eq(VehicleAccidentEval::getId,id);
+ }
+
+ public void vehicleOverSpeedEvalDel(Integer id) {
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(VehicleOverSpeedEval.class);
+ InsuranceRiskEvalManage context = (InsuranceRiskEvalManage) AopContext.currentProxy();
+ context.buildStandardFileQuery(wrapper, id);
+ VehicleOverSpeedEval overSpeedEval = vehicleOverSpeedEvalService.getOne(wrapper);
+ if (Objects.isNull(overSpeedEval)){
+ throw new BizException("文件无法删除!");
+ }
+ vehicleOverSpeedEvalService.removeById(id);
+ }
+ @LambdaDataScope(type = LambdaDataScopeTypeEnum.ALL)
+ public void buildStandardFileQuery(LambdaQueryWrapper wrapper, Integer id) {
+ wrapper.eq(VehicleOverSpeedEval::getId,id);
+ }
+
+ private void importVehicleViolationData(List importDataList) {
+ if (CollectionUtils.isEmpty(importDataList)) {
+ return;
+ }
+ List violationEvalList = new ArrayList<>();
+ List carNos = CollUtils.fieldList(importDataList, VehicleViolationImportDto::getCarNo);
+ Assert.isTrue(carNos.size() == importDataList.size(), "车牌号不可重复");
+ Map carInfoMap = vehicleBaseInfoService.listByCarNo(carNos);
+ Assert.isTrue(carNos.size() == carInfoMap.size(), "请确保所有车牌号存在");
+ List companyIds = CollUtils.fieldList(carInfoMap.values(), NdVehicleBaseInfo::getCompanyId);
+ Map companyMap = companyService.listCompanyByIds(companyIds);
+ Long userId = LoginUserUtil.getUserId();
+ LocalDateTime now = LocalDateTime.now();
+ importDataList.forEach(w -> {
+ VehicleViolationEval eval = new VehicleViolationEval();
+ eval.setCreateBy(userId);
+ eval.setCreateOn(now);
+ eval.setUpdateBy(userId);
+ eval.setUpdateOn(now);
+ eval.setViolationCount(w.getViolationCount());
+ eval.setRemark(w.getRemark());
+ eval.setAvgViolationCount(w.getAvgViolationCount());
+ eval.setCarNo(w.getCarNo());
+ eval.setMileage(w.getMileage());
+ NdVehicleBaseInfo carInfo = carInfoMap.get(w.getCarNo());
+ eval.setCarId(carInfo.getId());
+ eval.setCompanyId(carInfo.getCompanyId());
+ Company company = companyMap.get(eval.getCompanyId());
+ eval.setCompanyName(company.getName());
+ eval.setRegionId(company.getRegionId());
+ eval.setCarFrameNo(w.getChassisNumber());
+ eval.setDangerLevel(DangerLevelEnum.getCodeByDesc(w.getRiskEvaluation()));
+ violationEvalList.add(eval);
+ });
+ LambdaQueryWrapper delQuery = Wrappers.lambdaQuery(VehicleViolationEval.class)
+ .in(VehicleViolationEval::getCarNo, carNos);
+ vehicleViolationEvalService.remove(delQuery);
+ vehicleViolationEvalService.saveBatch(violationEvalList);
+ }
+
+ private void importVehicleOverSpeedData(List importDataList) {
+ if (CollectionUtils.isEmpty(importDataList)) {
+ return;
+ }
+ List carNos = CollUtils.fieldList(importDataList, VehicleOverSpeedImportDto::getCarNo);
+ Assert.isTrue(carNos.size() == importDataList.size(), "车牌号不可重复");
+ Map carInfoMap = vehicleBaseInfoService.listByCarNo(carNos);
+ Assert.isTrue(carNos.size() == carInfoMap.size(), "请确保所有车牌号存在");
+ List companyIds = CollUtils.fieldList(carInfoMap.values(), NdVehicleBaseInfo::getCompanyId);
+ Map companyMap = companyService.listCompanyByIds(companyIds);
+ List violationEvalList = new ArrayList<>();
+ Long userId = LoginUserUtil.getUserId();
+ LocalDateTime now = LocalDateTime.now();
+ importDataList.forEach(w -> {
+ VehicleOverSpeedEval eval = new VehicleOverSpeedEval();
+ eval.setCreateBy(userId);
+ eval.setCreateOn(now);
+ eval.setUpdateBy(userId);
+ eval.setUpdateOn(now);
+ eval.setOverSpeedCount(w.getOverSpeedCount());
+ eval.setRemark(w.getRemark());
+ eval.setAvgOverSpeedCount(w.getAvgOverSpeedCount());
+ eval.setCarNo(w.getCarNo());
+ eval.setMileage(w.getMileage());
+ NdVehicleBaseInfo carInfo = carInfoMap.get(w.getCarNo());
+ eval.setCarId(carInfo.getId());
+ eval.setCompanyId(carInfo.getCompanyId());
+ Company company = companyMap.get(eval.getCompanyId());
+ eval.setCompanyName(company.getName());
+ eval.setRegionId(company.getRegionId());
+ eval.setCarFrameNo(w.getChassisNumber());
+ eval.setDangerLevel(DangerLevelEnum.getCodeByDesc(w.getRiskEvaluation()));
+ violationEvalList.add(eval);
+ });
+ LambdaQueryWrapper delQuery = Wrappers.lambdaQuery(VehicleOverSpeedEval.class)
+ .in(VehicleOverSpeedEval::getCarNo, carNos);
+ vehicleOverSpeedEvalService.remove(delQuery);
+ vehicleOverSpeedEvalService.saveBatch(violationEvalList);
+ }
+
+ private void importVehicleAccidentData(List importDataList) {
+ if (CollectionUtils.isEmpty(importDataList)) {
+ return;
+ }
+ List carNos = CollUtils.fieldList(importDataList, VehicleAccidentImportDto::getCarNo);
+ Assert.isTrue(carNos.size() == importDataList.size(), "车牌号不可重复");
+ Map carInfoMap = vehicleBaseInfoService.listByCarNo(carNos);
+ Assert.isTrue(carNos.size() == carInfoMap.size(), "请确保所有车牌号存在");
+ List companyIds = CollUtils.fieldList(carInfoMap.values(), NdVehicleBaseInfo::getCompanyId);
+ Map companyMap = companyService.listCompanyByIds(companyIds);
+ List violationEvalList = new ArrayList<>();
+ Long userId = LoginUserUtil.getUserId();
+ LocalDateTime now = LocalDateTime.now();
+ importDataList.forEach(w -> {
+ VehicleAccidentEval eval = new VehicleAccidentEval();
+ eval.setCreateBy(userId);
+ eval.setCreateOn(now);
+ eval.setUpdateBy(userId);
+ eval.setUpdateOn(now);
+ eval.setAccidentCount(w.getAccidentCount());
+ eval.setRemark(w.getRemark());
+ eval.setAvgAccidentCount(w.getAvgAccidentCount());
+ eval.setCarNo(w.getCarNo());
+ eval.setMileage(w.getMileage());
+ NdVehicleBaseInfo carInfo = carInfoMap.get(w.getCarNo());
+ eval.setCarId(carInfo.getId());
+ eval.setCompanyId(carInfo.getCompanyId());
+ Company company = companyMap.get(eval.getCompanyId());
+ eval.setCompanyName(company.getName());
+ eval.setRegionId(company.getRegionId());
+ eval.setCarFrameNo(w.getChassisNumber());
+ eval.setDangerLevel(DangerLevelEnum.getCodeByDesc(w.getRiskEvaluation()));
+ violationEvalList.add(eval);
+ });
+ LambdaQueryWrapper delQuery = Wrappers.lambdaQuery(VehicleAccidentEval.class)
+ .in(VehicleAccidentEval::getCarNo, carNos);
+ vehicleAccidentEvalService.remove(delQuery);
+ vehicleAccidentEvalService.saveBatch(violationEvalList);
+ }
+
+ private void importOutDangerData(List importDataList) {
+ if (CollectionUtils.isEmpty(importDataList)) {
+ return;
+ }
+ List carNos = CollUtils.fieldList(importDataList, OutDangerImportDto::getCarNo);
+ // Assert.isTrue(carNos.size() == importDataList.size(), "车牌号不可重复");
+ Map carInfoMap = vehicleBaseInfoService.listByCarNo(carNos);
+ Assert.isTrue(carNos.size() == carInfoMap.size(), "请确保所有车牌号存在");
+ List companyIds = CollUtils.fieldList(carInfoMap.values(), NdVehicleBaseInfo::getCompanyId);
+ Map companyMap = companyService.listCompanyByIds(companyIds);
+ Map insureCompanyInfoMap = insureInfoService.listInsureCompanyByCompanyIds(companyIds);
+
+ List ndInsureOutDangers = new ArrayList<>();
+ Long userId = LoginUserUtil.getUserId();
+ LocalDateTime now = LocalDateTime.now();
+ importDataList.forEach(w -> {
+ NdInsureOutDanger eval = new NdInsureOutDanger();
+ eval.setCreateBy(userId);
+ eval.setCreateOn(now);
+ eval.setUpdateBy(userId);
+ eval.setUpdateOn(now);
+
+ NdVehicleBaseInfo carInfo = carInfoMap.get(w.getCarNo());
+ Company company = companyMap.get(carInfo.getCompanyId());
+
+ DateTime parse = DateUtil.parse(w.getAccidentTime());
+ Instant instant = parse.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime accidentTime = instant.atZone(zoneId).toLocalDateTime();
+
+ eval.setAccidentTime(accidentTime);
+ eval.setAccidentAddress(w.getAccidentAddress());
+ eval.setCompanyId(company.getId());
+ eval.setCompanyName(company.getName());
+ eval.setRegionId(company.getRegionId());
+ eval.setRegionName(company.getName());
+ eval.setCarPlate(w.getCarNo());
+ if (insureCompanyInfoMap.size() == 0){
+ eval.setInsureCompany(null);
+ }else {
+ NdInsureInfo ndInsureInfo = insureCompanyInfoMap.get(carInfo.getCompanyId());
+ eval.setInsureCompany(ndInsureInfo.getInsureCompany());
+ }
+ eval.setInjuries(w.getInjuries());
+ eval.setDeathToll(w.getDeathToll());
+ eval.setCompensateAmount(w.getCompensateAmount());
+
+ ndInsureOutDangers.add(eval);
+ });
+
+ // 筛选出不在出险信息表中的数据，进行导入
+ List insureOutDangers = ndInsureOutDangers.stream().filter(w -> {
+ NdInsureOutDanger ndInsureOutDanger = ndInsureOutDangerService.getOne(Wrappers.lambdaQuery(NdInsureOutDanger.class)
+ .eq(NdInsureOutDanger::getCarPlate, w.getCarPlate())
+ .eq(NdInsureOutDanger::getInsureCompany,w.getInsureCompany())
+ .eq(NdInsureOutDanger::getCompanyName,w.getCompanyName())
+ .eq(NdInsureOutDanger::getAccidentAddress,w.getAccidentAddress())
+ .eq(NdInsureOutDanger::getAccidentTime,w.getAccidentTime())
+ .eq(NdInsureOutDanger::getInjuries,w.getInjuries())
+ .eq(NdInsureOutDanger::getDeathToll,w.getDeathToll())
+ .eq(NdInsureOutDanger::getCompensateAmount,w.getCompensateAmount()));
+ if (Objects.isNull(ndInsureOutDanger)){
+ return true;
+ }
+ return false;
+ }).collect(Collectors.toList());
+
+ if (CollUtil.isEmpty(insureOutDangers)){
+ throw new BizException("导入数据均已存在，无需重复导入!");
+ }
+
+ LambdaQueryWrapper delQuery = Wrappers.lambdaQuery(NdInsureOutDanger.class)
+ .in(NdInsureOutDanger::getCarPlate, carNos);
+ ndInsureOutDangerService.remove(delQuery);
+ ndInsureOutDangerService.saveBatch(insureOutDangers);
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void importTemplateData(ImportTemplateEnum template, MultipartFile file) {
+ String contentType = file.getContentType();
+ if (!contentType.equals(ExcelUtil.XLS_CONTENT_TYPE) &&
+ !contentType.equals(ExcelUtil.XLSX_CONTENT_TYPE)
+ ) {
+ throw BizException.wrap("导入失败,不支持的文件类型,请按照提供的模板导入文件!");
+ }
+ try (InputStream inputStream = file.getInputStream();
+ ExcelReader reader = ExcelUtil.getReader(inputStream)) {
+ Map alias;
+ List title = ImportTemplateConstant.getTemplateTitle(template);
+ switch (template) {
+ case VEHICLE_VIOLATION:
+ alias = new HashMap<>(title.size());
+ alias.put(title.get(0), "id");
+ alias.put(title.get(1), "city");
+ alias.put(title.get(2), "zone");
+ alias.put(title.get(3), "companyName");
+ alias.put(title.get(4), "carNo");
+ alias.put(title.get(5), "chassisNumber");
+ alias.put(title.get(6), "mileage");
+ alias.put(title.get(7), "violationCount");
+ alias.put(title.get(8), "avgViolationCount");
+ alias.put(title.get(9), "riskEvaluation");
+ alias.put(title.get(10), "remark");
+ reader.setHeaderAlias(alias);
+ importVehicleViolationData(reader.readAll(VehicleViolationImportDto.class));
+ break;
+ case VEHICLE_ACCIDENT:
+ alias = new HashMap<>(title.size());
+ alias.put(title.get(0), "id");
+ alias.put(title.get(1), "city");
+ alias.put(title.get(2), "zone");
+ alias.put(title.get(3), "companyName");
+ alias.put(title.get(4), "carNo");
+ alias.put(title.get(5), "chassisNumber");
+ alias.put(title.get(6), "mileage");
+ alias.put(title.get(7), "accidentCount");
+ alias.put(title.get(8), "avgAccidentCount");
+ alias.put(title.get(9), "riskEvaluation");
+ alias.put(title.get(10), "remark");
+ reader.setHeaderAlias(alias);
+ importVehicleAccidentData(reader.readAll(VehicleAccidentImportDto.class));
+ break;
+ case VEHICLE_OVER_SPEED:
+ alias = new HashMap<>(title.size());
+ alias.put(title.get(0), "id");
+ alias.put(title.get(1), "city");
+ alias.put(title.get(2), "zone");
+ alias.put(title.get(3), "companyName");
+ alias.put(title.get(4), "carNo");
+ alias.put(title.get(5), "chassisNumber");
+ alias.put(title.get(6), "mileage");
+ alias.put(title.get(7), "overSpeedCount");
+ alias.put(title.get(8), "avgOverSpeedCount");
+ alias.put(title.get(9), "riskEvaluation");
+ alias.put(title.get(10), "remark");
+ reader.setHeaderAlias(alias);
+ importVehicleOverSpeedData(reader.readAll(VehicleOverSpeedImportDto.class));
+ break;
+ case INSURE_OUT_DANGER:
+ alias = new HashMap<>(title.size());
+ alias.put(title.get(0), "id");
+ alias.put(title.get(1), "regionName");
+ alias.put(title.get(2), "carNo");
+ alias.put(title.get(3), "insureCompany");
+ alias.put(title.get(4), "companyName");
+ alias.put(title.get(5), "accidentAddress");
+ alias.put(title.get(6), "accidentTime");
+ alias.put(title.get(7), "injuries");
+ alias.put(title.get(8), "deathToll");
+ alias.put(title.get(9), "compensateAmount");
+ reader.setHeaderAlias(alias);
+ importOutDangerData(reader.readAll(OutDangerImportDto.class));
+ break;
+ default:
+ throw new BizException("不支持的数据导入类型");
+ }
+} catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/SecurityAnalysisEvalManage.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/SecurityAnalysisEvalManage.java
new file mode 100644
index 0000000..dac8e43
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/SecurityAnalysisEvalManage.java
@@ -0,0 +1,245 @@
+package com.ningdatech.carapi.analysis.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.IdVo;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.carapi.analysis.entity.SecurityManageGrade;
+import com.ningdatech.carapi.analysis.entity.SecurityManageResultEval;
+import com.ningdatech.carapi.analysis.entity.SecurityRiskEval;
+import com.ningdatech.carapi.analysis.entity.SecuritySystemBuildingEval;
+import com.ningdatech.carapi.analysis.entity.req.SecurityManageGradeListReq;
+import com.ningdatech.carapi.analysis.entity.req.SecurityRiskEvalListReq;
+import com.ningdatech.carapi.analysis.entity.req.SecurityRiskEvalSaveReq;
+import com.ningdatech.carapi.analysis.entity.req.SecuritySystemBuildingEvalSaveReq;
+import com.ningdatech.carapi.analysis.entity.vo.SecurityManageGradeVo;
+import com.ningdatech.carapi.analysis.entity.vo.SecurityManageResultEvalListVo;
+import com.ningdatech.carapi.analysis.entity.vo.SecurityRiskEvalListVo;
+import com.ningdatech.carapi.analysis.entity.vo.SecuritySystemBuildingEvalListVo;
+import com.ningdatech.carapi.analysis.service.ISecurityManageGradeService;
+import com.ningdatech.carapi.analysis.service.ISecurityManageResultEvalService;
+import com.ningdatech.carapi.analysis.service.ISecurityRiskEvalService;
+import com.ningdatech.carapi.analysis.service.ISecuritySystemBuildingEvalService;
+import com.ningdatech.carapi.common.aop.BuildChildrenRegionWrapper;
+import com.ningdatech.carapi.common.util.CodeUtil;
+import com.ningdatech.carapi.datascope.aop.LambdaDataScope;
+import com.ningdatech.carapi.sys.entity.dto.CompanyDTO;
+import com.ningdatech.carapi.sys.entity.dto.RegionDTO;
+import com.ningdatech.carapi.sys.helper.CompaniesCacheHelper;
+import com.ningdatech.carapi.sys.helper.RegionsCacheHelper;
+import com.ningdatech.carapi.user.util.LoginUserUtil;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * SecurityAnalysisEvalManage
+ *
+ *
+ * @author WendyYang
+ * @since 14:47 2022/10/13
+ */
+@Component
+@RequiredArgsConstructor
+public class SecurityAnalysisEvalManage {
+
+ private final RegionsCacheHelper regionsCacheHelper;
+ private final CompaniesCacheHelper companiesCacheHelper;
+ private final ISecurityManageGradeService securityManagementGradeService;
+ private final ISecurityRiskEvalService securityRiskEvaluationService;
+ private final ISecuritySystemBuildingEvalService systemBuildingEvalService;
+ private final ISecurityManageResultEvalService securityManageResultEvalService;
+
+ /**
+ * 安全管理综合评级列表
+ **/
+ public PageVo list(SecurityManageGradeListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(SecurityManageGrade.class);
+ SecurityAnalysisEvalManage context = (SecurityAnalysisEvalManage) AopContext.currentProxy();
+ context.buildSecurityManageGradeQuery(query,req);
+ Page page = securityManagementGradeService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ SecurityManageGradeVo gradeVo = BeanUtil.copyProperties(w, SecurityManageGradeVo.class);
+ List regions = regionsCacheHelper.listParents(w.getRegionId());
+ gradeVo.setRegions(regions);
+ CodeUtil.searchCompanyName(gradeVo);
+ return gradeVo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildSecurityManageGradeQuery(LambdaQueryWrapper query,SecurityManageGradeListReq req) {
+ if (StringUtils.isNotBlank(req.getCompanyName())) {
+ query.like(SecurityManageGrade::getCompanyName, req.getCompanyName());
+ }
+ if (StringUtils.isNotBlank(req.getSecurityLevel())) {
+ query.eq(SecurityManageGrade::getSecurityLevel, req.getSecurityLevel());
+ }
+ if (req.getYear() != null) {
+ query.eq(SecurityManageGrade::getYear, req.getYear());
+ }
+ query.orderByDesc(SecurityManageGrade::getId);
+ }
+
+ /**
+ * 安全责任体系分析评估列表
+ */
+ public PageVo list(SecurityRiskEvalListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(SecurityRiskEval.class);
+ SecurityAnalysisEvalManage context = (SecurityAnalysisEvalManage) AopContext.currentProxy();
+ context.buildSecurityRiskEvalQuery(query, req);
+ Page page = securityRiskEvaluationService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ SecurityRiskEvalListVo gradeVo = BeanUtil.copyProperties(w, SecurityRiskEvalListVo.class);
+ List regions = regionsCacheHelper.listParents(w.getRegionId());
+ gradeVo.setRegions(regions);
+ CodeUtil.searchCompanyName(gradeVo);
+ return gradeVo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildSecurityRiskEvalQuery(LambdaQueryWrapper query, SecurityRiskEvalListReq req) {
+ if (StringUtils.isNotBlank(req.getCompanyName())) {
+ query.like(SecurityRiskEval::getCompanyName, req.getCompanyName());
+ }
+ if (req.getScoreRanges() != null) {
+ Pair ranges = req.getScoreRanges();
+ query.ge(ranges.getLeft() != null, SecurityRiskEval::getTotalScore, ranges.getLeft());
+ query.le(ranges.getRight() != null, SecurityRiskEval::getTotalScore, ranges.getRight());
+ }
+ if (req.getYear() != null) {
+ query.eq(SecurityRiskEval::getYear, req.getYear());
+ }
+ query.orderByDesc(SecurityRiskEval::getId);
+ }
+
+ /**
+ * 安全制度建设分析评估列表
+ */
+ public PageVo listSystemBuildingEval(SecurityRiskEvalListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(SecuritySystemBuildingEval.class);
+ SecurityAnalysisEvalManage context = (SecurityAnalysisEvalManage) AopContext.currentProxy();
+ context.buildSystemBuildingEvalQuery(query, req);
+ Page page = systemBuildingEvalService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ SecuritySystemBuildingEvalListVo gradeVo = BeanUtil.copyProperties(w, SecuritySystemBuildingEvalListVo.class);
+ List regions = regionsCacheHelper.listParents(w.getRegionId());
+ gradeVo.setRegions(regions);
+ CodeUtil.searchCompanyName(gradeVo);
+ return gradeVo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildSystemBuildingEvalQuery(LambdaQueryWrapper query, SecurityRiskEvalListReq req) {
+ if (StringUtils.isNotBlank(req.getCompanyName())) {
+ query.like(SecuritySystemBuildingEval::getCompanyName, req.getCompanyName());
+ }
+ if (req.getScoreRanges() != null) {
+ Pair ranges = req.getScoreRanges();
+ query.ge(ranges.getLeft() != null, SecuritySystemBuildingEval::getTotalScore, ranges.getLeft());
+ query.le(ranges.getRight() != null, SecuritySystemBuildingEval::getTotalScore, ranges.getRight());
+ }
+ if (req.getYear() != null) {
+ query.eq(SecuritySystemBuildingEval::getYear, req.getYear());
+ }
+ query.orderByDesc(SecuritySystemBuildingEval::getId);
+ }
+
+ /**
+ * 新增安全责任体系评估
+ */
+
+ public IdVo save(SecurityRiskEvalSaveReq req) {
+ Assert.isTrue(0L == securityRiskEvaluationService.count(Wrappers.lambdaQuery(SecurityRiskEval.class)
+ .eq(SecurityRiskEval::getYear, req.getYear())
+ .eq(SecurityRiskEval::getCompanyId, req.getCompanyId())), "已存在该年度安全责任体系评估");
+ CompanyDTO company = companiesCacheHelper.getById(req.getCompanyId());
+ SecurityRiskEval insert = BeanUtil.copyProperties(req, SecurityRiskEval.class);
+ insert.setCreateBy(LoginUserUtil.getUserId());
+ insert.setCreateOn(LocalDateTime.now());
+ insert.setRegionId(company.getRegionId());
+ insert.setUpdateBy(insert.getCreateBy());
+ insert.setUpdateOn(insert.getCreateOn());
+ securityRiskEvaluationService.save(insert);
+ return IdVo.of(insert.getId());
+ }
+
+ /**
+ * 新增安全制度建设分析评估
+ */
+ public IdVo save(SecuritySystemBuildingEvalSaveReq req) {
+ Assert.isTrue(0L == systemBuildingEvalService.count(Wrappers.lambdaQuery(SecuritySystemBuildingEval.class)
+ .eq(SecuritySystemBuildingEval::getYear, req.getYear())
+ .eq(SecuritySystemBuildingEval::getCompanyId, req.getCompanyId())), "已存在该年度安全制度建设评估");
+ CompanyDTO company = companiesCacheHelper.getById(req.getCompanyId());
+ SecuritySystemBuildingEval insert = BeanUtil.copyProperties(req, SecuritySystemBuildingEval.class);
+ insert.setCreateBy(LoginUserUtil.getUserId());
+ insert.setCreateOn(LocalDateTime.now());
+ insert.setRegionId(company.getRegionId());
+ insert.setUpdateBy(insert.getCreateBy());
+ insert.setUpdateOn(insert.getCreateOn());
+ systemBuildingEvalService.save(insert);
+ return IdVo.of(insert.getId());
+ }
+ /**
+ * 安全管理结果分析评估列表
+ */
+ public PageVo listSecurityManageResultEval(SecurityRiskEvalListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(SecurityManageResultEval.class);
+ SecurityAnalysisEvalManage context = (SecurityAnalysisEvalManage) AopContext.currentProxy();
+ context.buildSecurityManageResultEvalQuery(query, req);
+ Page page = securityManageResultEvalService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ SecurityManageResultEvalListVo gradeVo = BeanUtil.copyProperties(w, SecurityManageResultEvalListVo.class);
+ List regions = regionsCacheHelper.listParents(w.getRegionId());
+ gradeVo.setRegions(regions);
+ CodeUtil.searchCompanyName(gradeVo);
+ return gradeVo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildSecurityManageResultEvalQuery(LambdaQueryWrapper query, SecurityRiskEvalListReq req) {
+ if (StringUtils.isNotBlank(req.getCompanyName())) {
+ query.like(SecurityManageResultEval::getCompanyName, req.getCompanyName());
+ }
+ if (req.getScoreRanges() != null) {
+ Pair ranges = req.getScoreRanges();
+ query.ge(ranges.getLeft() != null, SecurityManageResultEval::getTotalScore, ranges.getLeft());
+ query.le(ranges.getRight() != null, SecurityManageResultEval::getTotalScore, ranges.getRight());
+ }
+ if (req.getYear() != null) {
+ query.eq(SecurityManageResultEval::getYear, req.getYear());
+ }
+ query.orderByDesc(SecurityManageResultEval::getId);
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/WarnAnalysisManage.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/WarnAnalysisManage.java
new file mode 100644
index 0000000..4f61238
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/manage/WarnAnalysisManage.java
@@ -0,0 +1,149 @@
+package com.ningdatech.carapi.analysis.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCompany;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisDriver;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import com.ningdatech.carapi.analysis.entity.vo.WarnAnalysisByCarVo;
+import com.ningdatech.carapi.analysis.entity.vo.WarnAnalysisByCompanyVo;
+import com.ningdatech.carapi.analysis.entity.vo.WarnAnalysisByDriverVo;
+import com.ningdatech.carapi.analysis.mapper.WarnAnalysisCarMapper;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCarService;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCompanyService;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisDriverService;
+import com.ningdatech.carapi.common.aop.BuildChildrenRegionWrapper;
+import com.ningdatech.carapi.common.util.CodeUtil;
+import com.ningdatech.carapi.datascope.aop.LambdaDataScope;
+import com.ningdatech.carapi.sys.helper.RegionsCacheHelper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ *
+ * WarnAnalysisManage
+ *
+ *
+ * @author WendyYang
+ * @since 16:34 2022/10/14
+ */
+@Component
+@RequiredArgsConstructor
+public class WarnAnalysisManage {
+
+ private final IWarnAnalysisCarService warnAnalysisCarService;
+ private final IWarnAnalysisCompanyService warnAnalysisCompanyService;
+ private final RegionsCacheHelper regionsCacheHelper;
+ private final IWarnAnalysisDriverService warnAnalysisDriverService;
+
+ private final WarnAnalysisCarMapper warnAnalysisCarMapper;
+
+ /**
+ * 车辆综合预警分析列表
+ */
+ public PageVo listCarWarnAnalysis(WarnAnalysisListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(WarnAnalysisCar.class);
+ WarnAnalysisManage context = (WarnAnalysisManage) AopContext.currentProxy();
+ context.buildCarWarnAnalysisQuery(query, req);
+ Page page = warnAnalysisCarService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ WarnAnalysisByCarVo vo = BeanUtil.copyProperties(w, WarnAnalysisByCarVo.class);
+ if (Objects.nonNull(w.getRegionId())) {
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ }
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildCarWarnAnalysisQuery(LambdaQueryWrapper query, WarnAnalysisListReq req) {
+ query.like(StrUtil.isNotBlank(req.getCarNo()), WarnAnalysisCar::getCarNo, req.getCarNo())
+ .like(StrUtil.isNotBlank(req.getCompanyName()), WarnAnalysisCar::getCompanyName, req.getCompanyName())
+ .eq(Objects.nonNull(req.getDangerLevel()), WarnAnalysisCar::getDangerLevel, req.getDangerLevel())
+ .orderByDesc(WarnAnalysisCar::getDangerScore)
+ .orderByDesc(WarnAnalysisCar::getUpdateOn);
+ }
+
+ /**
+ * 企业综合预警分析列表
+ */
+ public PageVo listCompanyWarnAnalysis(WarnAnalysisListReq req) {
+ String companyName = req.getCompanyName();
+ Integer carCount = warnAnalysisCarMapper.selectVehiclesNum(companyName);
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(WarnAnalysisCompany.class);
+ WarnAnalysisManage context = (WarnAnalysisManage) AopContext.currentProxy();
+ context.buildCompanyWarnAnalysisQuery(query, req);
+ Page page = warnAnalysisCompanyService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ WarnAnalysisByCompanyVo vo = BeanUtil.copyProperties(w, WarnAnalysisByCompanyVo.class);
+ if (Objects.nonNull(w.getRegionId())) {
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ }
+ vo.setCarCount(carCount);
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildCompanyWarnAnalysisQuery(LambdaQueryWrapper query, WarnAnalysisListReq req) {
+ query.like(StrUtil.isNotBlank(req.getCompanyName()), WarnAnalysisCompany::getCompanyName, req.getCompanyName())
+ .eq(Objects.nonNull(req.getDangerLevel()), WarnAnalysisCompany::getDangerLevel, req.getDangerLevel())
+ .orderByDesc(WarnAnalysisCompany::getTotalScore)
+ .orderByDesc(WarnAnalysisCompany::getUpdateOn);
+ }
+
+ /**
+ * 驾驶员综合预警分析列表
+ */
+ public PageVo listDriverWarnAnalysis(WarnAnalysisListReq req) {
+ LambdaQueryWrapper query = Wrappers.lambdaQuery(WarnAnalysisDriver.class);
+ WarnAnalysisManage context = (WarnAnalysisManage) AopContext.currentProxy();
+ context.buildDriverWarnAnalysisQuery(query, req);
+ Page page = warnAnalysisDriverService.page(req.page(), query);
+ if (0L == page.getTotal()) {
+ return PageVo.empty();
+ }
+ List res = page.getRecords().stream().map(w -> {
+ WarnAnalysisByDriverVo vo = BeanUtil.copyProperties(w, WarnAnalysisByDriverVo.class);
+ if (Objects.nonNull(w.getRegionId())) {
+ vo.setRegions(regionsCacheHelper.listParents(w.getRegionId()));
+ }
+ CodeUtil.searchCompanyName(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ return PageVo.of(res, page.getTotal());
+ }
+
+ @LambdaDataScope
+ @BuildChildrenRegionWrapper
+ public void buildDriverWarnAnalysisQuery(LambdaQueryWrapper query, WarnAnalysisListReq req) {
+ query.eq(StrUtil.isNotBlank(req.getDriverName()), WarnAnalysisDriver::getDriverName, req.getDriverName())
+ .like(StrUtil.isNotBlank(req.getCompanyName()), WarnAnalysisDriver::getCompanyName, req.getCompanyName())
+ .eq(Objects.nonNull(req.getDangerLevel()), WarnAnalysisDriver::getDangerLevel, req.getDangerLevel())
+ .orderByDesc(WarnAnalysisDriver::getDangerScore)
+ .orderByDesc(WarnAnalysisDriver::getUpdateOn);
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.java
new file mode 100644
index 0000000..9657e90
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.java
@@ -0,0 +1,18 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.IndustryStandards;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface IndustryStandardsMapper extends BaseMapper {
+
+ int incrementDownCount(Long id);
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.xml
new file mode 100644
index 0000000..f46e7b1
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/IndustryStandardsMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+ update nd_industry_standards set down_count = down_count + 1 where id = #{id}
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.java
new file mode 100644
index 0000000..3ae63ec
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.java
@@ -0,0 +1,7 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.carapi.safe.model.vo.NdInsureOutDangerVO;
+
+public interface NdInsureOutDangerVOMapper extends BaseMapper {
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.xml
new file mode 100644
index 0000000..60c8dbe
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/NdInsureOutDangerVOMapper.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.java
new file mode 100644
index 0000000..b512cc6
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageGrade;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 安全管理综合评级 Mapper 接口
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-13
+ */
+public interface SecurityManageGradeMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.xml
new file mode 100644
index 0000000..ac4d9cf
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageGradeMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.java
new file mode 100644
index 0000000..d342383
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageResultEval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 安全制度建设分析评估 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface SecurityManageResultEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.xml
new file mode 100644
index 0000000..3402376
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityManageResultEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.java
new file mode 100644
index 0000000..a314112
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.SecurityRiskEval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 安全责任体系分析评估 Mapper 接口
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+public interface SecurityRiskEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.xml
new file mode 100644
index 0000000..e1377fa
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecurityRiskEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.java
new file mode 100644
index 0000000..f4b7d59
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.carapi.analysis.entity.SecuritySystemBuildingEval;
+
+/**
+ *
+ * 安全责任体系分析评估 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface SecuritySystemBuildingEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.xml
new file mode 100644
index 0000000..46ee371
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/SecuritySystemBuildingEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.java
new file mode 100644
index 0000000..c7b696a
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.VehicleAccidentEval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 车辆事故情况评估 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+public interface VehicleAccidentEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.xml
new file mode 100644
index 0000000..cfe57cb
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleAccidentEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.java
new file mode 100644
index 0000000..0cf0e1f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.VehicleOverSpeedEval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 车辆超速情况评估 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+public interface VehicleOverSpeedEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.xml
new file mode 100644
index 0000000..a429d9b
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleOverSpeedEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.java
new file mode 100644
index 0000000..11698e3
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.VehicleServiceLife;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 车辆使用年限 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface VehicleServiceLifeMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.xml
new file mode 100644
index 0000000..b02880d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleServiceLifeMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.java
new file mode 100644
index 0000000..2720585
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.VehicleViolationEval;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 车辆违章情况评估 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface VehicleViolationEvalMapper extends BaseMapper {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.xml
new file mode 100644
index 0000000..679720d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/VehicleViolationEvalMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.java
new file mode 100644
index 0000000..25b65f2
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.java
@@ -0,0 +1,28 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆综合预警分析 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface WarnAnalysisCarMapper extends BaseMapper {
+
+ Integer selectVehiclesNum(@Param("companyName") String companyName);
+
+ Page pageCarAnalysis(Page page, @Param("param") WarnAnalysisListReq req);
+
+ List listCarAnalysis(@Param("param") WarnAnalysisListReq req);
+
+ Integer saveBatchXml(@Param("singleList") List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.xml
new file mode 100644
index 0000000..80aa5ae
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCarMapper.xml
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+ INSERT INTO nd_warn_analysis_car
+ (region_id,
+ company_id,
+ company_name,
+ injured_count,
+ dead_count,
+ danger_count,
+ danger_score,
+ car_id,
+ car_no,
+ danger_level,
+ over_speed_count,
+ violation_count
+ )
+ values
+
+ (
+ #{item.regionId},
+ #{item.companyId},
+ #{item.companyName},
+ #{item.injuredCount},
+ #{item.deadCount},
+ #{item.dangerCount},
+ #{item.dangerScore},
+ #{item.carId},
+ #{item.carNo},
+ #{item.dangerLevel},
+ #{item.overSpeedCount},
+ #{item.violationCount}
+ )
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.java
new file mode 100644
index 0000000..6956984
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.java
@@ -0,0 +1,23 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 企业综合预警分析 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface WarnAnalysisCompanyMapper extends BaseMapper {
+
+ List listCompanyAnalysis(@Param("param") WarnAnalysisListReq req);
+
+ Integer saveBatchXml(@Param("singleList") List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.xml
new file mode 100644
index 0000000..004da0f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisCompanyMapper.xml
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+ INSERT INTO nd_warn_analysis_company
+ (region_id,
+ company_id,
+ company_name,
+ injured_count,
+ dead_count,
+ danger_count,
+ total_score,
+ danger_level,
+ violation_count
+ )
+ values
+
+ (
+ #{item.regionId},
+ #{item.companyId},
+ #{item.companyName},
+ #{item.injuredCount},
+ #{item.deadCount},
+ #{item.dangerCount},
+ #{item.totalScore},
+ #{item.dangerLevel},
+ #{item.violationCount}
+ )
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.java
new file mode 100644
index 0000000..22a07aa
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.java
@@ -0,0 +1,23 @@
+package com.ningdatech.carapi.analysis.mapper;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisDriver;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 驾驶员综合预警分析 Mapper 接口
+ *
+ *
+ * @author WendyYang
+ * @since 2022-11-01
+ */
+public interface WarnAnalysisDriverMapper extends BaseMapper {
+
+ List listDriverAnalysis(@Param("param") WarnAnalysisListReq req);
+
+ Integer saveBatchXml(@Param("singleList") List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.xml b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.xml
new file mode 100644
index 0000000..ff8923d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/mapper/WarnAnalysisDriverMapper.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+ INSERT INTO nd_warn_analysis_driver
+ (region_id,
+ driver_id,
+ driver_name,
+ company_id,
+ company_name,
+ injured_count,
+ dead_count,
+ danger_count,
+ danger_score,
+ danger_level,
+ over_speed_count,
+ violation_count
+ )
+ values
+
+ (
+ #{item.regionId},
+ #{item.driverId},
+ #{item.driverName},
+ #{item.companyId},
+ #{item.companyName},
+ #{item.injuredCount},
+ #{item.deadCount},
+ #{item.dangerCount},
+ #{item.dangerScore},
+ #{item.dangerLevel},
+ #{item.overSpeedCount},
+ #{item.violationCount}
+ )
+
+
+
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IIndustryStandardsService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IIndustryStandardsService.java
new file mode 100644
index 0000000..54d448d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IIndustryStandardsService.java
@@ -0,0 +1,19 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.IndustryStandards;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface IIndustryStandardsService extends IService {
+
+ boolean incrementDownCount(Long id);
+
+ void deleteById(Long id);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/INdInsureOutDangerVOService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/INdInsureOutDangerVOService.java
new file mode 100644
index 0000000..1fbc4a0
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/INdInsureOutDangerVOService.java
@@ -0,0 +1,7 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.carapi.safe.model.vo.NdInsureOutDangerVO;
+
+public interface INdInsureOutDangerVOService extends IService {
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageGradeService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageGradeService.java
new file mode 100644
index 0000000..f223f50
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageGradeService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageGrade;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 安全管理综合评级 服务类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-13
+ */
+public interface ISecurityManageGradeService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageResultEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageResultEvalService.java
new file mode 100644
index 0000000..4e003eb
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityManageResultEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageResultEval;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 安全制度建设分析评估 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface ISecurityManageResultEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityRiskEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityRiskEvalService.java
new file mode 100644
index 0000000..ffabb99
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecurityRiskEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.carapi.analysis.entity.SecurityRiskEval;
+
+/**
+ *
+ * 安全责任体系分析评估 服务类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+public interface ISecurityRiskEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecuritySystemBuildingEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecuritySystemBuildingEvalService.java
new file mode 100644
index 0000000..24d4e9d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/ISecuritySystemBuildingEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.SecuritySystemBuildingEval;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 安全责任体系分析评估 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface ISecuritySystemBuildingEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleAccidentEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleAccidentEvalService.java
new file mode 100644
index 0000000..f34757f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleAccidentEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.VehicleAccidentEval;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 车辆事故情况评估 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+public interface IVehicleAccidentEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleOverSpeedEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleOverSpeedEvalService.java
new file mode 100644
index 0000000..267aaae
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleOverSpeedEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.VehicleOverSpeedEval;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 车辆超速情况评估 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+public interface IVehicleOverSpeedEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleServiceLifeService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleServiceLifeService.java
new file mode 100644
index 0000000..a78d0e8
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleServiceLifeService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.VehicleServiceLife;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 车辆使用年限 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface IVehicleServiceLifeService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleViolationEvalService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleViolationEvalService.java
new file mode 100644
index 0000000..1529e3f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IVehicleViolationEvalService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.VehicleViolationEval;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 车辆违章情况评估 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+public interface IVehicleViolationEvalService extends IService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCarService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCarService.java
new file mode 100644
index 0000000..de88f03
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCarService.java
@@ -0,0 +1,25 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆综合预警分析 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface IWarnAnalysisCarService extends IService {
+
+ Page pageCarAnalysis(Page page, WarnAnalysisListReq req);
+
+ List listCarAnalysis(WarnAnalysisListReq req);
+
+ Integer saveBatchXml(List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCompanyService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCompanyService.java
new file mode 100644
index 0000000..4a96dcf
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisCompanyService.java
@@ -0,0 +1,23 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+
+import java.util.List;
+
+/**
+ *
+ * 企业综合预警分析 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+public interface IWarnAnalysisCompanyService extends IService {
+
+ List listCompanyAnalysis(WarnAnalysisListReq req);
+
+ Integer saveBatchXml(List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisDriverService.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisDriverService.java
new file mode 100644
index 0000000..ab5c634
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/IWarnAnalysisDriverService.java
@@ -0,0 +1,22 @@
+package com.ningdatech.carapi.analysis.service;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisDriver;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+
+import java.util.List;
+
+/**
+ *
+ * 驾驶员综合预警分析 服务类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-11-01
+ */
+public interface IWarnAnalysisDriverService extends IService {
+
+ List listDriverAnalysis(WarnAnalysisListReq warnAnalysisListReq);
+
+ Integer saveBatchXml(List singleList);
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/IndustryStandardsServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/IndustryStandardsServiceImpl.java
new file mode 100644
index 0000000..e541a7d
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/IndustryStandardsServiceImpl.java
@@ -0,0 +1,30 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.carapi.analysis.entity.IndustryStandards;
+import com.ningdatech.carapi.analysis.mapper.IndustryStandardsMapper;
+import com.ningdatech.carapi.analysis.service.IIndustryStandardsService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Service
+public class IndustryStandardsServiceImpl extends ServiceImpl implements IIndustryStandardsService {
+
+ @Override
+ public boolean incrementDownCount(Long id) {
+ return baseMapper.incrementDownCount(id) > 0;
+ }
+
+ @Override
+ public void deleteById(Long id) {
+ baseMapper.deleteById(id);
+ }
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/NdInsureOutDangerVOServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/NdInsureOutDangerVOServiceImpl.java
new file mode 100644
index 0000000..97fb3d1
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/NdInsureOutDangerVOServiceImpl.java
@@ -0,0 +1,16 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.carapi.analysis.mapper.NdInsureOutDangerVOMapper;
+import com.ningdatech.carapi.analysis.service.INdInsureOutDangerVOService;
+import com.ningdatech.carapi.safe.model.vo.NdInsureOutDangerVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author CMM
+ * @description
+ * @since 2022/11/16 17:42
+ */
+@Service
+public class NdInsureOutDangerVOServiceImpl extends ServiceImpl implements INdInsureOutDangerVOService {
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageGradeServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageGradeServiceImpl.java
new file mode 100644
index 0000000..b1a6f67
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageGradeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageGrade;
+import com.ningdatech.carapi.analysis.mapper.SecurityManageGradeMapper;
+import com.ningdatech.carapi.analysis.service.ISecurityManageGradeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 安全管理综合评级 服务实现类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-13
+ */
+@Service
+public class SecurityManageGradeServiceImpl extends ServiceImpl implements ISecurityManageGradeService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageResultEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageResultEvalServiceImpl.java
new file mode 100644
index 0000000..702e4d1
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityManageResultEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.SecurityManageResultEval;
+import com.ningdatech.carapi.analysis.mapper.SecurityManageResultEvalMapper;
+import com.ningdatech.carapi.analysis.service.ISecurityManageResultEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 安全制度建设分析评估 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Service
+public class SecurityManageResultEvalServiceImpl extends ServiceImpl implements ISecurityManageResultEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityRiskEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityRiskEvalServiceImpl.java
new file mode 100644
index 0000000..e581480
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecurityRiskEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.SecurityRiskEval;
+import com.ningdatech.carapi.analysis.mapper.SecurityRiskEvalMapper;
+import com.ningdatech.carapi.analysis.service.ISecurityRiskEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 安全责任体系分析评估 服务实现类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Service
+public class SecurityRiskEvalServiceImpl extends ServiceImpl implements ISecurityRiskEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecuritySystemBuildingEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecuritySystemBuildingEvalServiceImpl.java
new file mode 100644
index 0000000..9b60bc3
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/SecuritySystemBuildingEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.SecuritySystemBuildingEval;
+import com.ningdatech.carapi.analysis.mapper.SecuritySystemBuildingEvalMapper;
+import com.ningdatech.carapi.analysis.service.ISecuritySystemBuildingEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 安全责任体系分析评估 服务实现类
+ *
+ *
+ * @author LiuXinXin
+ * @since 2022-10-14
+ */
+@Service
+public class SecuritySystemBuildingEvalServiceImpl extends ServiceImpl implements ISecuritySystemBuildingEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleAccidentEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleAccidentEvalServiceImpl.java
new file mode 100644
index 0000000..9e75e5c
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleAccidentEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.VehicleAccidentEval;
+import com.ningdatech.carapi.analysis.mapper.VehicleAccidentEvalMapper;
+import com.ningdatech.carapi.analysis.service.IVehicleAccidentEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 车辆事故情况评估 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+@Service
+public class VehicleAccidentEvalServiceImpl extends ServiceImpl implements IVehicleAccidentEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleOverSpeedEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleOverSpeedEvalServiceImpl.java
new file mode 100644
index 0000000..3a77710
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleOverSpeedEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.VehicleOverSpeedEval;
+import com.ningdatech.carapi.analysis.mapper.VehicleOverSpeedEvalMapper;
+import com.ningdatech.carapi.analysis.service.IVehicleOverSpeedEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 车辆超速情况评估 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-17
+ */
+@Service
+public class VehicleOverSpeedEvalServiceImpl extends ServiceImpl implements IVehicleOverSpeedEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleServiceLifeServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleServiceLifeServiceImpl.java
new file mode 100644
index 0000000..b57e341
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleServiceLifeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.VehicleServiceLife;
+import com.ningdatech.carapi.analysis.mapper.VehicleServiceLifeMapper;
+import com.ningdatech.carapi.analysis.service.IVehicleServiceLifeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 车辆使用年限 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Service
+public class VehicleServiceLifeServiceImpl extends ServiceImpl implements IVehicleServiceLifeService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleViolationEvalServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleViolationEvalServiceImpl.java
new file mode 100644
index 0000000..815ea44
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/VehicleViolationEvalServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.VehicleViolationEval;
+import com.ningdatech.carapi.analysis.mapper.VehicleViolationEvalMapper;
+import com.ningdatech.carapi.analysis.service.IVehicleViolationEvalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 车辆违章情况评估 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-15
+ */
+@Service
+public class VehicleViolationEvalServiceImpl extends ServiceImpl implements IVehicleViolationEvalService {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCarServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCarServiceImpl.java
new file mode 100644
index 0000000..9c4d0e6
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCarServiceImpl.java
@@ -0,0 +1,46 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCar;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import com.ningdatech.carapi.analysis.mapper.WarnAnalysisCarMapper;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCarService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.carapi.common.aop.BuildChildrenRegionEntity;
+import com.ningdatech.carapi.datascope.aop.XmlDataScope;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 车辆综合预警分析 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class WarnAnalysisCarServiceImpl extends ServiceImpl implements IWarnAnalysisCarService {
+
+ private final WarnAnalysisCarMapper mapper;
+
+ @Override
+ @XmlDataScope(entityIndex = 1)
+ @BuildChildrenRegionEntity(entityIndex = 1)
+ public Page pageCarAnalysis(Page page, WarnAnalysisListReq req) {
+ return mapper.pageCarAnalysis(page,req);
+ }
+
+ @Override
+ public List listCarAnalysis(WarnAnalysisListReq req) {
+ return mapper.listCarAnalysis(req);
+ }
+
+ @Override
+ public Integer saveBatchXml(List singleList) {
+ return mapper.saveBatchXml(singleList);
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCompanyServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCompanyServiceImpl.java
new file mode 100644
index 0000000..78e5ec9
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisCompanyServiceImpl.java
@@ -0,0 +1,36 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisCompany;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import com.ningdatech.carapi.analysis.mapper.WarnAnalysisCompanyMapper;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 企业综合预警分析 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-10-14
+ */
+@Service
+@RequiredArgsConstructor
+public class WarnAnalysisCompanyServiceImpl extends ServiceImpl implements IWarnAnalysisCompanyService {
+
+ private final WarnAnalysisCompanyMapper mapper;
+
+ @Override
+ public List listCompanyAnalysis(WarnAnalysisListReq req) {
+ return mapper.listCompanyAnalysis(req);
+ }
+
+ @Override
+ public Integer saveBatchXml(List singleList) {
+ return mapper.saveBatchXml(singleList);
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisDriverServiceImpl.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisDriverServiceImpl.java
new file mode 100644
index 0000000..2b6369f
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/analysis/service/impl/WarnAnalysisDriverServiceImpl.java
@@ -0,0 +1,36 @@
+package com.ningdatech.carapi.analysis.service.impl;
+
+import com.ningdatech.carapi.analysis.entity.WarnAnalysisDriver;
+import com.ningdatech.carapi.analysis.entity.req.WarnAnalysisListReq;
+import com.ningdatech.carapi.analysis.mapper.WarnAnalysisDriverMapper;
+import com.ningdatech.carapi.analysis.service.IWarnAnalysisDriverService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 驾驶员综合预警分析 服务实现类
+ *
+ *
+ * @author WendyYang
+ * @since 2022-11-01
+ */
+@Service
+@RequiredArgsConstructor
+public class WarnAnalysisDriverServiceImpl extends ServiceImpl implements IWarnAnalysisDriverService {
+
+ private final WarnAnalysisDriverMapper mapper;
+
+ @Override
+ public List listDriverAnalysis(WarnAnalysisListReq req) {
+ return mapper.listDriverAnalysis(req);
+ }
+
+ @Override
+ public Integer saveBatchXml(List singleList) {
+ return mapper.saveBatchXml(singleList);
+ }
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicle.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicle.java
new file mode 100644
index 0000000..606e2a5
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicle.java
@@ -0,0 +1,17 @@
+package com.ningdatech.carapi.archives.aop;
+
+import java.lang.annotation.*;
+
+/**
+ * @Classname Audit
+ * @Description
+ * @Date 2022/10/31 15:34
+ * @Created by PoffyZhang
+ */
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface AuditVehicle {
+
+}
diff --git a/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicleAspect.java b/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicleAspect.java
new file mode 100644
index 0000000..9f979d7
--- /dev/null
+++ b/ningda-yw-api/src/main/java/com/ningdatech/carapi/archives/aop/AuditVehicleAspect.java
@@ -0,0 +1,64 @@
+package com.ningdatech.carapi.archives.aop;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.exception.code.ExceptionCode;
+import com.ningdatech.basic.function.VUtils;
+import com.ningdatech.carapi.car.vehicle.model.NdVehicleBaseInfo;
+import com.ningdatech.carapi.archives.enums.AuditStateEnum;
+import com.ningdatech.carapi.car.vehicle.service.IVehicleBaseInfoService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @program:
+ * @description: 车辆审核切面
+ * @author: PoffyZhang
+ * @created: 2021/10/29 09:12
+ */
+@Aspect
+@Component
+@Slf4j
+@AllArgsConstructor
+@Order(10)
+public class AuditVehicleAspect {
+
+ private IVehicleBaseInfoService vehicleBaseInfoService;
+
+ @Pointcut("@annotation(com.ningdatech.carapi.archives.aop.AuditVehicle)")
+ public void auditVehicleAspect() {
+
+ }
+
+ @Before("auditVehicleAspect() && @annotation(auditVehicle)")
+ public void doBebore(JoinPoint joinPoint, AuditVehicle auditVehicle) throws Throwable {
+ Object[] values = joinPoint.getArgs();
+ String carPlate = (String) values[0];
+
+ VUtils.isTrueFormat(StringUtils.isBlank(carPlate))
+ .throwMessage(ExceptionCode.OPERATION_EX.getCode(), "车牌号未传 {}!",carPlate);
+
+ LambdaQueryWrapper