化工巡检

danger-manage-admin/src/main/java/com/zehong/web/controller/system/TNfcSettingController.java

 package com.zehong.web.controller.system;
 import java.util.List;
+
+import com.zehong.system.domain.TNfcRecord;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +46,18 @@ public class TNfcSettingController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    @GetMapping("/punchClockList")
+    public TableDataInfo punchClockList(TNfcSetting tNfcSetting){
+        startPage();
+        List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
+        return getDataTable(list);
+    }
+
     /**
      * 导出巡检列表
      */

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcRecord.java

 package com.zehong.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.annotation.Excel;
 import com.zehong.common.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * nfc巡检记录id对象 t_nfc_record
- * 
+ *
  * @author zehong
  * @date 2022-10-18
  */
-public class TNfcRecord extends BaseEntity
-{
+public class TNfcRecord extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 巡检记录 */
+    /**
+     * 巡检记录
+     */
     private Long recordId;
 
-    /** nfc_id */
+    /**
+     * nfc_id
+     */
     @Excel(name = "nfc_id")
     private Long nfcId;
 
-    /** 是否正常 0否 1是 */
+    /**
+     * 是否正常 0否 1是
+     */
     @Excel(name = "是否正常 0否 1是")
     private Integer isNormal;
 
-    /** 图片地址 */
+    /**
+     * 图片地址
+     */
     @Excel(name = "图片地址")
     private String picture;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     @Excel(name = "备注")
     private String remarks;
 
-    /** 上报人 */
+    /**上报时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    private Date createTime;
+
+    /**
+     * 上报人姓名
+     */
     @Excel(name = "上报人")
     private Long createUser;
 
-    private String userName;
-
-    @Excel(name = "巡检地点")
+    /**巡检地点*/
     private String patrolAddress;
 
-    /** 巡检内容 */
-    @Excel(name = "巡检内容")
-    private String patrolComent;
+    /**巡检内容*/
+    private String  patrolComent;
 
-    /** 巡检频次 */
-    @Excel(name = "巡检频次")
+    /**巡检频次*/
     private String patrolFrequency;
 
+    /** 巡检人*/
+    private String nickName;
+
+    private String userName;
+
     private String startTime;
 
     private String endTime;
 
-    public String getUserName() {
-        return userName;
-    }
+    /**巡检区域*/
+    private String dictLabel;
 
-    public void setUserName(String userName) {
-        this.userName = userName;
+    public String getDictLabel() {
+        return dictLabel;
     }
 
-    public String getStartTime() {
-        return startTime;
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
     }
 
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
+    @Override
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 
     public String getPatrolAddress() {
@@ -103,71 +115,110 @@ public class TNfcRecord extends BaseEntity
         this.patrolFrequency = patrolFrequency;
     }
 
-    public void setRecordId(Long recordId)
-    {
-        this.recordId = recordId;
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public Long getRecordId() 
-    {
+    public Long getRecordId() {
         return recordId;
     }
-    public void setNfcId(Long nfcId) 
-    {
-        this.nfcId = nfcId;
+
+    public void setRecordId(Long recordId) {
+        this.recordId = recordId;
     }
 
-    public Long getNfcId() 
-    {
+    public Long getNfcId() {
         return nfcId;
     }
-    public void setIsNormal(Integer isNormal) 
-    {
-        this.isNormal = isNormal;
+
+    public void setNfcId(Long nfcId) {
+        this.nfcId = nfcId;
     }
 
-    public Integer getIsNormal() 
-    {
+    public Integer getIsNormal() {
         return isNormal;
     }
-    public void setPicture(String picture) 
-    {
-        this.picture = picture;
+
+    public void setIsNormal(Integer isNormal) {
+        this.isNormal = isNormal;
     }
 
-    public String getPicture() 
-    {
+    public String getPicture() {
         return picture;
     }
-    public void setRemarks(String remarks) 
-    {
-        this.remarks = remarks;
+
+    public void setPicture(String picture) {
+        this.picture = picture;
     }
 
-    public String getRemarks() 
-    {
+    public String getRemarks() {
         return remarks;
     }
-    public void setCreateUser(Long createUser)
-    {
-        this.createUser = createUser;
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
     }
 
-    public Long getCreateUser()
-    {
+    public Long getCreateUser() {
         return createUser;
     }
 
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("recordId", getRecordId())
-            .append("nfcId", getNfcId())
-            .append("isNormal", getIsNormal())
-            .append("picture", getPicture())
-            .append("remarks", getRemarks())
-            .append("createTime", getCreateTime())
-            .append("createUser", getCreateUser())
-            .toString();
+        return "TNfcRecord{" +
+                "recordId=" + recordId +
+                ", nfcId=" + nfcId +
+                ", isNormal=" + isNormal +
+                ", picture='" + picture + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", createTime=" + createTime +
+                ", createUser=" + createUser +
+                ", patrolAddress='" + patrolAddress + '\'' +
+                ", patrolComent='" + patrolComent + '\'' +
+                ", patrolFrequency='" + patrolFrequency + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", userName='" + userName + '\'' +
+                ", startTime='" + startTime + '\'' +
+                ", endTime='" + endTime + '\'' +
+                ", dictLabel='" + dictLabel + '\'' +
+                '}';
     }
 }
+
+

danger-manage-system/src/main/java/com/zehong/system/domain/TNfcSetting.java

@@ -42,10 +42,22 @@ public class TNfcSetting extends BaseEntity
     private Integer isDel;
 
     /**
-     * 区域  0氨合成  1罐区
+     * 区域 编号
      */
     private String region;
 
+    /**
+     * 巡检区域
+     */
+    private String nickName;
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -134,6 +146,7 @@ public class TNfcSetting extends BaseEntity
                 ", nfcNum='" + nfcNum + '\'' +
                 ", isDel=" + isDel +
                 ", region='" + region + '\'' +
+                ", nickName='" + nickName + '\'' +
                 '}';
     }
 }

danger-manage-system/src/main/java/com/zehong/system/mapper/TNfcSettingMapper.java

 package com.zehong.system.mapper;
 
 import java.util.List;
+
+import com.zehong.system.domain.TNfcRecord;
 import com.zehong.system.domain.TNfcSetting;
 
 /**
  * settingMapper接口
- * 
+ *
  * @author zehong
  * @date 2022-10-17
  */
-public interface TNfcSettingMapper 
+public interface TNfcSettingMapper
 {
     /**
      * 查询setting
-     * 
+     *
      * @param nfcId settingID
      * @return setting
      */
@@ -27,7 +29,7 @@ public interface TNfcSettingMapper
 
     /**
      * 查询setting列表
-     * 
+     *
      * @param tNfcSetting setting
      * @return setting集合
      */
@@ -35,7 +37,7 @@ public interface TNfcSettingMapper
 
     /**
      * 新增setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -43,7 +45,7 @@ public interface TNfcSettingMapper
 
     /**
      * 修改setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -51,7 +53,7 @@ public interface TNfcSettingMapper
 
     /**
      * 删除setting
-     * 
+     *
      * @param nfcId settingID
      * @return 结果
      */
@@ -59,9 +61,16 @@ public interface TNfcSettingMapper
 
     /**
      * 批量删除setting
-     * 
+     *
      * @param nfcIds 需要删除的数据ID
      * @return 结果
      */
     public int deleteTNfcSettingByIds(Long[] nfcIds);
+
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
 }

danger-manage-system/src/main/java/com/zehong/system/service/ITNfcSettingService.java

 package com.zehong.system.service;
 
 import java.util.List;
+
+import com.zehong.system.domain.TNfcRecord;
 import com.zehong.system.domain.TNfcSetting;
 
 /**
  * settingService接口
- * 
+ *
  * @author zehong
  * @date 2022-10-17
  */
-public interface ITNfcSettingService 
+public interface ITNfcSettingService
 {
     /**
      * 查询setting
-     * 
+     *
      * @param nfcId settingID
      * @return setting
      */
@@ -27,7 +29,7 @@ public interface ITNfcSettingService
     public TNfcSetting getInfoByNfcNum(String nfcNum);
     /**
      * 查询setting列表
-     * 
+     *
      * @param tNfcSetting setting
      * @return setting集合
      */
@@ -35,7 +37,7 @@ public interface ITNfcSettingService
 
     /**
      * 新增setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -43,7 +45,7 @@ public interface ITNfcSettingService
 
     /**
      * 修改setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -51,7 +53,7 @@ public interface ITNfcSettingService
 
     /**
      * 批量删除setting
-     * 
+     *
      * @param nfcIds 需要删除的settingID
      * @return 结果
      */
@@ -59,9 +61,16 @@ public interface ITNfcSettingService
 
     /**
      * 删除setting信息
-     * 
+     *
      * @param nfcId settingID
      * @return 结果
      */
     public int deleteTNfcSettingById(Long nfcId);
+
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
 }

danger-manage-system/src/main/java/com/zehong/system/service/impl/TNfcSettingServiceImpl.java

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TNfcRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TNfcSettingMapper;
@@ -10,19 +11,19 @@ import com.zehong.system.service.ITNfcSettingService;
 
 /**
  * settingService业务层处理
- * 
+ *
  * @author zehong
  * @date 2022-10-17
  */
 @Service
-public class TNfcSettingServiceImpl implements ITNfcSettingService 
+public class TNfcSettingServiceImpl implements ITNfcSettingService
 {
     @Autowired
     private TNfcSettingMapper tNfcSettingMapper;
 
     /**
      * 查询setting
-     * 
+     *
      * @param nfcId settingID
      * @return setting
      */
@@ -45,7 +46,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
 
     /**
      * 查询setting列表
-     * 
+     *
      * @param tNfcSetting setting
      * @return setting
      */
@@ -57,7 +58,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
 
     /**
      * 新增setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -70,7 +71,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
 
     /**
      * 修改setting
-     * 
+     *
      * @param tNfcSetting setting
      * @return 结果
      */
@@ -82,7 +83,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
 
     /**
      * 批量删除setting
-     * 
+     *
      * @param nfcIds 需要删除的settingID
      * @return 结果
      */
@@ -94,7 +95,7 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
 
     /**
      * 删除setting信息
-     * 
+     *
      * @param nfcId settingID
      * @return 结果
      */
@@ -103,4 +104,14 @@ public class TNfcSettingServiceImpl implements ITNfcSettingService
     {
         return tNfcSettingMapper.deleteTNfcSettingById(nfcId);
     }
+
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    @Override
+    public List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting) {
+        return tNfcSettingMapper.punchClockList(tNfcSetting);
+    }
 }

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.xml

@@ -12,19 +12,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="patrolFrequency"    column="patrol_frequency"    />
         <result property="nfcNum"    column="nfc_num"    />
         <result property="createTime"    column="create_time"    />
+        <result property="region"    column="region"    />
         <result property="isDel"    column="is_del"    />
     </resultMap>
 
     <sql id="selectTNfcSettingVo">
-        select nfc_id, patrol_sort, patrol_address, patrol_coment, patrol_frequency, nfc_num, create_time, is_del from t_nfc_setting
+        select nfc_id, patrol_sort, patrol_address, patrol_coment, patrol_frequency, nfc_num, create_time,region, is_del from t_nfc_setting
     </sql>
 
     <select id="selectTNfcSettingList" parameterType="TNfcSetting" resultMap="TNfcSettingResult">
-        <include refid="selectTNfcSettingVo"/>
+        select a.*,b.dict_label as nickName from t_nfc_setting a
+        left join  sys_dict_data b on a.region=b.dict_value
         <where>
-            is_del='0'
-            and
-            region = #{region}
+            a.is_del='0' and b.dict_type='t_nfc_region'
+            <if test="region != null  and region != ''"> and  region = #{region}</if>
             <if test="patrolAddress != null  and patrolAddress != ''"> and patrol_address = #{patrolAddress}</if>
             <if test="nfcNum != null  and nfcNum != ''"> and nfc_num = #{nfcNum}</if>
         </where>
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where nfc_num = #{nfcNum}
     </select>
 
+
     <insert id="insertTNfcSetting" parameterType="TNfcSetting" useGeneratedKeys="true" keyProperty="nfcId">
         insert into t_nfc_setting
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -72,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="patrolComent != null">patrol_coment = #{patrolComent},</if>
             <if test="patrolFrequency != null">patrol_frequency = #{patrolFrequency},</if>
             <if test="nfcNum != null">nfc_num = #{nfcNum},</if>
+            <if test="region != null">region = #{region},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
         </trim>
@@ -88,4 +91,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{nfcId}
         </foreach>
     </update>
+
+    <!--巡检打卡查询列表-->
+    <select id="punchClockList" resultType="com.zehong.system.domain.TNfcRecord">
+        select a.is_normal as isNormal,a.remarks as remarks ,a.create_time as createTime,
+               b.patrol_address as patrolAddress,b.patrol_coment as patrolComent,b.patrol_frequency as patrolFrequency,
+			   c.nick_name as nickName,
+               d.dict_label as dictLabel
+           from t_nfc_record a left join t_nfc_setting b on a.nfc_id=b.nfc_id
+		        left join  sys_user  c  on a.create_user=c.user_id
+                left join sys_dict_data d on b.region=d.dict_value
+        <where>
+            b.is_del='0' and d.dict_type='t_nfc_region'
+            <if test="patrolAddress != null and patrolName != ''">
+                and b.patrol_address like concat('%', #{patrolAddress}, '%')
+            </if>
+            <if test="region != null and region != ''">
+                and b.region=#{region}
+            </if>
+        </where>
+			group by a.create_time desc
+    </select>
 </mapper>

danger-manage-web/src/api/system/setting.js

@@ -61,54 +61,4 @@ export function refreshSystemSetting(query) {
   })
 }
 
-// 查询setting列表
-export function listSetting(query) {
-  return request({
-    url: '/system/inspection/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询setting详细
-export function getSetting(nfcId) {
-  return request({
-    url: '/system/inspection/' + nfcId,
-    method: 'get'
-  })
-}
-
-// 新增setting
-export function addSetting(data) {
-  return request({
-    url: '/system/inspection',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改setting
-export function updateSetting(data) {
-  return request({
-    url: '/system/inspection',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除setting
-export function delSetting(nfcId) {
-  return request({
-    url: '/system/inspection/' + nfcId,
-    method: 'delete'
-  })
-}
-
-// 导出setting
-export function exportSetting(query) {
-  return request({
-    url: '/system/inspection/export',
-    method: 'get',
-    params: query
-  })
-}

danger-manage-web/src/api/system/statistics.js

+import request from '@/utils/request'
+
+// 查询setting列表
+export function listSetting(query) {
+  return request({
+    url: '/system/inspection/punchClockList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询setting详细
+export function getSetting(nfcId) {
+  return request({
+    url: '/system/inspection/' + nfcId,
+    method: 'get'
+  })
+}
+
+// 新增setting
+export function addSetting(data) {
+  return request({
+    url: '/system/inspection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改setting
+export function updateSetting(data) {
+  return request({
+    url: '/system/inspection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除setting
+export function delSetting(nfcId) {
+  return request({
+    url: '/system/inspection/' + nfcId,
+    method: 'delete'
+  })
+}
+
+// 导出setting
+export function exportSetting(query) {
+  return request({
+    url: '/system/inspection/export',
+    method: 'get',
+    params: query
+  })
+}