Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganAnalysisController.java

@@ -0,0 +1,49 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DataJinganAnalysis;
+import com.usky.fire.service.DataJinganAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 静安电子督察单数据 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@RestController
+@RequestMapping("/dataJinganAnalysis")
+public class DataJinganAnalysisController {
+    @Autowired
+    private DataJinganAnalysisService dataJinganAnalysisService;
+
+    /**
+     * 电子督察单管理-电子督察单列表查询
+     *
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    @GetMapping("analysisList")
+    public ApiResult<CommonPage<DataJinganAnalysis>> analysisList(@RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                  @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(dataJinganAnalysisService.analysisList(pageNum, pageSize));
+    }
+
+    /**
+     * 修改
+     * @param dataJinganAnalysis
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> update(@RequestBody DataJinganAnalysis dataJinganAnalysis){
+        dataJinganAnalysisService.update(dataJinganAnalysis);
+        return ApiResult.success();
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DataJinganPersonController.java

@@ -0,0 +1,21 @@
+package com.usky.fire.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@Controller
+@RequestMapping("/dataJinganPerson")
+public class DataJinganPersonController {
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DataJinganAnalysis.java

@@ -0,0 +1,163 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 静安电子督察单数据
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataJinganAnalysis implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 一级平台密钥
+     */
+    private String appKey;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime timestamp;
+
+    /**
+     * 数据格式
+     */
+    private String format;
+
+    /**
+     * 版本号
+     */
+    private String v;
+
+    /**
+     * 签名加密方式
+     */
+    private String signMethod;
+
+    /**
+     * 建筑物群id
+     */
+    private String pid;
+
+    /**
+     * 建筑物ID
+     */
+    private String bid;
+
+    /**
+     * 楼层ID
+     */
+    private String fid;
+
+    /**
+     * 督察单id
+     */
+    private String superviseId;
+
+    /**
+     * 督查单编号
+     */
+    private String superviseCode;
+
+    /**
+     * 处理状态（0未处理，1处理成功）
+     */
+    private Integer status;
+
+    /**
+     * 督察单内容
+     */
+    private String content;
+
+    /**
+     * 类型（1火警，2故障，3屏蔽，4隐患 (当type的值是隐患4时只有device_id,aid, 当type的值是1,2,3时只有mainframe_id, loop_number, position_number)）
+     */
+    private Integer type;
+
+    /**
+     * 二级平台设备id
+     */
+    private String deviceId;
+
+    /**
+     * 一级平台属性id
+     */
+    private String aid;
+
+    /**
+     * 二级平台回路编号（部件区号）
+     */
+    private String loopNumber;
+
+    /**
+     * 二级平台点位编号（部件位号）
+     */
+    private String positionNumber;
+
+    /**
+     * 二级平台主机id
+     */
+    private String mainframeId;
+
+    /**
+     * 签名
+     */
+    private String sign;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 处理人
+     */
+    private String handleBy;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handleTime;
+
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlePhone;
+
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DataJinganPerson.java

@@ -0,0 +1,131 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DataJinganPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 人工督查单解析后ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 物联网服务商接入平台给服务商分配的app_key
+     */
+    private String appKey;
+
+    /**
+     * 时间
+     */
+    private LocalDateTime timestamp;
+
+    /**
+     * 响应格式 : json
+     */
+    private String format;
+
+    /**
+     * API协议版本: 1.0
+     */
+    private String version;
+
+    /**
+     * 签名的摘要算法: md5
+     */
+    private String signMethod;
+
+    /**
+     * 一级平台的人工督察单id
+     */
+    private String artificialId;
+
+    /**
+     * 一级平台的建筑群id
+     */
+    private String pid;
+
+    /**
+     * 人工督察单编号
+     */
+    private String artificialCode;
+
+    /**
+     * 一级平台单位id
+     */
+    private String companyId;
+
+    /**
+     * 督察单内容
+     */
+    private String content;
+
+    /**
+     * 告警处理状态：0未处理，1处理成功
+     */
+    private Integer status;
+
+    /**
+     * 签名值，二级平台根据这个签名值判断数据来源
+     */
+    private String sign;
+
+    /**
+     * 二级平台单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 处理人
+     */
+    private String handleBy;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handleTime;
+
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlePhone;
+
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DataJinganAnalysisMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DataJinganAnalysis;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 静安电子督察单数据 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+public interface DataJinganAnalysisMapper extends CrudMapper<DataJinganAnalysis> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DataJinganPersonMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DataJinganPerson;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+public interface DataJinganPersonMapper extends CrudMapper<DataJinganPerson> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganAnalysisService.java

@@ -0,0 +1,28 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.fire.domain.DataJinganAnalysis;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 静安电子督察单数据 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+public interface DataJinganAnalysisService extends CrudService<DataJinganAnalysis> {
+
+    /**
+     * 电子督察单管理-电子督察单列表查询
+     *
+     * @param pageNum      当前页
+     * @param pageSize     每页条数
+     * @return
+     */
+    CommonPage<DataJinganAnalysis> analysisList(Integer pageNum, Integer pageSize);
+
+    void update(DataJinganAnalysis dataJinganAnalysis);
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DataJinganPersonService.java

@@ -0,0 +1,16 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DataJinganPerson;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+public interface DataJinganPersonService extends CrudService<DataJinganPerson> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganAnalysisServiceImpl.java

@@ -0,0 +1,47 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.fire.domain.DataJinganAnalysis;
+import com.usky.fire.mapper.DataJinganAnalysisMapper;
+import com.usky.fire.service.DataJinganAnalysisService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 静安电子督察单数据 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@Service
+public class DataJinganAnalysisServiceImpl extends AbstractCrudService<DataJinganAnalysisMapper, DataJinganAnalysis> implements DataJinganAnalysisService {
+
+    @Override
+    public CommonPage<DataJinganAnalysis> analysisList(Integer pageNum, Integer pageSize) {
+        IPage<DataJinganAnalysis> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DataJinganAnalysis> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DataJinganAnalysis::getTenantId, SecurityUtils.getTenantId())
+        .orderByDesc(DataJinganAnalysis::getId);
+        page = this.page(page,queryWrapper);
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
+    }
+
+    public void update(DataJinganAnalysis dataJinganAnalysis){
+        dataJinganAnalysis.setHandleStatus(1);
+        dataJinganAnalysis.setHandleBy(SecurityUtils.getUsername());
+        dataJinganAnalysis.setHandleTime(LocalDateTime.now());
+        dataJinganAnalysis.setHandlePhone(SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
+        this.updateById(dataJinganAnalysis);
+    }
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DataJinganPersonServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.fire.service.impl;
+
+import com.usky.fire.domain.DataJinganPerson;
+import com.usky.fire.mapper.DataJinganPersonMapper;
+import com.usky.fire.service.DataJinganPersonService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2024-03-07
+ */
+@Service
+public class DataJinganPersonServiceImpl extends AbstractCrudService<DataJinganPersonMapper, DataJinganPerson> implements DataJinganPersonService {
+
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DataJinganAnalysisMapper.xml

@@ -0,0 +1,37 @@
+<?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.usky.fire.mapper.DataJinganAnalysisMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DataJinganAnalysis">
+        <id column="id" property="id" />
+        <result column="app_key" property="appKey" />
+        <result column="timestamp" property="timestamp" />
+        <result column="format" property="format" />
+        <result column="v" property="v" />
+        <result column="sign_method" property="signMethod" />
+        <result column="pid" property="pid" />
+        <result column="bid" property="bid" />
+        <result column="fid" property="fid" />
+        <result column="supervise_id" property="superviseId" />
+        <result column="supervise_code" property="superviseCode" />
+        <result column="status" property="status" />
+        <result column="content" property="content" />
+        <result column="type" property="type" />
+        <result column="device_id" property="deviceId" />
+        <result column="aid" property="aid" />
+        <result column="loop_number" property="loopNumber" />
+        <result column="position_number" property="positionNumber" />
+        <result column="mainframe_id" property="mainframeId" />
+        <result column="sign" property="sign" />
+        <result column="company_code" property="companyCode" />
+        <result column="handle_by" property="handleBy" />
+        <result column="handle_time" property="handleTime" />
+        <result column="handle_content" property="handleContent" />
+        <result column="handle_phone" property="handlePhone" />
+        <result column="handle_status" property="handleStatus" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DataJinganPersonMapper.xml

@@ -0,0 +1,30 @@
+<?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.usky.fire.mapper.DataJinganPersonMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DataJinganPerson">
+        <id column="id" property="id" />
+        <result column="app_key" property="appKey" />
+        <result column="timestamp" property="timestamp" />
+        <result column="format" property="format" />
+        <result column="version" property="version" />
+        <result column="sign_method" property="signMethod" />
+        <result column="artificial_id" property="artificialId" />
+        <result column="pid" property="pid" />
+        <result column="artificial_code" property="artificialCode" />
+        <result column="company_id" property="companyId" />
+        <result column="content" property="content" />
+        <result column="status" property="status" />
+        <result column="sign" property="sign" />
+        <result column="company_code" property="companyCode" />
+        <result column="handle_by" property="handleBy" />
+        <result column="handle_time" property="handleTime" />
+        <result column="handle_content" property="handleContent" />
+        <result column="handle_phone" property="handlePhone" />
+        <result column="handle_status" property="handleStatus" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>