巡检签到功能。

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

@@ -62,6 +62,12 @@ public class TDeviceInfoController extends BaseController
         List<TDeviceInfo> list = tDeviceInfoService.selectTDeviceInfoList(tDeviceInfo);
         return getDataTable(list);
     }
+    @GetMapping("/alllist")
+    public AjaxResult alllist(TDeviceInfo tDeviceInfo)
+    {
+        List<TDeviceInfo> list = tDeviceInfoService.selectDeviceList(tDeviceInfo);
+        return AjaxResult.success(list);
+    }
 
     /**
      * 导出设备信息列表

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TPatrolCheckInController.java

+package com.zehong.system.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TPatrolCheckIn;
+import com.zehong.system.service.ITPatrolCheckInService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 巡检签到Controller
+ * 
+ * @author zehong
+ * @date 2023-03-10
+ */
+@RestController
+@RequestMapping("/system/in")
+public class TPatrolCheckInController extends BaseController
+{
+    @Autowired
+    private ITPatrolCheckInService tPatrolCheckInService;
+
+    /**
+     * 查询巡检签到列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPatrolCheckIn tPatrolCheckIn)
+    {
+        startPage();
+        List<TPatrolCheckIn> list = tPatrolCheckInService.selectTPatrolCheckInList(tPatrolCheckIn);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检签到列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:export')")
+    @Log(title = "巡检签到", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPatrolCheckIn tPatrolCheckIn)
+    {
+        List<TPatrolCheckIn> list = tPatrolCheckInService.selectTPatrolCheckInList(tPatrolCheckIn);
+        ExcelUtil<TPatrolCheckIn> util = new ExcelUtil<TPatrolCheckIn>(TPatrolCheckIn.class);
+        return util.exportExcel(list, "巡检签到数据");
+    }
+
+    /**
+     * 获取巡检签到详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:query')")
+    @GetMapping(value = "/{checkInId}")
+    public AjaxResult getInfo(@PathVariable("checkInId") Long checkInId)
+    {
+        return AjaxResult.success(tPatrolCheckInService.selectTPatrolCheckInById(checkInId));
+    }
+
+    /**
+     * 新增巡检签到
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:add')")
+    @Log(title = "巡检签到", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPatrolCheckIn tPatrolCheckIn)
+    {
+        return toAjax(tPatrolCheckInService.insertTPatrolCheckIn(tPatrolCheckIn));
+    }
+
+    /**
+     * 修改巡检签到
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:edit')")
+    @Log(title = "巡检签到", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPatrolCheckIn tPatrolCheckIn)
+    {
+        return toAjax(tPatrolCheckInService.updateTPatrolCheckIn(tPatrolCheckIn));
+    }
+
+    /**
+     * 删除巡检签到
+     */
+    //@PreAuthorize("@ss.hasPermi('system:in:remove')")
+    @Log(title = "巡检签到", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{checkInIds}")
+    public AjaxResult remove(@PathVariable Long[] checkInIds)
+    {
+        return toAjax(tPatrolCheckInService.deleteTPatrolCheckInByIds(checkInIds));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPatrolCheckIn.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 巡检签到对象 t_patrol_check_in
+ * 
+ * @author zehong
+ * @date 2023-03-10
+ */
+public class TPatrolCheckIn extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 签到id */
+    private Long checkInId;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 照片地址 */
+    @Excel(name = "照片地址")
+    private String photoUrl;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String patrolDescribe;
+
+    /** 上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /** 上报人 */
+    @Excel(name = "上报人")
+    private Long reportPerson;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    private String personName;
+
+    private Date reportTimeBegin;
+
+    private Date reportTimeEnd;
+
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public Date getReportTimeBegin() {
+        return reportTimeBegin;
+    }
+
+    public void setReportTimeBegin(Date reportTimeBegin) {
+        this.reportTimeBegin = reportTimeBegin;
+    }
+
+    public Date getReportTimeEnd() {
+        return reportTimeEnd;
+    }
+
+    public void setReportTimeEnd(Date reportTimeEnd) {
+        this.reportTimeEnd = reportTimeEnd;
+    }
+
+    public void setCheckInId(Long checkInId)
+    {
+        this.checkInId = checkInId;
+    }
+
+    public Long getCheckInId() 
+    {
+        return checkInId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setPhotoUrl(String photoUrl) 
+    {
+        this.photoUrl = photoUrl;
+    }
+
+    public String getPhotoUrl() 
+    {
+        return photoUrl;
+    }
+    public void setPatrolDescribe(String patrolDescribe) 
+    {
+        this.patrolDescribe = patrolDescribe;
+    }
+
+    public String getPatrolDescribe() 
+    {
+        return patrolDescribe;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setReportPerson(Long reportPerson) 
+    {
+        this.reportPerson = reportPerson;
+    }
+
+    public Long getReportPerson() 
+    {
+        return reportPerson;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("checkInId", getCheckInId())
+            .append("deviceName", getDeviceName())
+            .append("photoUrl", getPhotoUrl())
+            .append("patrolDescribe", getPatrolDescribe())
+            .append("reportTime", getReportTime())
+            .append("reportPerson", getReportPerson())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java

@@ -38,6 +38,7 @@ public interface TDeviceInfoMapper
      * @return 设备信息集合
      */
     public List<TDeviceInfo> selectTDeviceInfoList(TDeviceInfo tDeviceInfo);
+    public List<TDeviceInfo> selectDeviceList(TDeviceInfo tDeviceInfo);
 
     /**
      * 新增设备信息

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TPatrolCheckInMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPatrolCheckIn;
+
+/**
+ * 巡检签到Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-03-10
+ */
+public interface TPatrolCheckInMapper 
+{
+    /**
+     * 查询巡检签到
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 巡检签到
+     */
+    public TPatrolCheckIn selectTPatrolCheckInById(Long checkInId);
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到集合
+     */
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 删除巡检签到
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInById(Long checkInId);
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param checkInIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInByIds(Long[] checkInIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java

@@ -30,6 +30,7 @@ public interface ITDeviceInfoService
      * @return 设备信息集合
      */
     public List<TDeviceInfo> selectTDeviceInfoList(TDeviceInfo tDeviceInfo);
+    public List<TDeviceInfo> selectDeviceList(TDeviceInfo tDeviceInfo);
 
     /**
      * 新增设备信息

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITPatrolCheckInService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPatrolCheckIn;
+
+/**
+ * 巡检签到Service接口
+ * 
+ * @author zehong
+ * @date 2023-03-10
+ */
+public interface ITPatrolCheckInService 
+{
+    /**
+     * 查询巡检签到
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 巡检签到
+     */
+    public TPatrolCheckIn selectTPatrolCheckInById(Long checkInId);
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到集合
+     */
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn);
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param checkInIds 需要删除的巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInByIds(Long[] checkInIds);
+
+    /**
+     * 删除巡检签到信息
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 结果
+     */
+    public int deleteTPatrolCheckInById(Long checkInId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java

@@ -47,6 +47,12 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
     {
         return tDeviceInfoMapper.selectTDeviceInfoList(tDeviceInfo);
     }
+    @Override
+    public List<TDeviceInfo> selectDeviceList(TDeviceInfo tDeviceInfo)
+    {
+        return tDeviceInfoMapper.selectDeviceList(tDeviceInfo);
+    }
+
 
     /**
      * 新增设备信息

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TPatrolCheckInServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TPatrolCheckInMapper;
+import com.zehong.system.domain.TPatrolCheckIn;
+import com.zehong.system.service.ITPatrolCheckInService;
+
+/**
+ * 巡检签到Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-03-10
+ */
+@Service
+public class TPatrolCheckInServiceImpl implements ITPatrolCheckInService 
+{
+    @Autowired
+    private TPatrolCheckInMapper tPatrolCheckInMapper;
+
+    /**
+     * 查询巡检签到
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 巡检签到
+     */
+    @Override
+    public TPatrolCheckIn selectTPatrolCheckInById(Long checkInId)
+    {
+        return tPatrolCheckInMapper.selectTPatrolCheckInById(checkInId);
+    }
+
+    /**
+     * 查询巡检签到列表
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 巡检签到
+     */
+    @Override
+    public List<TPatrolCheckIn> selectTPatrolCheckInList(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.selectTPatrolCheckInList(tPatrolCheckIn);
+    }
+
+    /**
+     * 新增巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    @Override
+    public int insertTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.insertTPatrolCheckIn(tPatrolCheckIn);
+    }
+
+    /**
+     * 修改巡检签到
+     * 
+     * @param tPatrolCheckIn 巡检签到
+     * @return 结果
+     */
+    @Override
+    public int updateTPatrolCheckIn(TPatrolCheckIn tPatrolCheckIn)
+    {
+        return tPatrolCheckInMapper.updateTPatrolCheckIn(tPatrolCheckIn);
+    }
+
+    /**
+     * 批量删除巡检签到
+     * 
+     * @param checkInIds 需要删除的巡检签到ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPatrolCheckInByIds(Long[] checkInIds)
+    {
+        return tPatrolCheckInMapper.deleteTPatrolCheckInByIds(checkInIds);
+    }
+
+    /**
+     * 删除巡检签到信息
+     * 
+     * @param checkInId 巡检签到ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPatrolCheckInById(Long checkInId)
+    {
+        return tPatrolCheckInMapper.deleteTPatrolCheckInById(checkInId);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TDeviceInfoMapper.xml

@@ -59,6 +59,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by a.device_id desc
     </select>
+    <select id="selectDeviceList" parameterType="TDeviceInfo" resultMap="TDeviceInfoResult">
+        SELECT * FROM t_device_info WHERE device_name like concat('%', #{deviceName}, '%')
+    </select>
+
 
     <select id="selectTDeviceInfoById" parameterType="Long" resultMap="TDeviceInfoResult">
     select device_id, device_name, device_code, device_addr, device_model,device_type,

gassafetyprogress-system/src/main/resources/mapper/system/TPatrolCheckInMapper.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.zehong.system.mapper.TPatrolCheckInMapper">
+    
+    <resultMap type="TPatrolCheckIn" id="TPatrolCheckInResult">
+        <result property="checkInId"    column="check_in_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="photoUrl"    column="photo_url"    />
+        <result property="patrolDescribe"    column="patrol_describe"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="reportPerson"    column="report_person"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="personName"    column="person_name"    />
+    </resultMap>
+
+    <sql id="selectTPatrolCheckInVo">
+        SELECT
+            patrol.check_in_id,
+            patrol.device_name,
+            patrol.photo_url,
+            patrol.patrol_describe,
+            patrol.report_time,
+            patrol.report_person,
+            patrol.longitude,
+            patrol.latitude,
+            patrol.is_del,
+            patrol.remark,
+          u.nick_name AS person_name
+        FROM
+            t_patrol_check_in patrol
+        LEFT JOIN sys_user u ON patrol.report_person = u.user_id
+    </sql>
+
+    <select id="selectTPatrolCheckInList" parameterType="TPatrolCheckIn" resultMap="TPatrolCheckInResult">
+        <include refid="selectTPatrolCheckInVo"/>
+        <where>  
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="photoUrl != null  and photoUrl != ''"> and photo_url = #{photoUrl}</if>
+            <if test="patrolDescribe != null  and patrolDescribe != ''"> and patrol_describe = #{patrolDescribe}</if>
+            <if test="reportTimeBegin != null and reportTimeEnd != null"> and patrol.report_time BETWEEN #{reportTimeBegin} AND #{reportTimeEnd}</if>
+            <if test="reportPerson != null "> and report_person = #{reportPerson}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPatrolCheckInById" parameterType="Long" resultMap="TPatrolCheckInResult">
+        <include refid="selectTPatrolCheckInVo"/>
+        where check_in_id = #{checkInId}
+    </select>
+        
+    <insert id="insertTPatrolCheckIn" parameterType="TPatrolCheckIn" useGeneratedKeys="true" keyProperty="checkInId">
+        insert into t_patrol_check_in
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">device_name,</if>
+            <if test="photoUrl != null">photo_url,</if>
+            <if test="patrolDescribe != null">patrol_describe,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="reportPerson != null">report_person,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="photoUrl != null">#{photoUrl},</if>
+            <if test="patrolDescribe != null">#{patrolDescribe},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="reportPerson != null">#{reportPerson},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPatrolCheckIn" parameterType="TPatrolCheckIn">
+        update t_patrol_check_in
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="photoUrl != null">photo_url = #{photoUrl},</if>
+            <if test="patrolDescribe != null">patrol_describe = #{patrolDescribe},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="reportPerson != null">report_person = #{reportPerson},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where check_in_id = #{checkInId}
+    </update>
+
+    <delete id="deleteTPatrolCheckInById" parameterType="Long">
+        delete from t_patrol_check_in where check_in_id = #{checkInId}
+    </delete>
+
+    <delete id="deleteTPatrolCheckInByIds" parameterType="String">
+        delete from t_patrol_check_in where check_in_id in 
+        <foreach item="checkInId" collection="array" open="(" separator="," close=")">
+            #{checkInId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file