Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/zhengyuan-danger-chemistry-manage

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

+package com.zehong.web.controller.system;
+
+import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.framework.web.service.TokenService;
+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.TNfcRecord;
+import com.zehong.system.service.ITNfcRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * nfc巡检记录idController
+ * 
+ * @author zehong
+ * @date 2022-10-18
+ */
+@RestController
+@RequestMapping("/system/record")
+public class TNfcRecordController extends BaseController
+{
+    @Autowired
+    private ITNfcRecordService tNfcRecordService;
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 查询nfc巡检记录id列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TNfcRecord tNfcRecord)
+    {
+        startPage();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        tNfcRecord.setCreateUser(user.getUserId());
+        List<TNfcRecord> list = tNfcRecordService.selectTNfcRecordList(tNfcRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出nfc巡检记录id列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "nfc巡检记录id", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TNfcRecord tNfcRecord)
+    {
+        List<TNfcRecord> list = tNfcRecordService.selectTNfcRecordList(tNfcRecord);
+        ExcelUtil<TNfcRecord> util = new ExcelUtil<TNfcRecord>(TNfcRecord.class);
+        return util.exportExcel(list, "nfc巡检记录id数据");
+    }
+
+    /**
+     * 获取nfc巡检记录id详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:query')")
+    @GetMapping(value = "/{recordId}")
+    public AjaxResult getInfo(@PathVariable("recordId") Long recordId)
+    {
+        return AjaxResult.success(tNfcRecordService.selectTNfcRecordById(recordId));
+    }
+
+    /**
+     * 新增nfc巡检记录id
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:add')")
+    @Log(title = "nfc巡检记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TNfcRecord tNfcRecord)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+        tNfcRecord.setCreateUser(user.getUserId());
+        return toAjax(tNfcRecordService.insertTNfcRecord(tNfcRecord));
+    }
+
+    /**
+     * 修改nfc巡检记录id
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:edit')")
+    @Log(title = "nfc巡检记录id", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TNfcRecord tNfcRecord)
+    {
+        return toAjax(tNfcRecordService.updateTNfcRecord(tNfcRecord));
+    }
+
+    /**
+     * 删除nfc巡检记录id
+     */
+    //@PreAuthorize("@ss.hasPermi('system:record:remove')")
+    @Log(title = "nfc巡检记录id", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{recordIds}")
+    public AjaxResult remove(@PathVariable Long[] recordIds)
+    {
+        return toAjax(tNfcRecordService.deleteTNfcRecordByIds(recordIds));
+    }
+}

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;
+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.TNfcSetting;
+import com.zehong.system.service.ITNfcSettingService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * settingController
+ *
+ * @author zehong
+ * @date 2022-10-17
+ */
+@RestController
+@RequestMapping("/system/inspection")
+public class TNfcSettingController extends BaseController
+{
+    @Autowired
+    private ITNfcSettingService tNfcSettingService;
+
+    /**
+     * 查询巡检列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TNfcSetting tNfcSetting)
+    {
+        startPage();
+        List<TNfcSetting> list = tNfcSettingService.selectTNfcSettingList(tNfcSetting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    @GetMapping("/punchClockList")
+    public TableDataInfo punchClockList(TNfcSetting tNfcSetting){
+        startPage();
+        List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检打卡列表
+     */
+    @Log(title = "setting", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportPunchClockList")
+    public AjaxResult exportPunchClockList(TNfcSetting tNfcSetting)
+    {
+        List<TNfcRecord> list = tNfcSettingService.punchClockList(tNfcSetting);
+        ExcelUtil<TNfcRecord> util = new ExcelUtil<TNfcRecord>(TNfcRecord.class);
+        return util.exportExcel(list, "巡检打卡数据");
+    }
+
+    /**
+     * 导出巡检列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:export')")
+    @Log(title = "setting", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TNfcSetting tNfcSetting)
+    {
+        List<TNfcSetting> list = tNfcSettingService.selectTNfcSettingList(tNfcSetting);
+        ExcelUtil<TNfcSetting> util = new ExcelUtil<TNfcSetting>(TNfcSetting.class);
+        return util.exportExcel(list, "setting数据");
+    }
+
+    /**
+     * 获取巡检详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:query')")
+    @GetMapping(value = "/{nfcId}")
+    public AjaxResult getInfo(@PathVariable("nfcId") Long nfcId)
+    {
+        return AjaxResult.success(tNfcSettingService.selectTNfcSettingById(nfcId));
+    }
+
+    /**
+     * 根据nfcNum获取巡检详细信息
+     */
+    @GetMapping(value = "/selectByNfcNum")
+    public AjaxResult getInfoByNfcNum(String nfcNum)
+    {
+        return AjaxResult.success(tNfcSettingService.getInfoByNfcNum(nfcNum));
+    }
+    /**
+     * 新增巡检
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:add')")
+    @Log(title = "setting", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TNfcSetting tNfcSetting)
+    {
+        System.out.println(tNfcSetting);
+        return toAjax(tNfcSettingService.insertTNfcSetting(tNfcSetting));
+    }
+
+    /**
+     * 修改巡检
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:edit')")
+    @Log(title = "setting", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TNfcSetting tNfcSetting)
+    {
+        return toAjax(tNfcSettingService.updateTNfcSetting(tNfcSetting));
+    }
+
+    /**
+     * 删除巡检
+     */
+    //@PreAuthorize("@ss.hasPermi('system:setting:remove')")
+    @Log(title = "setting", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{nfcIds}")
+    public AjaxResult remove(@PathVariable Long[] nfcIds)
+    {
+        return toAjax(tNfcSettingService.deleteTNfcSettingByIds(nfcIds));
+    }
+}

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

+package com.zehong.system.domain;
+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 {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 巡检记录
+     */
+    private Long recordId;
+
+    /**
+     * nfc_id
+     */
+    private Long nfcId;
+
+    /**
+     * 图片地址
+     */
+    private String picture;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 上报人姓名
+     */
+    private Long createUser;
+
+    /**巡检地点*/
+    @Excel(name = "巡检地点")
+    private String patrolAddress;
+
+    /**巡检区域*/
+    @Excel(name = "巡检区域")
+    private String dictLabel;
+
+    /**巡检内容*/
+    @Excel(name = "巡检内容")
+    private String  patrolComent;
+
+    /**巡检频次*/
+    @Excel(name = "巡检频次")
+    private String patrolFrequency;
+
+    /** 巡检人*/
+    @Excel(name = "上报人")
+    private String nickName;
+
+    private String userName;
+
+    private String startTime;
+
+    private String endTime;
+
+    /**
+     * 是否正常 0否 1是
+     */
+    @Excel(name = "巡检结果", readConverterExp = "0=异常,1=正常")
+    private Integer isNormal;
+
+    /**上报时间*/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "上报时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
+
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
+
+    public String getDictLabel() {
+        return dictLabel;
+    }
+
+    public void setDictLabel(String dictLabel) {
+        this.dictLabel = dictLabel;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getPatrolAddress() {
+        return patrolAddress;
+    }
+
+    public void setPatrolAddress(String patrolAddress) {
+        this.patrolAddress = patrolAddress;
+    }
+
+    public String getPatrolComent() {
+        return patrolComent;
+    }
+
+    public void setPatrolComent(String patrolComent) {
+        this.patrolComent = patrolComent;
+    }
+
+    public String getPatrolFrequency() {
+        return patrolFrequency;
+    }
+
+    public void setPatrolFrequency(String patrolFrequency) {
+        this.patrolFrequency = patrolFrequency;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Long recordId) {
+        this.recordId = recordId;
+    }
+
+    public Long getNfcId() {
+        return nfcId;
+    }
+
+    public void setNfcId(Long nfcId) {
+        this.nfcId = nfcId;
+    }
+
+    public Integer getIsNormal() {
+        return isNormal;
+    }
+
+    public void setIsNormal(Integer isNormal) {
+        this.isNormal = isNormal;
+    }
+
+    public String getPicture() {
+        return picture;
+    }
+
+    public void setPicture(String picture) {
+        this.picture = picture;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    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 "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

+package com.zehong.system.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * setting对象 t_nfc_setting
+ *
+ * @author zehong
+ * @date 2022-10-17
+ */
+public class TNfcSetting extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** nfc_id */
+    private Long nfcId;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer patrolSort;
+
+    /** 巡检地点 */
+    @Excel(name = "巡检地点")
+    private String patrolAddress;
+
+    /** 巡检内容 */
+    @Excel(name = "巡检内容")
+    private String patrolComent;
+
+    /** 巡检频次 */
+    @Excel(name = "巡检频次")
+    private String patrolFrequency;
+
+    /** nfc编号 */
+    @Excel(name = "nfc编号")
+    private String nfcNum;
+
+    /** 是否删除 0否 1是 */
+    private Integer isDel;
+
+    /**
+     * 区域 编号
+     */
+    private String region;
+
+    /**
+     * 巡检区域
+     */
+    private String nickName;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkStartTime;
+
+    /**
+     * 结束时间
+     * @return
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String applyWorkEndTime;
+
+
+
+    public String getApplyWorkStartTime() {
+        return applyWorkStartTime;
+    }
+
+    public void setApplyWorkStartTime(String applyWorkStartTime) {
+        this.applyWorkStartTime = applyWorkStartTime;
+    }
+
+    public String getApplyWorkEndTime() {
+        return applyWorkEndTime;
+    }
+
+    public void setApplyWorkEndTime(String applyWorkEndTime) {
+        this.applyWorkEndTime = applyWorkEndTime;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public void setNfcId(Long nfcId)
+    {
+        this.nfcId = nfcId;
+    }
+
+    public Long getNfcId()
+    {
+        return nfcId;
+    }
+    public void setPatrolSort(Integer patrolSort)
+    {
+        this.patrolSort = patrolSort;
+    }
+
+    public Integer getPatrolSort()
+    {
+        return patrolSort;
+    }
+    public void setPatrolAddress(String patrolAddress)
+    {
+        this.patrolAddress = patrolAddress;
+    }
+
+    public String getPatrolAddress()
+    {
+        return patrolAddress;
+    }
+    public void setPatrolComent(String patrolComent)
+    {
+        this.patrolComent = patrolComent;
+    }
+
+    public String getPatrolComent()
+    {
+        return patrolComent;
+    }
+    public void setPatrolFrequency(String patrolFrequency)
+    {
+        this.patrolFrequency = patrolFrequency;
+    }
+
+    public String getPatrolFrequency()
+    {
+        return patrolFrequency;
+    }
+    public void setNfcNum(String nfcNum)
+    {
+        this.nfcNum = nfcNum;
+    }
+
+    public String getNfcNum()
+    {
+        return nfcNum;
+    }
+    public void setIsDel(Integer isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return "TNfcSetting{" +
+                "nfcId=" + nfcId +
+                ", patrolSort=" + patrolSort +
+                ", patrolAddress='" + patrolAddress + '\'' +
+                ", patrolComent='" + patrolComent + '\'' +
+                ", patrolFrequency='" + patrolFrequency + '\'' +
+                ", nfcNum='" + nfcNum + '\'' +
+                ", isDel=" + isDel +
+                ", region='" + region + '\'' +
+                ", nickName='" + nickName + '\'' +
+                ", applyWorkStartTime=" + applyWorkStartTime +
+                ", applyWorkEndTime=" + applyWorkEndTime +
+                '}';
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TNfcRecord;
+
+/**
+ * nfc巡检记录idMapper接口
+ * 
+ * @author zehong
+ * @date 2022-10-18
+ */
+public interface TNfcRecordMapper 
+{
+    /**
+     * 查询nfc巡检记录id
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return nfc巡检记录id
+     */
+    public TNfcRecord selectTNfcRecordById(Long recordId);
+
+    /**
+     * 查询nfc巡检记录id列表
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return nfc巡检记录id集合
+     */
+    public List<TNfcRecord> selectTNfcRecordList(TNfcRecord tNfcRecord);
+
+    /**
+     * 新增nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    public int insertTNfcRecord(TNfcRecord tNfcRecord);
+
+    /**
+     * 修改nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    public int updateTNfcRecord(TNfcRecord tNfcRecord);
+
+    /**
+     * 删除nfc巡检记录id
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return 结果
+     */
+    public int deleteTNfcRecordById(Long recordId);
+
+    /**
+     * 批量删除nfc巡检记录id
+     * 
+     * @param recordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTNfcRecordByIds(Long[] recordIds);
+}

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
+{
+    /**
+     * 查询setting
+     *
+     * @param nfcId settingID
+     * @return setting
+     */
+    public TNfcSetting selectTNfcSettingById(Long nfcId);
+
+    /**
+     * 根据nfcNum查询详情
+     * @param nfcNum
+     */
+    public TNfcSetting getInfoByNfcNum(String nfcNum);
+
+    /**
+     * 查询setting列表
+     *
+     * @param tNfcSetting setting
+     * @return setting集合
+     */
+    public List<TNfcSetting> selectTNfcSettingList(TNfcSetting tNfcSetting);
+
+    /**
+     * 新增setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    public int insertTNfcSetting(TNfcSetting tNfcSetting);
+
+    /**
+     * 修改setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    public int updateTNfcSetting(TNfcSetting tNfcSetting);
+
+    /**
+     * 删除setting
+     *
+     * @param nfcId settingID
+     * @return 结果
+     */
+    public int deleteTNfcSettingById(Long nfcId);
+
+    /**
+     * 批量删除setting
+     *
+     * @param nfcIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTNfcSettingByIds(Long[] nfcIds);
+
+    /**
+     * 巡检打卡查询列表
+     * @param tNfcSetting
+     * @return
+     */
+    List<TNfcRecord> punchClockList(TNfcSetting tNfcSetting);
+
+    /**
+     * 查询nfc编号是否已经注册
+     * @param nfcNum
+     * @return
+     */
+    int getNfcNum(String nfcNum);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TNfcRecord;
+
+/**
+ * nfc巡检记录idService接口
+ * 
+ * @author zehong
+ * @date 2022-10-18
+ */
+public interface ITNfcRecordService 
+{
+    /**
+     * 查询nfc巡检记录id
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return nfc巡检记录id
+     */
+    public TNfcRecord selectTNfcRecordById(Long recordId);
+
+    /**
+     * 查询nfc巡检记录id列表
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return nfc巡检记录id集合
+     */
+    public List<TNfcRecord> selectTNfcRecordList(TNfcRecord tNfcRecord);
+
+    /**
+     * 新增nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    public int insertTNfcRecord(TNfcRecord tNfcRecord);
+
+    /**
+     * 修改nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    public int updateTNfcRecord(TNfcRecord tNfcRecord);
+
+    /**
+     * 批量删除nfc巡检记录id
+     * 
+     * @param recordIds 需要删除的nfc巡检记录idID
+     * @return 结果
+     */
+    public int deleteTNfcRecordByIds(Long[] recordIds);
+
+    /**
+     * 删除nfc巡检记录id信息
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return 结果
+     */
+    public int deleteTNfcRecordById(Long recordId);
+}

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
+{
+    /**
+     * 查询setting
+     *
+     * @param nfcId settingID
+     * @return setting
+     */
+    public TNfcSetting selectTNfcSettingById(Long nfcId);
+
+    /**
+     * 根据nfc获取详情
+     * @param nfcNum
+     * @return
+     */
+    public TNfcSetting getInfoByNfcNum(String nfcNum);
+    /**
+     * 查询setting列表
+     *
+     * @param tNfcSetting setting
+     * @return setting集合
+     */
+    public List<TNfcSetting> selectTNfcSettingList(TNfcSetting tNfcSetting);
+
+    /**
+     * 新增setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    public int insertTNfcSetting(TNfcSetting tNfcSetting);
+
+    /**
+     * 修改setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    public int updateTNfcSetting(TNfcSetting tNfcSetting);
+
+    /**
+     * 批量删除setting
+     *
+     * @param nfcIds 需要删除的settingID
+     * @return 结果
+     */
+    public int deleteTNfcSettingByIds(Long[] nfcIds);
+
+    /**
+     * 删除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/TNfcRecordServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TNfcRecordMapper;
+import com.zehong.system.domain.TNfcRecord;
+import com.zehong.system.service.ITNfcRecordService;
+
+/**
+ * nfc巡检记录idService业务层处理
+ * 
+ * @author zehong
+ * @date 2022-10-18
+ */
+@Service
+public class TNfcRecordServiceImpl implements ITNfcRecordService 
+{
+    @Autowired
+    private TNfcRecordMapper tNfcRecordMapper;
+
+    /**
+     * 查询nfc巡检记录id
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return nfc巡检记录id
+     */
+    @Override
+    public TNfcRecord selectTNfcRecordById(Long recordId)
+    {
+        return tNfcRecordMapper.selectTNfcRecordById(recordId);
+    }
+
+    /**
+     * 查询nfc巡检记录id列表
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return nfc巡检记录id
+     */
+    @Override
+    public List<TNfcRecord> selectTNfcRecordList(TNfcRecord tNfcRecord)
+    {
+        return tNfcRecordMapper.selectTNfcRecordList(tNfcRecord);
+    }
+
+    /**
+     * 新增nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    @Override
+    public int insertTNfcRecord(TNfcRecord tNfcRecord)
+    {
+        tNfcRecord.setCreateTime(DateUtils.getNowDate());
+        return tNfcRecordMapper.insertTNfcRecord(tNfcRecord);
+    }
+
+    /**
+     * 修改nfc巡检记录id
+     * 
+     * @param tNfcRecord nfc巡检记录id
+     * @return 结果
+     */
+    @Override
+    public int updateTNfcRecord(TNfcRecord tNfcRecord)
+    {
+        return tNfcRecordMapper.updateTNfcRecord(tNfcRecord);
+    }
+
+    /**
+     * 批量删除nfc巡检记录id
+     * 
+     * @param recordIds 需要删除的nfc巡检记录idID
+     * @return 结果
+     */
+    @Override
+    public int deleteTNfcRecordByIds(Long[] recordIds)
+    {
+        return tNfcRecordMapper.deleteTNfcRecordByIds(recordIds);
+    }
+
+    /**
+     * 删除nfc巡检记录id信息
+     * 
+     * @param recordId nfc巡检记录idID
+     * @return 结果
+     */
+    @Override
+    public int deleteTNfcRecordById(Long recordId)
+    {
+        return tNfcRecordMapper.deleteTNfcRecordById(recordId);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.TNfcRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TNfcSettingMapper;
+import com.zehong.system.domain.TNfcSetting;
+import com.zehong.system.service.ITNfcSettingService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * settingService业务层处理
+ *
+ * @author zehong
+ * @date 2022-10-17
+ */
+@Service
+public class TNfcSettingServiceImpl implements ITNfcSettingService
+{
+    @Autowired
+    private TNfcSettingMapper tNfcSettingMapper;
+
+    /**
+     * 查询setting
+     *
+     * @param nfcId settingID
+     * @return setting
+     */
+    @Override
+    public TNfcSetting selectTNfcSettingById(Long nfcId)
+    {
+        return tNfcSettingMapper.selectTNfcSettingById(nfcId);
+    }
+
+    /**
+     * 根据nfc查询
+     * @param nfcNum
+     * @return
+     */
+    @Override
+    public TNfcSetting getInfoByNfcNum(String nfcNum)
+    {
+        return tNfcSettingMapper.getInfoByNfcNum(nfcNum);
+    }
+
+    /**
+     * 查询setting列表
+     *
+     * @param tNfcSetting setting
+     * @return setting
+     */
+    @Override
+    public List<TNfcSetting> selectTNfcSettingList(TNfcSetting tNfcSetting)
+    {
+        return tNfcSettingMapper.selectTNfcSettingList(tNfcSetting);
+    }
+
+    /**
+     * 新增setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    @Override
+    public int insertTNfcSetting(TNfcSetting tNfcSetting)
+    {
+        tNfcSetting.setCreateTime(DateUtils.getNowDate());
+        return tNfcSettingMapper.insertTNfcSetting(tNfcSetting);
+    }
+
+    /**
+     * 修改setting
+     *
+     * @param tNfcSetting setting
+     * @return 结果
+     */
+    @Override
+    @Transactional
+    public int updateTNfcSetting(TNfcSetting tNfcSetting)
+    {
+        if (tNfcSetting.getNfcNum()==null||tNfcSetting.getNfcNum().equals("")){
+            int a = tNfcSettingMapper.updateTNfcSetting(tNfcSetting);
+            return a;
+        }
+        TNfcSetting ts = tNfcSettingMapper.getInfoByNfcNum(tNfcSetting.getNfcNum());
+        int nfcNum = tNfcSettingMapper.getNfcNum(tNfcSetting.getNfcNum());
+        if (nfcNum!=0){
+            ts.setNfcNum("");
+            tNfcSettingMapper.updateTNfcSetting(ts);
+        }
+        int a = tNfcSettingMapper.updateTNfcSetting(tNfcSetting);
+        return a;
+    }
+
+    /**
+     * 批量删除setting
+     *
+     * @param nfcIds 需要删除的settingID
+     * @return 结果
+     */
+    @Override
+    public int deleteTNfcSettingByIds(Long[] nfcIds)
+    {
+        return tNfcSettingMapper.deleteTNfcSettingByIds(nfcIds);
+    }
+
+    /**
+     * 删除setting信息
+     *
+     * @param nfcId settingID
+     * @return 结果
+     */
+    @Override
+    public int deleteTNfcSettingById(Long nfcId)
+    {
+        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/TNfcRecordMapper.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.TNfcRecordMapper">
+
+    <resultMap type="TNfcRecord" id="TNfcRecordResult">
+        <result property="recordId"    column="record_id"    />
+        <result property="nfcId"    column="nfc_id"    />
+        <result property="isNormal"    column="is_normal"    />
+        <result property="picture"    column="picture"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createUser"    column="create_user"    />
+        <result property="userName"    column="userName"    />
+        <result property="patrolAddress"    column="patrol_address"    />
+        <result property="patrolComent"    column="patrol_coment"    />
+        <result property="patrolFrequency"    column="patrol_frequency"    />
+    </resultMap>
+
+    <sql id="selectTNfcRecordVo">
+        select record_id, nfc_id, is_normal, picture, remarks, create_time, create_user from t_nfc_record
+    </sql>
+
+    <select id="selectTNfcRecordList" parameterType="TNfcRecord" resultMap="TNfcRecordResult">
+        SELECT nr.record_id, nr.nfc_id, nr.is_normal, nr.picture, nr.remarks, nr.create_time, nr.create_user,
+        u.`user_name` AS  userName,
+        ns.`patrol_address` ,ns.`patrol_coment`,ns.`patrol_frequency`
+        FROM t_nfc_record nr LEFT JOIN t_nfc_setting ns ON ns.`nfc_id` = nr.`nfc_id`
+        LEFT JOIN sys_user u ON u.user_id = nr.create_user
+        <where>
+            <if test="nfcId != null "> and nr.nfc_id = #{nfcId}</if>
+            <if test="isNormal != null "> and nr.is_normal = #{isNormal}</if>
+            <if test="picture != null  and picture != ''"> and nr.picture = #{picture}</if>
+            <if test="remarks != null  and remarks != ''"> and nr.remarks = #{remarks}</if>
+            <if test="createUser != null  and createUser != ''"> and nr.create_user = #{createUser}</if>
+            <if test="startTime != null  and startTime != ''"> and nr.create_time &gt; #{startTime}</if>
+            <if test="endTime != null  and endTime != ''"> and nr.create_time &lt; #{endTime}</if>
+        </where>
+        order By nr.create_time desc
+    </select>
+
+    <select id="selectTNfcRecordById" parameterType="Long" resultMap="TNfcRecordResult">
+        <include refid="selectTNfcRecordVo"/>
+        where record_id = #{recordId}
+    </select>
+
+    <insert id="insertTNfcRecord" parameterType="TNfcRecord" useGeneratedKeys="true" keyProperty="recordId">
+        insert into t_nfc_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="nfcId != null">nfc_id,</if>
+            <if test="isNormal != null">is_normal,</if>
+            <if test="picture != null">picture,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createUser != null">create_user,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="nfcId != null">#{nfcId},</if>
+            <if test="isNormal != null">#{isNormal},</if>
+            <if test="picture != null">#{picture},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createUser != null">#{createUser},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTNfcRecord" parameterType="TNfcRecord">
+        update t_nfc_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nfcId != null">nfc_id = #{nfcId},</if>
+            <if test="isNormal != null">is_normal = #{isNormal},</if>
+            <if test="picture != null">picture = #{picture},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createUser != null">create_user = #{createUser},</if>
+        </trim>
+        where record_id = #{recordId}
+    </update>
+
+    <delete id="deleteTNfcRecordById" parameterType="Long">
+        delete from t_nfc_record where record_id = #{recordId}
+    </delete>
+
+    <delete id="deleteTNfcRecordByIds" parameterType="String">
+        delete from t_nfc_record where record_id in
+        <foreach item="recordId" collection="array" open="(" separator="," close=")">
+            #{recordId}
+        </foreach>
+    </delete>
+</mapper>

danger-manage-system/src/main/resources/mapper/system/TNfcSettingMapper.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.TNfcSettingMapper">
+
+    <resultMap type="TNfcSetting" id="TNfcSettingResult">
+        <result property="nfcId"    column="nfc_id"    />
+        <result property="patrolSort"    column="patrol_sort"    />
+        <result property="patrolAddress"    column="patrol_address"    />
+        <result property="patrolComent"    column="patrol_coment"    />
+        <result property="patrolFrequency"    column="patrol_frequency"    />
+        <result property="nfcNum"    column="nfc_num"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="region"    column="region"    />
+    </resultMap>
+
+    <sql id="selectTNfcSettingVo">
+        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">
+        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>
+            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>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+               and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
+        </where>
+        order  by patrol_sort
+    </select>
+
+    <select id="selectTNfcSettingById" parameterType="Long" resultMap="TNfcSettingResult">
+        <include refid="selectTNfcSettingVo"/>
+        where nfc_id = #{nfcId}
+    </select>
+    <select id="getInfoByNfcNum" parameterType="java.lang.String" resultMap="TNfcSettingResult">
+        <include refid="selectTNfcSettingVo"/>
+        where nfc_num = #{nfcNum}
+    </select>
+
+    <insert id="insertTNfcSetting" parameterType="TNfcSetting" useGeneratedKeys="true" keyProperty="nfcId">
+        insert into t_nfc_setting
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="patrolSort != null">patrol_sort,</if>
+            <if test="patrolAddress != null">patrol_address,</if>
+            <if test="patrolComent != null">patrol_coment,</if>
+            <if test="patrolFrequency != null">patrol_frequency,</if>
+            <if test="nfcNum != null">nfc_num,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="region != null">region,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="patrolSort != null">#{patrolSort},</if>
+            <if test="patrolAddress != null">#{patrolAddress},</if>
+            <if test="patrolComent != null">#{patrolComent},</if>
+            <if test="patrolFrequency != null">#{patrolFrequency},</if>
+            <if test="nfcNum != null">#{nfcNum},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="region != null">#{region},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTNfcSetting" parameterType="TNfcSetting">
+        update t_nfc_setting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="patrolSort != null">patrol_sort = #{patrolSort},</if>
+            <if test="patrolAddress != null">patrol_address = #{patrolAddress},</if>
+            <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="createTime != null">create_time = #{createTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+        </trim>
+        where nfc_id = #{nfcId}
+    </update>
+
+    <delete id="deleteTNfcSettingById" parameterType="Long">
+        delete from t_nfc_setting where nfc_id = #{nfcId}
+    </delete>
+
+    <update id="deleteTNfcSettingByIds" parameterType="String">
+        update  t_nfc_setting set is_del='1' where nfc_id in
+        <foreach item="nfcId" collection="array" open="(" separator="," close=")">
+            #{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>
+            <if test="applyWorkStartTime!=null and applyWorkStartTime!=''">
+                and a.create_time &gt;= #{applyWorkStartTime}
+            </if>
+            <if test="applyWorkEndTime!=null and applyWorkEndTime!=''">
+                and a.create_time &lt;= #{applyWorkEndTime}
+            </if>
+        </where>
+			group by a.create_time desc
+    </select>
+
+    <!--查询nfc编号是否已经注册-->
+    <select id="getNfcNum" resultType="java.lang.Integer">
+        select count(nfc_id) from t_nfc_setting  where nfc_num=#{nfcNum}
+    </select>
+</mapper>

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
+  })
+}
+
+//
+export function exportPunchClockList(query) {
+  return request({
+    url: '/system/inspection/exportPunchClockList',
+    method: 'get',
+    params: query
+  })
+}

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

+import request from '@/utils/request'
+
+// 查询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
+  })
+}