From ee8156e007c05261c9d727a87f83ee1cb11fea7e Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 10 八月 2022 12:56:58 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/FireLogMapper.xml                      |   16 ++++
 src/main/java/com/zy/asrs/service/FireLogService.java            |    8 ++
 src/main/java/com/zy/asrs/entity/FireLog.java                    |  136 ++++++++++++++++++++++++++++++++++
 src/main/java/com/zy/asrs/mapper/FireLogMapper.java              |   12 +++
 src/main/java/com/zy/asrs/service/impl/FireLogServiceImpl.java   |   12 +++
 src/main/java/com/zy/common/CodeBuilder.java                     |    8 +
 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java |   33 +++++++-
 7 files changed, 219 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/FireLog.java b/src/main/java/com/zy/asrs/entity/FireLog.java
new file mode 100644
index 0000000..fdf393c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/FireLog.java
@@ -0,0 +1,136 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("asr_fire_log")
+public class FireLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 缂栧彿
+     */
+    @ApiModelProperty(value= "缂栧彿")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 鍙戠敓骞存湀鏃�
+     */
+    @ApiModelProperty(value= "鏃ユ湡")
+    @TableField("ymd")
+    private String ymd;
+
+    /**
+     * 鎶ヨIO缂栧彿
+     */
+    @ApiModelProperty(value= "鎶ヨIO缂栧彿")
+    @TableField("fire_no")
+    private String fireNo;
+
+    /**
+     * 鎶ヨ鏃堕棿
+     */
+    @ApiModelProperty(value= "鎶ヨ鏃堕棿")
+    @TableField("fire_time")
+    private Date fireTime;
+
+    /**
+     * 搴撲綅
+     */
+    @ApiModelProperty(value= "搴撲綅")
+    @TableField("loc_no")
+    private String locNo;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("create_time")
+    private Date createTime;
+
+    public FireLog() {}
+
+    public FireLog(String fireNo,Date fireTime,String locNo,Date createTime) {
+        this.fireNo = fireNo;
+        this.fireTime = fireTime;
+        this.locNo = locNo;
+        this.createTime = createTime;
+    }
+
+//    FireLog fireLog = new FireLog(
+//            null,    // 鎶ヨIO缂栧彿[闈炵┖]
+//            null,    // 鎶ヨ鏃堕棿[闈炵┖]
+//            null,    // 搴撲綅[闈炵┖]
+//            null    // 娣诲姞鏃堕棿[闈炵┖]
+//    );
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getYmd() {
+        return ymd;
+    }
+
+    public void setYmd(String ymd) {
+        this.ymd = ymd;
+    }
+
+    public String getFireNo() {
+        return fireNo;
+    }
+
+    public void setFireNo(String fireNo) {
+        this.fireNo = fireNo;
+    }
+
+    public Date getFireTime() {
+        return fireTime;
+    }
+
+    public void setFireTime(Date fireTime) {
+        this.fireTime = fireTime;
+    }
+
+    public String getLocNo() {
+        return locNo;
+    }
+
+    public void setLocNo(String locNo) {
+        this.locNo = locNo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/FireLogMapper.java b/src/main/java/com/zy/asrs/mapper/FireLogMapper.java
new file mode 100644
index 0000000..a822030
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/FireLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.FireLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface FireLogMapper extends BaseMapper<FireLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/FireLogService.java b/src/main/java/com/zy/asrs/service/FireLogService.java
new file mode 100644
index 0000000..50b25b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/FireLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.FireLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface FireLogService extends IService<FireLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/FireLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/FireLogServiceImpl.java
new file mode 100644
index 0000000..9f63fcd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/FireLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.FireLogMapper;
+import com.zy.asrs.entity.FireLog;
+import com.zy.asrs.service.FireLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("fireLogService")
+public class FireLogServiceImpl extends ServiceImpl<FireLogMapper, FireLog> implements FireLogService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index d2c576a..c6802b2 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,11 +15,15 @@
 //        generator.password="xltys1995";
 //        generator.table="sys_host";
         // sqlserver
-        generator.url="192.168.3.208:1433;databasename=cool";
+        generator.url="192.168.4.15:1433;databasename=gzynasrs";
         generator.username="sa";
         generator.password="sa@123";
-        generator.table="asr_wrk_detl";
+        generator.table="asr_fire_log";
         generator.packagePath="com.zy.asrs";
+        generator.htmlDetail=false;
+        generator.html=false;
+        generator.js=false;
+        generator.sql=false;
         generator.build();
     }
 
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index b7d89c3..5487114 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -1,10 +1,14 @@
 package com.zy.core.netty.handle;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.zy.asrs.entity.FireLog;
 import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.FireLogService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.Utils;
 import com.zy.core.netty.AbstractInboundHandler;
 import com.zy.core.netty.cache.ChannelCache;
 import com.zy.core.netty.constant.Constant;
@@ -46,14 +50,35 @@
                 String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
                 String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
                         + " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
-
+                Date dt = DateUtils.convert(fireTime);
                 LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
                 if(null != locMastService){
+                    //鎶ヨ淇″彿鏇存柊鍒板簱瀛樹富妗� fire_status瀛楁
                     LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_no",fireNo));
                     if(null != locMast){
-                        locMast.setFireStatus(1);
-                        locMast.setModiTime(new Date());
-                        locMastService.update(locMast, new EntityWrapper<LocMast>().eq("fire_no",fireNo));
+                        if(locMast.getFireStatus() != 1) {
+                            locMast.setFireStatus(1);
+                            locMast.setModiTime(new Date());
+                            locMastService.update(locMast, new EntityWrapper<LocMast>().eq("fire_no", fireNo));
+                        }
+
+                        //鎻掑叆鎶ヨ鏃ュ織璁板綍锛屽悓涓�搴撲綅鍚屼竴鎶ヨ鍙彃鍏ヤ竴娆�
+                        FireLogService fireLogService = SpringUtils.getBean(FireLogService.class);
+                        if(null != fireLogService){
+                            String ymd = "20" + fire3030.getYear() + "" + fire3030.getMonth() + "" + fire3030.getDay();
+                            FireLog one = fireLogService.selectOne(new EntityWrapper<FireLog>()
+                                    .eq("ymd",ymd)
+                                    .eq("fire_no",fireNo));
+                            if(null == one) {
+                                FireLog fireLog = new FireLog();
+                                fireLog.setYmd(ymd);
+                                fireLog.setFireNo(fireNo);
+                                fireLog.setFireTime(dt);
+                                fireLog.setLocNo(locMast.getLocNo());
+                                fireLog.setCreateTime(new Date());
+                                fireLogService.insert(fireLog);
+                            }
+                        }
                     }
                 }
                 break;
diff --git a/src/main/resources/mapper/FireLogMapper.xml b/src/main/resources/mapper/FireLogMapper.xml
new file mode 100644
index 0000000..a0f4885
--- /dev/null
+++ b/src/main/resources/mapper/FireLogMapper.xml
@@ -0,0 +1,16 @@
+<?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.zy.asrs.mapper.FireLogMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.FireLog">
+        <id column="id" property="id" />
+        <result column="ymd" property="ymd" />
+        <result column="fire_no" property="fireNo" />
+        <result column="fire_time" property="fireTime" />
+        <result column="loc_no" property="locNo" />
+        <result column="create_time" property="createTime" />
+
+    </resultMap>
+
+</mapper>

--
Gitblit v1.9.1