更新

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/dto/FaultCaseImportParam.java

+package com.yeejoin.equipmanage.common.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelIgnore;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author keyong
+ * @title: FaultCaseImportParam
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/10/31 17:27
+ */
+@Data
+public class FaultCaseImportParam {
+
+    @ExcelIgnore
+    private Date createDate;
+
+    @Excel(name = "消防系统", orderNum = "0")
+    private String systemInfo;
+
+    @Excel(name = "部件id", orderNum = "1")
+    private String equipId;
+
+    @Excel(name = "故障类型", orderNum = "2")
+    private String faultType;
+
+    @Excel(name = "故障等级", orderNum = "3")
+    private String faultLevel;
+
+    @Excel(name = "故障描述", orderNum = "4")
+    private String faultDescribe;
+
+    @Excel(name = "处理建议", orderNum = "5")
+    private String handleAdvise;
+
+    @Excel(name = "故障影响", orderNum = "6")
+    private String faultEffect;
+
+    @Excel(name = "预防措施", orderNum = "7")
+    private String preventiveMeasure;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/FaultCase.java

+package com.yeejoin.equipmanage.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 信号分类量测枚举表
+ *
+ * @author system_generator
+ * @date 2023-02-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("wl_fault_case")
+public class FaultCase extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	@TableField("id")
+    private Long id;
+
+    /**
+     * 系统id
+     */
+	@TableField("system_id")
+    private String systemId;
+
+    /**
+     * 系统编码
+     */
+    @TableField("system_type_code")
+    private String systemTypeCode;
+
+    /**
+     * 系统名称
+     */
+	@TableField("system_name")
+    private String systemName;
+
+    /**
+     * 部件id
+     */
+	@TableField("equip_id")
+    private String equipId;
+
+    /**
+     * 部件名称
+     */
+	@TableField("equip_name")
+    private String equipName;
+
+    /**
+     * 故障等级
+     */
+	@TableField("fault_level")
+    private String faultLevel;
+
+    /**
+     * 故障类型
+     */
+    @TableField("fault_type")
+    private String faultType;
+
+    /**
+     * 故障描述
+     */
+    @TableField("fault_describe")
+    private String faultDescribe;
+
+    /**
+     * 处理建议
+     */
+    @TableField("handle_advise")
+    private String handleAdvise;
+
+    /**
+     * 故障影响
+     */
+    @TableField("fault_effect")
+    private String faultEffect;
+
+    /**
+     * 预防措施
+     */
+    @TableField("preventive_measure")
+    private String preventiveMeasure;
+
+    @TableField(exist = false)
+    private String searchName;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/EmergencyLevelEum.java

+package com.yeejoin.equipmanage.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类型枚举
+ * @author DELL
+ */
+@Getter
+@AllArgsConstructor
+public enum EmergencyLevelEum {
+
+    JJ("1", "紧急"),
+    YZ("2", "严重"),
+    QW("3", "轻微"),
+    ZC("4", "正常"),
+    WX("5", "无效"),
+    BY("6", "备用"),
+    QT("7", "其他");
+
+    private String code;
+
+    private String name;
+
+    public static List<String> getDropDownList() {
+        List<String> list = new ArrayList<>();
+        for(EmergencyLevelEum eum : EmergencyLevelEum.values()) {
+            String str = eum.getName() + "@" + eum.getCode();
+            list.add(str);
+        }
+        return list;
+    }
+
+    public static String getNameByCode(String code) {
+        String str = null;
+        for(EmergencyLevelEum eum : EmergencyLevelEum.values()) {
+           if (code.equalsIgnoreCase(eum.getCode())) {
+               str = eum.getName();
+               break;
+           }
+        }
+        return str;
+    }
+
+}

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

 package com.yeejoin.amos.boot.module.jcs.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/SignMapper.java

@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.Sign;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,6 +23,8 @@ public interface SignMapper extends BaseMapper<Sign> {
 
     IPage<SinStaticDto> queryStaticForPage(IPage<?> page, SinStaticDto dto);
 
+    List<Map<String, Object>> queryPeopleInfo(SinStaticDto dto);
+
     int queryPersonNum(String bizOgrCode);
 
 //    Map<String, Object> getSignStatistic(@Param("bizOrgCode") String bizOgrCode, @Param("userId") String userId);

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

@@ -75,6 +75,58 @@
         sign.sign_time desc
         )  s  group by date,bizOrgCode
     </select>
+
+    <select id="queryPeopleInfo" resultType="Map">
+        SELECT
+        s1.date,
+        IFNULL( s2.signNum, 0 ) AS signNum
+        FROM
+        (
+        SELECT
+        @s := @s + 1  AS `index`,
+        DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD( now(), INTERVAL - 5 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date
+        FROM
+        mysql.help_topic,
+        ( SELECT @s := - 2 ) temp
+        WHERE
+        @s &lt; 5
+        ) s1
+        LEFT JOIN (
+        SELECT
+        count(userId) signNum,
+        s.*
+        FROM
+        (
+        SELECT
+        DISTINCT sign.user_id userId,
+        date,
+        biz_org_Name bizOrgName,
+        biz_org_code bizOrgCode,
+        person_of_day personOfDay
+        FROM
+        cb_sign sign
+        <where>
+            <if test="dto.dateLESS!=null and dto.dateLESS!=''">
+                and #{dto.dateLESS} >= sign.sign_time
+            </if>
+            <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
+                and sign.biz_org_code like CONCAT(#{dto.bizOrgCode},'%')
+            </if>
+        </where>
+        group by
+        date,
+        biz_org_code,
+        user_id
+        order by
+        sign.sign_time desc
+        ) s
+        ) s2 ON s2.date = s1.date
+        GROUP BY
+        s1.date
+        ORDER BY
+        s1.date
+    </select>
+
     <select id="queryPersonNum" resultType="java.lang.Integer">
         select count(*) from cb_firefighters where biz_org_code  like CONCAT('%',#{bizOgrCode}, '%') AND people_type = '1601'
            AND is_delete = 0 AND now()  > rec_date

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FaultCaseMapper.java

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.equipmanage.common.entity.FaultCase;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 信号分类量测枚举表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+public interface FaultCaseMapper extends BaseMapper<FaultCase> {
+
+
+    Page<FaultCase> listPage(@Param("page") Page page, @Param("dto") FaultCase dto);
+
+    List<Map<String, Object>> getFaultCaseList();
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -25,6 +25,8 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
      */
     List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId);
 
+    List<EquiplistSpecificBySystemVO> getEquipBySystemId(Long systemId);
+
     /**
      * 根据系统id查询设备列表
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFaultCaseService.java

+package com.yeejoin.equipmanage.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.FaultCase;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoListVO;
+import com.yeejoin.equipmanage.common.entity.vo.BuildingVideoVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 信号分类量测枚举表接口类
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+public interface IFaultCaseService extends IService<FaultCase> {
+
+
+    Page<FaultCase> listPage(Page page, FaultCase faultCase);
+
+    List<Map<String, Object>> getFaultCaseList();
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -26,6 +26,8 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      */
     List<EquiplistSpecificBySystemVO> getEquiplistBySystemId(Long systemId);
 
+    List<EquiplistSpecificBySystemVO> getEquipBySystemId(Long systemId);
+
     /**
      * 根据系统id查询设备列表
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/ISignalClassifyService.java

@@ -4,6 +4,8 @@ package com.yeejoin.equipmanage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.equipmanage.common.entity.SignalClassify;
 
+import java.util.List;
+
 /**
  * 信号分类量测枚举表接口类
  *
@@ -13,4 +15,6 @@ import com.yeejoin.equipmanage.common.entity.SignalClassify;
 public interface ISignalClassifyService extends IService<SignalClassify> {
 
     SignalClassify getTypeNameByCode(String code);
+
+    List<SignalClassify> getList();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FaultCaseServiceImpl.java

+package com.yeejoin.equipmanage.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.equipmanage.common.entity.FaultCase;
+import com.yeejoin.equipmanage.common.enums.EmergencyLevelEum;
+import com.yeejoin.equipmanage.mapper.FaultCaseMapper;
+import com.yeejoin.equipmanage.service.IFaultCaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 信号分类量测枚举表服务实现类
+ *
+ * @author system_generator
+ * @date 2022-02-18
+ */
+@Service
+public class FaultCaseServiceImpl extends ServiceImpl<FaultCaseMapper, FaultCase> implements IFaultCaseService {
+
+    @Override
+    public Page<FaultCase> listPage(Page page, FaultCase faultCase) {
+        Page<FaultCase> pages = this.baseMapper.listPage(page, faultCase);
+        if (0 < pages.getRecords().size()) {
+            pages.getRecords().stream().map(x -> x.setFaultLevel(EmergencyLevelEum.getNameByCode(x.getFaultLevel()))).collect(Collectors.toList());
+        }
+        return pages;
+    }
+
+    @Override
+    public List<Map<String, Object>> getFaultCaseList() {
+        return this.baseMapper.getFaultCaseList();
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -182,6 +182,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     getEquiplistBySystemId(Long systemId) {
         return this.baseMapper.getEquiplistBySystemId(systemId);
     }
+
+    @Override
+    public List<EquiplistSpecificBySystemVO> getEquipBySystemId(Long systemId) {
+        return this.baseMapper.getEquipBySystemId(systemId);
+    }
     @Override
     public IPage<EquiplistSpecificBySystemVO> getEquiplistBySystemIdPage(Long systemId, int size, int current) {
         IPage<EquiplistSpecificBySystemVO> page = new Page();

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SignalClassifyServiceImpl.java

@@ -7,6 +7,8 @@ import com.yeejoin.equipmanage.mapper.SignalClassifyMapper;
 import com.yeejoin.equipmanage.service.ISignalClassifyService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 信号分类量测枚举表服务实现类
  *
@@ -20,4 +22,9 @@ public class SignalClassifyServiceImpl extends ServiceImpl<SignalClassifyMapper,
     public SignalClassify getTypeNameByCode(String code) {
         return this.baseMapper.selectOne(new LambdaQueryWrapper<SignalClassify>().eq(SignalClassify::getTypeCode, code));
     }
+
+    @Override
+    public List<SignalClassify> getList() {
+        return this.baseMapper.selectList(new LambdaQueryWrapper<>());
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
@@ -17,11 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.SignServiceImpl;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +54,10 @@ public class SignController extends BaseController {
 
 	@Autowired
 	OrgUsrServiceImpl iOrgUsrService;
+
+	@Autowired
+	RedisUtils redisUtils;
+
     /**
      * 新增打卡记录
      *
@@ -175,6 +185,29 @@ public class SignController extends BaseController {
 	}
 
 	/**
+	 * 列表分页查询
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/center/static/page")
+	@ApiOperation(httpMethod = "POST",value = "中心级卡片驻站消防员出勤柱状图",  notes = "中心级卡片驻站消防员出勤柱状图")
+	public ResponseModel<Map<String, Object>> queryPeopleInfoForPage(@RequestBody SinStaticDto dto) {
+		ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		String bizOrgCode = null;
+		if(null != reginParam) {
+			bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode();
+		}
+		dto.setBizOrgCode(bizOrgCode);
+		List<Map<String, Object>> res = signServiceImpl.queryPeopleInfo(dto);
+		Map<String, Object> map1 = new HashMap<>();
+		map1.put("bizOrgCode", bizOrgCode);
+		map1.put("xData", res.stream().map(x -> x.get("date")).collect(Collectors.toList()));
+		map1.put("yData", res.stream().map(x -> x.get("signNum")).collect(Collectors.toList()));
+		return ResponseHelper.buildResponse(map1);
+	}
+
+	/**
 	 * 列表全部数据查询
      *
 	 * @return

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

@@ -81,6 +81,11 @@ public class SignServiceImpl extends BaseService<SignDto,Sign,SignMapper> implem
         return sinStaticDtoIPage;
     }
 
+    public List<Map<String, Object>> queryPeopleInfo(SinStaticDto dto)   {
+        List<Map<String, Object>> res = this.baseMapper.queryPeopleInfo(dto);
+        return res;
+    }
+
     /**
      * 列表查询 示例
      */

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

@@ -1095,4 +1095,18 @@ public class PlanTaskController extends AbstractBaseController {
         }
     }
 
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "idx消防巡查报表调用", notes = "idx消防巡查报表调用")
+    @RequestMapping(value = "/task/info", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel getPlanTaskInfo(@ApiParam(value = "站编码") @RequestParam(required = false) String bizOrgCode,
+                                             @ApiParam(value = "开始日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+                                             @ApiParam(value = "结束日期") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+        try {
+            Map<String, Object> map = planTaskService.queryPatrolInfo(bizOrgCode, startDate, endDate);
+            return CommonPatrolResponseUtil.success(map);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonPatrolResponseUtil.failure("远程查询巡检信息失败！");
+        }
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -224,4 +224,6 @@ public interface PlanTaskMapper extends BaseMapper {
 	Map<String, Object> queryPatrolInfoList(@Param(value="bizOrgCode") String bizOrgCode, @Param(value="startDate") Date startDate, @Param(value="endDate") Date endDate);
 
 	Map<String, Object> queryPatrolEquipInfo(@Param(value="bizOrgCode") String bizOrgCode, @Param(value="startDate") Date startDate, @Param(value="endDate") Date endDate);
+
+	List<Map<String, Object>> queryPatrolInfo(@Param(value="bizOrgCode") String bizOrgCode, @Param(value="startDate") Date startDate, @Param(value="endDate") Date endDate);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -2100,6 +2100,15 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         return statics;
     }
 
+    @Override
+    public Map<String, Object> queryPatrolInfo(String bizOrgCode, Date startDate, Date endDate) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        list = planTaskMapper.queryPatrolInfo(bizOrgCode, startDate, endDate);
+        Map<String, Object> map = new HashMap<>();
+        map.put("patrol", list);
+        return map;
+    }
+
     public static byte[] file2byte(File file) {
         try {
             FileInputStream in = new FileInputStream(file);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java

@@ -200,4 +200,7 @@ public interface IPlanTaskService {
 	void download(HttpServletRequest request, HttpServletResponse response, String taskDetailId) throws UnsupportedEncodingException;
 
 	Map<String,Object> queryPatrolInfoList(String bizOrgCode, Date startDate, Date endDate);
+
+	Map<String,Object> queryPatrolInfo(String bizOrgCode, Date startDate, Date endDate);
+
 }

amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml

@@ -1000,6 +1000,7 @@
             UPDATE wl_equipment_specific_index esi SET esi.type_code = ( SELECT type_code FROM wl_equipment_index wei WHERE esi.equipment_index_id = wei.id );
         </sql>
     </changeSet>
+
     <changeSet author="keyong" id="1697017798">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -1011,4 +1012,32 @@
             ALTER TABLE `f_fire_fighting_system` ADD COLUMN `system_run_state` VARCHAR (10) DEFAULT '1' COMMENT '站端消防系统运行状态 0-停止 1-运行';
         </sql>
     </changeSet>
+
+    <changeSet author="keyong" id="1698392137">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="wl_fault_case"/>
+            </not>
+        </preConditions>
+        <comment>create table wl_fault_case 故障案例</comment>
+        <sql>
+            CREATE TABLE `wl_fault_case` (
+              `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+              `system_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统id',
+              `system_type_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统名称',
+              `system_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '系统名称',
+              `equip_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部件id',
+              `equip_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '部件名称',
+              `fault_level` varchar(20) DEFAULT NULL COMMENT '故障等级',
+              `fault_type` varchar(20) DEFAULT NULL COMMENT '故障类型',
+              `fault_describe` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '故障描述',
+              `handle_advise` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '处理建议',
+              `fault_effect` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '故障影响',
+              `preventive_measure` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '预防措施',
+              `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+              `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+              PRIMARY KEY (`id`) USING BTREE
+            ) ENGINE=InnoDB AUTO_INCREMENT=20220218 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='故障案例表';
+        </sql>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

amos-boot-system-equip/src/main/resources/mapper/FaultCaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.equipmanage.mapper.FaultCaseMapper">
+
+    <select id="listPage" resultType="com.yeejoin.equipmanage.common.entity.FaultCase">
+        SELECT
+               *
+        FROM
+            wl_fault_case
+        <where>
+            <if test="dto.systemId != null and dto.systemId != ''">
+                FIND_IN_SET(#{dto.systemId}, system_id)
+            </if>
+            <if test="dto.faultLevel != null and dto.faultLevel != ''">
+                AND fault_level = #{dto.faultLevel}
+            </if>
+            <if test="dto.faultType != null and dto.faultType != ''">
+                AND fault_type = #{dto.faultType}
+            </if>
+            <if test="dto.searchName != null and dto.searchName != ''">
+                AND (equip_name LIKE concat('%', #{dto.searchName},'%') OR system_name LIKE concat('%', #{dto.searchName},'%') OR fault_describe LIKE concat('%', #{dto.searchName},'%'))
+            </if>
+        </where>
+    </select>
+
+    <select id="getFaultCaseList" resultType="Map">
+        SELECT
+            count(1) AS `value`,
+            '' AS unit,
+            wfc.system_name AS `name`,
+            wfc.id AS `key`,
+            wfc.system_type_code AS typeCode
+        FROM
+            wl_fault_case wfc
+        GROUP BY wfc.system_type_code
+    </select>
+</mapper>

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -55,7 +55,17 @@
             LEFT JOIN wl_equipment AS wle ON wle.id = det.equipment_id
             LEFT JOIN wl_stock_detail AS wlsd on  wlsd.equipment_detail_id = det.id
        WHERE
-           find_in_set(#{systemId},spe.system_id) and spe.single = true  and 	wlsd.`status` = 1
+           find_in_set(#{systemId},spe.system_id) and spe.single = true and wlsd.`status` = 1
+    </select>
+
+    <select id="getEquipBySystemId" resultMap="EquiplistBySystemId">
+        SELECT
+            spe.id,
+            spe.`name` equipment_name
+        FROM
+            wl_equipment_specific AS spe
+        WHERE
+            find_in_set(#{systemId},spe.system_id)
     </select>
 
     <select id="getEquiplistBySystemIdList" resultType="com.yeejoin.equipmanage.common.entity.vo.EquiplistSpecificBySystemVO">

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1586,4 +1586,57 @@
 		</where>
 		) temp
 	</select>
+
+	<select id="queryPatrolInfo" resultType="Map">
+		SELECT
+		s1.date,
+		IFNULL(s2.`name`, '') AS `name`,
+		IFNULL(s2.`code`, '') AS `code`,
+		IFNULL(s2.`planPerson`, '') AS planPerson,
+		IFNULL(s2.`chargePerson`, '') AS chargePerson,
+		IFNULL(s2.`beginTime`, '') AS beginTime,
+		IFNULL(s2.`endTime`, '') AS endTime,
+		'patrol' AS type
+		FROM
+		(
+		SELECT
+		@s := @s + 1  AS `index`,
+		DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD(#{endDate}, INTERVAL - DATEDIFF(#{endDate}, #{startDate}) DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date
+		FROM
+		mysql.help_topic,
+		( SELECT @s := -1 ) temp
+		WHERE
+		@s &lt; DATEDIFF(#{endDate}, #{startDate})
+		) s1
+		LEFT JOIN (
+		SELECT
+		s.*
+		FROM
+		(
+		SELECT
+		p.`name`,
+		pt.batch_no AS `code`,
+		pt.user_name AS planPerson,
+		pt.user_name AS chargePerson,
+		pt.begin_time AS beginTime,
+		pt.end_time AS endTime,
+		DATE_FORMAT(pt.check_date, '%Y-%m-%d') AS date
+		FROM
+		`p_plan_task` pt
+		LEFT JOIN p_plan p ON p.id = pt.plan_id
+		<where>
+			pt.finish_status=2
+			<if test="bizOrgCode != null">
+				AND p.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
+			</if>
+		</where>
+		GROUP BY
+		LEFT (pt.check_date, 10)
+		ORDER BY
+		pt.check_date
+		) s
+		) s2 ON s2.date = s1.date
+		ORDER BY
+		s1.date
+	</select>
 </mapper>
\ No newline at end of file

pom.xml

@@ -311,12 +311,12 @@
 		<repository>
 			<id>Releases</id>
 			<name>Releases</name>
-			<url>http://36.46.149.14:8081/nexus/content/repositories/releases/</url>
+			<url>http://113.142.68.105:8081/nexus/content/repositories/releases/</url>
 		</repository>
 		<repository>
 			<id>Snapshots</id>
 			<name>Snapshots</name>
-			<url>http://36.46.149.14:8081/nexus/content/repositories/snapshots/</url>
+			<url>http://113.142.68.105:8081/nexus/content/repositories/snapshots/</url>
 		</repository>
 		<repository>
 			<id>com.e-iceblue</id>
@@ -326,7 +326,7 @@
 		<repository>
 			<id>thirdparty</id>
 			<name>thirdparty</name>
-			<url>http://36.46.149.14:8081/nexus/content/repositories/thirdparty/</url>
+			<url>http://113.142.68.105:8081/nexus/content/repositories/thirdparty/</url>
 		</repository>
 	</repositories>