设备台账

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/controller/AdmEmsDeviceRbookController.java

@@ -3,8 +3,6 @@ package com.ruoyi.ems.controller;
 import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
-
-import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,30 +22,32 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 
+import static com.ruoyi.ems.task.BaseTask.log;
+
 /**
  * 设备台账Controller
  * 
  * @author ruoyi
- * @date 2024-08-26
+ * @date 2024-09-10
  */
 @RestController
 @RequestMapping("/device/rbook")
-@Api(value = "AdmEmsDeviceRbookController", description = "设备台账")
 public class AdmEmsDeviceRbookController extends BaseController
 {
     @Autowired
-    private IAdmEmsDeviceRbookService emsDeviceRbookService;
+    private IAdmEmsDeviceRbookService admEmsDeviceRbookService;
 
     /**
      * 查询设备台账列表
      */
-    //@RequiresPermissions("ems:rbook:list")
+    @RequiresPermissions("ems:rbook:list")
     @GetMapping("/list")
     public TableDataInfo list(AdmEmsDeviceRbook admEmsDeviceRbook)
     {
         startPage();
-        List<AdmEmsDeviceRbook> list = emsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
         return getDataTable(list);
+
     }
 
     /**
@@ -58,7 +58,7 @@ public class AdmEmsDeviceRbookController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, AdmEmsDeviceRbook admEmsDeviceRbook)
     {
-        List<AdmEmsDeviceRbook> list = emsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
+        List<AdmEmsDeviceRbook> list = admEmsDeviceRbookService.selectAdmEmsDeviceRbookList(admEmsDeviceRbook);
         ExcelUtil<AdmEmsDeviceRbook> util = new ExcelUtil<AdmEmsDeviceRbook>(AdmEmsDeviceRbook.class);
         util.exportExcel(response, list, "设备台账数据");
     }
@@ -70,7 +70,7 @@ public class AdmEmsDeviceRbookController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(emsDeviceRbookService.selectAdmEmsDeviceRbookById(id));
+        return success(admEmsDeviceRbookService.selectAdmEmsDeviceRbookById(id));
     }
 
     /**
@@ -81,7 +81,7 @@ public class AdmEmsDeviceRbookController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
     {
-        return toAjax(emsDeviceRbookService.insertAdmEmsDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.insertAdmEmsDeviceRbook(admEmsDeviceRbook));
     }
 
     /**
@@ -92,7 +92,7 @@ public class AdmEmsDeviceRbookController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody AdmEmsDeviceRbook admEmsDeviceRbook)
     {
-        return toAjax(emsDeviceRbookService.updateAdmEmsDeviceRbook(admEmsDeviceRbook));
+        return toAjax(admEmsDeviceRbookService.updateAdmEmsDeviceRbook(admEmsDeviceRbook));
     }
 
     /**
@@ -100,9 +100,9 @@ public class AdmEmsDeviceRbookController extends BaseController
      */
     @RequiresPermissions("ems:rbook:remove")
     @Log(title = "设备台账", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(emsDeviceRbookService.deleteAdmEmsDeviceRbookByIds(ids));
+        return toAjax(admEmsDeviceRbookService.deleteAdmEmsDeviceRbookByIds(ids));
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/AdmEmsDeviceRbook.java

@@ -1,5 +1,7 @@
 package com.ruoyi.ems.domain;
 
+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.ruoyi.common.core.annotation.Excel;
@@ -7,9 +9,9 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
 
 /**
  * 设备台账对象 adm_ems_device_rbook
- * 
+ *
  * @author ruoyi
- * @date 2024-08-26
+ * @date 2024-09-10
  */
 public class AdmEmsDeviceRbook extends BaseEntity
 {
@@ -34,6 +36,11 @@ public class AdmEmsDeviceRbook extends BaseEntity
     @Excel(name = "对象名称")
     private String objName;
 
+    /** 日期 yyyy-MM-dd HH:mm:ss */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "日期 yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date recordTime;
+
     /** 安装位置 */
     @Excel(name = "安装位置")
     private String insLocation;
@@ -50,84 +57,93 @@ public class AdmEmsDeviceRbook extends BaseEntity
     @Excel(name = "维护人")
     private String maintainPerson;
 
-    public void setId(Long id) 
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setRecordCode(String recordCode) 
+    public void setRecordCode(String recordCode)
     {
         this.recordCode = recordCode;
     }
 
-    public String getRecordCode() 
+    public String getRecordCode()
     {
         return recordCode;
     }
-    public void setObjType(Long objType) 
+    public void setObjType(Long objType)
     {
         this.objType = objType;
     }
 
-    public Long getObjType() 
+    public Long getObjType()
     {
         return objType;
     }
-    public void setObjCode(String objCode) 
+    public void setObjCode(String objCode)
     {
         this.objCode = objCode;
     }
 
-    public String getObjCode() 
+    public String getObjCode()
     {
         return objCode;
     }
-    public void setObjName(String objName) 
+    public void setObjName(String objName)
     {
         this.objName = objName;
     }
 
-    public String getObjName() 
+    public String getObjName()
     {
         return objName;
     }
-    public void setInsLocation(String insLocation) 
+    public void setRecordTime(Date recordTime)
+    {
+        this.recordTime = recordTime;
+    }
+
+    public Date getRecordTime()
+    {
+        return recordTime;
+    }
+    public void setInsLocation(String insLocation)
     {
         this.insLocation = insLocation;
     }
 
-    public String getInsLocation() 
+    public String getInsLocation()
     {
         return insLocation;
     }
-    public void setMaintainTitle(String maintainTitle) 
+    public void setMaintainTitle(String maintainTitle)
     {
         this.maintainTitle = maintainTitle;
     }
 
-    public String getMaintainTitle() 
+    public String getMaintainTitle()
     {
         return maintainTitle;
     }
-    public void setMaintainContent(String maintainContent) 
+    public void setMaintainContent(String maintainContent)
     {
         this.maintainContent = maintainContent;
     }
 
-    public String getMaintainContent() 
+    public String getMaintainContent()
     {
         return maintainContent;
     }
-    public void setMaintainPerson(String maintainPerson) 
+    public void setMaintainPerson(String maintainPerson)
     {
         this.maintainPerson = maintainPerson;
     }
 
-    public String getMaintainPerson() 
+    public String getMaintainPerson()
     {
         return maintainPerson;
     }
@@ -135,17 +151,18 @@ public class AdmEmsDeviceRbook extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("recordCode", getRecordCode())
-            .append("objType", getObjType())
-            .append("objCode", getObjCode())
-            .append("objName", getObjName())
-            .append("insLocation", getInsLocation())
-            .append("maintainTitle", getMaintainTitle())
-            .append("maintainContent", getMaintainContent())
-            .append("maintainPerson", getMaintainPerson())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
+                .append("id", getId())
+                .append("recordCode", getRecordCode())
+                .append("objType", getObjType())
+                .append("objCode", getObjCode())
+                .append("objName", getObjName())
+                .append("recordTime", getRecordTime())
+                .append("insLocation", getInsLocation())
+                .append("maintainTitle", getMaintainTitle())
+                .append("maintainContent", getMaintainContent())
+                .append("maintainPerson", getMaintainPerson())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/mapper/AdmEmsDeviceRbookMapper.java

@@ -7,7 +7,7 @@ import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
  * 设备台账Mapper接口
  * 
  * @author ruoyi
- * @date 2024-08-26
+ * @date 2024-09-10
  */
 public interface AdmEmsDeviceRbookMapper 
 {
@@ -33,7 +33,7 @@ public interface AdmEmsDeviceRbookMapper
      * @param admEmsDeviceRbook 设备台账
      * @return 结果
      */
-     int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+    public int insertAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
 
     /**
      * 修改设备台账
@@ -41,7 +41,7 @@ public interface AdmEmsDeviceRbookMapper
      * @param admEmsDeviceRbook 设备台账
      * @return 结果
      */
-     int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
 
     /**
      * 删除设备台账
@@ -49,7 +49,7 @@ public interface AdmEmsDeviceRbookMapper
      * @param id 设备台账主键
      * @return 结果
      */
-    int deleteAdmEmsDeviceRbookById(Long id);
+    public int deleteAdmEmsDeviceRbookById(Long id);
 
     /**
      * 批量删除设备台账
@@ -57,5 +57,5 @@ public interface AdmEmsDeviceRbookMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+    public int deleteAdmEmsDeviceRbookByIds(Long[] ids);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/IAdmEmsDeviceRbookService.java

@@ -7,7 +7,7 @@ import com.ruoyi.ems.domain.AdmEmsDeviceRbook;
  * 设备台账Service接口
  * 
  * @author ruoyi
- * @date 2024-08-26
+ * @date 2024-09-10
  */
 public interface IAdmEmsDeviceRbookService 
 {
@@ -41,7 +41,7 @@ public interface IAdmEmsDeviceRbookService
      * @param admEmsDeviceRbook 设备台账
      * @return 结果
      */
-     int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
+    public int updateAdmEmsDeviceRbook(AdmEmsDeviceRbook admEmsDeviceRbook);
 
     /**
      * 批量删除设备台账
@@ -49,7 +49,7 @@ public interface IAdmEmsDeviceRbookService
      * @param ids 需要删除的设备台账主键集合
      * @return 结果
      */
-     int deleteAdmEmsDeviceRbookByIds(Long[] ids);
+    public int deleteAdmEmsDeviceRbookByIds(Long[] ids);
 
     /**
      * 删除设备台账信息
@@ -57,5 +57,5 @@ public interface IAdmEmsDeviceRbookService
      * @param id 设备台账主键
      * @return 结果
      */
-    int deleteAdmEmsDeviceRbookById(Long id);
+    public int deleteAdmEmsDeviceRbookById(Long id);
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/AdmEmsDeviceRbookServiceImpl.java

@@ -12,7 +12,7 @@ import com.ruoyi.ems.service.IAdmEmsDeviceRbookService;
  * 设备台账Service业务层处理
  * 
  * @author ruoyi
- * @date 2024-08-26
+ * @date 2024-09-10
  */
 @Service
 public class AdmEmsDeviceRbookServiceImpl implements IAdmEmsDeviceRbookService 

ems-cloud/ems-modules/ems-server/src/main/resources/mapper/ems/AdmEmsDeviceRbookMapper.xml

@@ -1,46 +1,41 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ems.mapper.AdmEmsDeviceRbookMapper">
-    
     <resultMap type="com.ruoyi.ems.domain.AdmEmsDeviceRbook" id="AdmEmsDeviceRbookResult">
-        <result property="id"    column="id"    />
-        <result property="recordCode"    column="record_code"    />
-        <result property="objType"    column="obj_type"    />
-        <result property="objCode"    column="obj_code"    />
-        <result property="objName"    column="obj_name"    />
-        <result property="insLocation"    column="ins_location"    />
-        <result property="maintainTitle"    column="maintain_title"    />
-        <result property="maintainContent"    column="maintain_content"    />
-        <result property="maintainPerson"    column="maintain_person"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="recordCode" column="record_code"/>
+        <result property="objType" column="obj_type"/>
+        <result property="objCode" column="obj_code"/>
+        <result property="objName" column="obj_name"/>
+        <result property="recordTime" column="record_time"/>
+        <result property="insLocation" column="ins_location"/>
+        <result property="maintainTitle" column="maintain_title"/>
+        <result property="maintainContent" column="maintain_content"/>
+        <result property="maintainPerson" column="maintain_person"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
-
-    <sql id="selectAdmEmsDeviceRbookVo">
-        select id, record_code, obj_type, obj_code, obj_name, ins_location, maintain_title, maintain_content, maintain_person, create_time, update_time from adm_ems_device_rbook
-    </sql>
-
+    <sql id="selectAdmEmsDeviceRbookVo"> select id, record_code, obj_type, obj_code, obj_name, record_time, ins_location, maintain_title, maintain_content, maintain_person, create_time, update_time from adm_ems_device_rbook </sql>
     <select id="selectAdmEmsDeviceRbookList" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" resultMap="AdmEmsDeviceRbookResult">
         <include refid="selectAdmEmsDeviceRbookVo"/>
-        <where>  
-            <if test="recordCode != null  and recordCode != ''"> and record_code = #{recordCode}</if>
+        <where>
+            <if test="recordCode != null and recordCode != ''"> and record_code = #{recordCode}</if>
             <if test="objType != null "> and obj_type = #{objType}</if>
-            <if test="objCode != null  and objCode != ''"> and obj_code = #{objCode}</if>
-            <if test="objName != null  and objName != ''"> and obj_name like concat('%', #{objName}, '%')</if>
-            <if test="insLocation != null  and insLocation != ''"> and ins_location = #{insLocation}</if>
-            <if test="maintainTitle != null  and maintainTitle != ''"> and maintain_title = #{maintainTitle}</if>
-            <if test="maintainContent != null  and maintainContent != ''"> and maintain_content = #{maintainContent}</if>
-            <if test="maintainPerson != null  and maintainPerson != ''"> and maintain_person = #{maintainPerson}</if>
+            <if test="objCode != null and objCode != ''"> and obj_code = #{objCode}</if>
+            <if test="objName != null and objName != ''"> and obj_name like concat('%', #{objName}, '%')</if>
+            <if test="recordTime != null "> and record_time = #{recordTime}</if>
+            <if test="insLocation != null and insLocation != ''"> and ins_location = #{insLocation}</if>
+            <if test="maintainTitle != null and maintainTitle != ''"> and maintain_title = #{maintainTitle}</if>
+            <if test="maintainContent != null and maintainContent != ''"> and maintain_content = #{maintainContent}</if>
+            <if test="maintainPerson != null and maintainPerson != ''"> and maintain_person = #{maintainPerson}</if>
         </where>
     </select>
-    
     <select id="selectAdmEmsDeviceRbookById" parameterType="Long" resultMap="AdmEmsDeviceRbookResult">
         <include refid="selectAdmEmsDeviceRbookVo"/>
         where id = #{id}
     </select>
-        
     <insert id="insertAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook" useGeneratedKeys="true" keyProperty="id">
         insert into adm_ems_device_rbook
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -48,27 +43,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objType != null">obj_type,</if>
             <if test="objCode != null and objCode != ''">obj_code,</if>
             <if test="objName != null">obj_name,</if>
+            <if test="recordTime != null">record_time,</if>
             <if test="insLocation != null">ins_location,</if>
             <if test="maintainTitle != null and maintainTitle != ''">maintain_title,</if>
             <if test="maintainContent != null">maintain_content,</if>
             <if test="maintainPerson != null">maintain_person,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordCode != null and recordCode != ''">#{recordCode},</if>
             <if test="objType != null">#{objType},</if>
             <if test="objCode != null and objCode != ''">#{objCode},</if>
             <if test="objName != null">#{objName},</if>
+            <if test="recordTime != null">#{recordTime},</if>
             <if test="insLocation != null">#{insLocation},</if>
             <if test="maintainTitle != null and maintainTitle != ''">#{maintainTitle},</if>
             <if test="maintainContent != null">#{maintainContent},</if>
             <if test="maintainPerson != null">#{maintainPerson},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
-
     <update id="updateAdmEmsDeviceRbook" parameterType="com.ruoyi.ems.domain.AdmEmsDeviceRbook">
         update adm_ems_device_rbook
         <trim prefix="SET" suffixOverrides=",">
@@ -76,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="objType != null">obj_type = #{objType},</if>
             <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
             <if test="objName != null">obj_name = #{objName},</if>
+            <if test="objName != null">obj_name = #{objName},</if>
+            <if test="recordTime != null">record_time = #{recordTime},</if>
             <if test="insLocation != null">ins_location = #{insLocation},</if>
             <if test="maintainTitle != null and maintainTitle != ''">maintain_title = #{maintainTitle},</if>
             <if test="maintainContent != null">maintain_content = #{maintainContent},</if>
@@ -85,15 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
-
-    <delete id="deleteAdmEmsDeviceRbookById" parameterType="Long">
-        delete from adm_ems_device_rbook where id = #{id}
-    </delete>
-
+    <delete id="deleteAdmEmsDeviceRbookById" parameterType="Long"> delete from adm_ems_device_rbook where id = #{id} </delete>
     <delete id="deleteAdmEmsDeviceRbookByIds" parameterType="String">
-        delete from adm_ems_device_rbook where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        delete from adm_ems_device_rbook where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach>
     </delete>
 </mapper>

ems-cloud/sql/ems_server.sql

@@ -799,12 +799,13 @@ create table adm_ems_device_rbook (
   `obj_type`         int             not null                     comment '对象类型 1：设施 2：设备',
   `obj_code`         varchar(32)     not null                     comment '对象代码',
   `obj_name`         varchar(64)     default null                 comment '对象名称',
+  `record_time`      timestamp       not null                     comment '日期 yyyy-MM-dd HH:mm:ss',
   `ins_location`     varchar(128)    default null                 comment '安装位置',
   `maintain_title`   varchar(128)    not null                     comment '维护标题',
   `maintain_content` text            default null                 comment '维护内容',
   `maintain_person`  varchar(32)     default null                 comment '维护人',
-  `create_time`      datetime        default null                 comment '创建时间',
-  `update_time`      datetime        default null                 comment '更新时间',
+  `create_time`      datetime        default CURRENT_TIMESTAMP    comment '创建时间',
+  `update_time`      datetime        default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP comment '更新时间',
   primary key (`id`),
   key inx_ems_device_rbook(`record_code`)
 ) engine=innodb auto_increment=1 comment = '设备台账表';