bug修复

src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseMenu.java

@@ -71,18 +71,29 @@ public class BaseMenu implements Serializable {
 	private java.lang.String icon  ;
 
     @ApiModelProperty(value="打开方式:_self窗口内,_blank新窗口")
-    private java.lang.String target  ;
+    private java.lang.String target;
 
-	/**优先级 越小越靠前*/
+    /**
+     * 优先级 越小越靠前
+     */
     @Excel(name = "优先级 越小越靠前", width = 15)
-   @ApiModelProperty(value="优先级 越小越靠前")
+    @ApiModelProperty(value = "优先级 越小越靠前")
-	private java.lang.Integer priority  ;
+    private java.lang.Integer priority;
-	/**状态:0-禁用 1-启用*/
+    /**
+     * 状态:0-禁用 1-启用
+     */
     @Excel(name = "状态:0-禁用 1-启用", width = 15)
-   @ApiModelProperty(value="状态:0-禁用 1-启用")
+    @ApiModelProperty(value = "状态:0-禁用 1-启用")
-	private java.lang.Integer status  ;
+    private java.lang.Integer status;
-
+    /**
+     * 路径类型：1内部路由2嵌入外部url
+     */
+    @Excel(name = "路径类型：1内部路由2嵌入外部url", width = 15)
+    @ApiModelProperty(value = "路径类型：1内部路由2嵌入外部url")
+    private java.lang.Integer pathType;
+    @ApiModelProperty(value = "嵌入外部url")
+    private java.lang.String embedUrl;
     @TableField(exist = false)
-    @ApiModelProperty(value="子集菜单")
+    @ApiModelProperty(value = "子集菜单")
     private List<BaseMenu> menuList;
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/entity/BaseModule.java

@@ -78,17 +78,23 @@ public class BaseModule implements Serializable {
     private java.lang.String plugin  ;
 
     @Excel(name = "app端模块名称", width = 15)
-    @ApiModelProperty(value="app端模块名称")
+    @ApiModelProperty(value = "app端模块名称")
-    private java.lang.String appName  ;
+    private java.lang.String appName;
 
 
-    @ApiModelProperty(value="是否APP端显示该模块，1是,2否")
+    @ApiModelProperty(value = "是否APP端显示该模块，1是,2否")
-    private java.lang.Integer appShow  ;
+    private java.lang.Integer appShow;
 
-    @ApiModelProperty(value="样式版本，默认1")
+    @ApiModelProperty(value = "样式版本，默认1")
-    private java.lang.Integer styleType  ;
+    private java.lang.Integer styleType;
+
+    @ApiModelProperty(value = "路径类型：1内部路由2嵌入外部url")
+    private java.lang.Integer pathType;
+
+    @ApiModelProperty(value = "嵌入外部url")
+    private java.lang.String embedUrl;
 
     @TableField(exist = false)
-    @ApiModelProperty(value="模块所属菜单")
+    @ApiModelProperty(value = "模块所属菜单")
     private List<EntityMap> menuList;
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -88,6 +87,8 @@ public class SystemLogoConfig implements Serializable {
 
     @ApiModelProperty(value = "总公司sn")
     private java.lang.String headquartersSn;
+    @ApiModelProperty(value = "项目前台")
+    private java.lang.String projectFront;
     /**
      * 是否开启登录超时，0不开启1开启
      */

src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java

@@ -154,6 +154,7 @@ public class AiAnalyseHardWareAlarmRecordController {
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "sizeNum", value = "查询条数，默认10条", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "workerName", value = "姓名", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "selectType", value = "查询类型，1近七天，2最近30天，3今日，4、24小时", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = "/selectAiAnalyseHardWareAlarmList")
     public Result<List<AiAnalyseHardWareAlarmRecord>> selectAiAnalyseHardWareAlarmList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/video/entity/vo/AiAnalyseHardWareAlarmTotalVo.java

@@ -11,4 +11,6 @@ public class AiAnalyseHardWareAlarmTotalVo {
     private Integer past7AlarmNum;
     @ApiModelProperty("近30日告警数量")
     private Integer past30AlarmNum;
+    @ApiModelProperty("历史告警数量")
+    private Integer allAlarmNum;
 }

src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml

@@ -105,6 +105,8 @@
         <if test="workerName != null and workerName != ''">
             and wi.worker_name like concat('%',#{workerName},'%')
         </if>
+        <include refid="queryAlarmTime">
+        </include>
         group by a.id
         order by a.create_time desc
         LIMIT #{sizeNum}

src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java

@@ -363,6 +363,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
     @Override
     public AiAnalyseHardWareAlarmTotalVo countAiAnalyseHardWareAlarmTotal(Map<String, Object> map) {
         AiAnalyseHardWareAlarmTotalVo vo = new AiAnalyseHardWareAlarmTotalVo();
+        vo.setAllAlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
         map.put("selectType", 3);
         vo.setTodayAlarmNum(Integer.valueOf(this.getAiAnalyseHardWareAlarmTotal(map).getCount()));
         map.put("selectType", 1);
@@ -379,6 +380,10 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
 
     @Override
     public void edit(AiAnalyseHardWareAlarmRecord taskProgressMaterialRel) {
+        if (Objects.equals(taskProgressMaterialRel.getHandleResult(), 2)) {
+            baseMapper.deleteById(taskProgressMaterialRel.getId());
+            return;
+        }
         baseMapper.updateById(taskProgressMaterialRel);
         List<WorkerInfo> workerInfoList = taskProgressMaterialRel.getWorkerInfoList();
         if (CollUtil.isNotEmpty(workerInfoList)) {

src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java

@@ -142,6 +142,8 @@ public class WorkerInfoController {
             @ApiImplicitParam(name = "projectSnList", value = "项目SN列表", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "orderBy", value = "排序：1退场时间倒序2进场日期倒序", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "workerInfos", value = "劳务人员id（多个，分割）", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "presence", value = "1在场", paramType = "body", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "attendance", value = "1今日出勤", paramType = "body", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/selectWorkerInfoList")
     public Result<IPage<WorkerInfo>> selectWorkerInfoList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java

@@ -379,6 +379,9 @@ public class WorkerInfo implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "工种名称")
     private String typeName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "1在场2离场")
+    private Integer presence;
 
     public String toExistString() {
         return "WorkerInfo{" +

src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml

@@ -29,7 +29,8 @@
         or (TIMESTAMPDIFF(HOUR, a.nad_time, now()) >= 72 and a.worker_classify = 3)
         or (TIMESTAMPDIFF(HOUR, a.nad_time, now()) >= 168 and a.worker_classify = 1)) then '核酸已超时'
         else '核酸未超时' end) as acid_status_name,
-        wt.type_name
+        wt.type_name,
+        if(wap.id is not null,1,2) presence
         from worker_info a
         LEFT JOIN team_info b ON a.team_id = b.id
         LEFT JOIN department_info c ON a.department_id = c.id
@@ -37,7 +38,25 @@
         LEFT JOIN dictionaries_record d ON a.job_type = d.id
         LEFT JOIN dictionaries_record e ON a.job_name = e.id
         LEFT JOIN enterprise_info en ON en.id = a.enterprise_id
+        LEFT JOIN worker_attendance_presence wap ON wap.person_sn = a.person_sn
+        <if test="param.attendance == '1'.toString()">
+            join (select * from worker_attendance where
+            1=1
+            <if test="param.projectSn != null and param.projectSn != ''">
+                and project_sn = #{param.projectSn}
+            </if>
+            and create_time>=current_date group by person_sn ) wa on wa.person_sn = a.person_sn
+        </if>
         WHERE 1 = 1
+        <if test="param.presence == '1'.toString()">
+            and wap.id is not null
+        </if>
+        <if test="param.presence == '2'.toString()">
+            and wap.id is null
+        </if>
+        <if test="param.attendance == '1'.toString()">
+            and wap.id is null
+        </if>
         <if test="param.chargePersonName != null and param.chargePersonName != ''">
             and c.charge_person_name like CONCAT(CONCAT('%', #{param.chargePersonName}), '%')
         </if>