From 1349fda00a75a5cb6560c74ba9040ce138dd4883 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 14 十一月 2022 10:56:27 +0800
Subject: [PATCH] 卡口管理调整

---
 ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java                |   16 ++
 ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java        |   20 +++
 ycl-generator/src/main/resources/mapper/message/MessageMapper.xml                       |   36 ++++++
 ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java               |    4 
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |    5 
 ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml              |   56 ++++++++
 ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java                 |    2 
 ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java           |   21 +++
 ycl-generator/src/main/java/com/ycl/entity/message/Message.java                         |  162 +++++++++++++++++++++++++++
 ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java                   |   16 ++
 10 files changed, 331 insertions(+), 7 deletions(-)

diff --git a/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java
new file mode 100644
index 0000000..ea0e5c0
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/controller/message/MessageController.java
@@ -0,0 +1,21 @@
+package com.ycl.controller.message;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+import com.ycl.base.BaseController;
+
+/**
+ * <p>
+ * 娑堟伅琛� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-11
+ */
+@RestController
+@RequestMapping("/message")
+public class MessageController extends BaseController {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/entity/message/Message.java b/ycl-generator/src/main/java/com/ycl/entity/message/Message.java
new file mode 100644
index 0000000..1e60ebf
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/entity/message/Message.java
@@ -0,0 +1,162 @@
+package com.ycl.entity.message;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 娑堟伅琛�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_message")
+public class Message implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 涓婚敭Id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 鍘熷娑堟伅涓�0
+     */
+    @TableField("parent_id")
+    private Integer parentId;
+
+    /**
+     * 鏍囬
+     */
+    @TableField("head")
+    private String head;
+
+    /**
+     * 娓犻亾鐮�01-鍐呯珯淇�03-閭欢02-鐭俊
+     */
+    @TableField("channel_code")
+    private String channelCode;
+
+    /**
+     * 娑堟伅绫诲瀷
+     */
+    @TableField("message_type")
+    private Integer messageType;
+
+    /**
+     * 娑堟伅浣�
+     */
+    @TableField("body")
+    private String body;
+
+    /**
+     * 鍙戦�佽��
+     */
+    @TableField("target_from")
+    private String targetFrom;
+
+    /**
+     * 鎺ユ敹鑰�
+     */
+    @TableField("target_to")
+    private String targetTo;
+
+    /**
+     * 娑堟伅缂栧彿
+     */
+    @TableField("message_number")
+    private String messageNumber;
+
+    /**
+     * 闅忔満鐮�
+     */
+    @TableField("random_code")
+    private String randomCode;
+
+    /**
+     * 杩囨湡鏃堕棿
+     */
+    @TableField("over_time")
+    private LocalDateTime overTime;
+
+    /**
+     * 鍙戦�佹椂闂�
+     */
+    @TableField("send_time")
+    private LocalDateTime sendTime;
+
+    /**
+     * 鏄惁鎵弿0-鏈壂鎻�1-宸叉壂鎻�
+     */
+    @TableField("is_scan")
+    private Integer isScan;
+
+    /**
+     * 鐘舵��0-鏈彂甯�1-宸插彂甯�2-鎴愬姛3-澶辫触
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 鏄惁鏌ョ湅0-鏈煡鐪�1-宸叉煡鐪�
+     */
+    @TableField("is_view")
+    private Integer isView;
+
+    /**
+     * 澶囨敞
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 鏁版嵁鐗堟湰
+     */
+    @TableField("version")
+    @Version
+    private Integer version;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    @TableField("create_user")
+    private Integer createUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 鏇存柊浜�
+     */
+    @TableField("update_user")
+    private Integer updateUser;
+
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 鍝嶅簲缁撴灉
+     */
+    @TableField("respond_result")
+    private String respondResult;
+
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java
new file mode 100644
index 0000000..7c27af9
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/mapper/message/MessageMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.message;
+
+import com.ycl.entity.message.Message;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 娑堟伅琛� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-11
+ */
+public interface MessageMapper extends BaseMapper<Message> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java
new file mode 100644
index 0000000..775e4bb
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/message/IMessageService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.message;
+
+import com.ycl.entity.message.Message;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 娑堟伅琛� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-11
+ */
+public interface IMessageService extends IService<Message> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
new file mode 100644
index 0000000..7867b4b
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.message.impl;
+
+import com.ycl.entity.message.Message;
+import com.ycl.mapper.message.MessageMapper;
+import com.ycl.service.message.IMessageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 娑堟伅琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author lyq
+ * @since 2022-11-11
+ */
+@Service
+public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+
+}
diff --git a/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
index 56c044b..089eb7d 100644
--- a/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-generator/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -4,15 +4,61 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ycl.entity.message.MessageColumnSet">
-        <id column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="message_column_id" property="messageColumnId" />
-        <result column="is_receive" property="isReceive" />
+        <id column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="message_column_id" property="messageColumnId"/>
+        <result column="is_receive" property="isReceive"/>
     </resultMap>
 
     <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
     <sql id="Base_Column_List">
-        id, user_id, message_column_id, is_receive
+        id
+        , user_id, message_column_id, is_receive
     </sql>
+    <select id="selectMessagePage" parameterType="com.ycl.dto.message.MessageParam"
+            resultType="com.ycl.vo.message.MessageVO">
+        SELECT
+        t1.id,
+        t2.username as targetFrom,
+        t3.column_name as messageTypeName,
+        t1.`status`,
+        t1.body,
+        t1.send_time,
+        t1.create_time,
+        t1.respond_result,
+        t1.head,
+        t4.username as createUser
+        FROM
+        `ums_message` t1
+        LEFT JOIN ums_admin t2 ON t1.target_from = t2.id
+        left join ums_admin t4 on t1.create_user = t4.id
+        LEFT JOIN ums_message_column t3 ON t3.id = t1.message_type
+        <where>
+            <if test="messageParam.head !=null and messageParam.head !=''">
+                t1.head like concat('%',#{messageParam.head},'%')
+            </if>
+            <if test="messageParam.channelCode !='' and messageParam.channelCode != null">
+                and t1.channel_code=#{messageParam.channelCode}
+            </if>
+            <if test="messageParam.messageType != null">
+                and t1.message_type=#{messageParam.messageType}
+            </if>
+            <if test="messageParam.startTime != null and messageParam.startTime != '' and messageParam.endTime != null and messageParam.endTime != '' ">
+                and t1.create_time between #{messageParam.startTime} and #{messageParam.endTime}
+            </if>
 
+            <if test="messageParam.status != null">
+                and t1.status=#{messageParam.status}
+            </if>
+            <if test="messageParam.respondResult !=null and messageParam.respondResult !='' ">
+                and t1.respond_result={messageParam.respondResult}
+            </if>
+            <if test="messageParam.sort==1">
+                ORDER BY t1.create_time desc
+            </if>
+            <if test="messageParam.sort==0">
+                ORDER BY t1.create_time asc
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml b/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml
new file mode 100644
index 0000000..f7827ce
--- /dev/null
+++ b/ycl-generator/src/main/resources/mapper/message/MessageMapper.xml
@@ -0,0 +1,36 @@
+<?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.ycl.mapper.message.MessageMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ycl.entity.message.Message">
+        <id column="id" property="id" />
+        <result column="parent_id" property="parentId" />
+        <result column="head" property="head" />
+        <result column="channel_code" property="channelCode" />
+        <result column="message_type" property="messageType" />
+        <result column="body" property="body" />
+        <result column="target_from" property="targetFrom" />
+        <result column="target_to" property="targetTo" />
+        <result column="message_number" property="messageNumber" />
+        <result column="random_code" property="randomCode" />
+        <result column="over_time" property="overTime" />
+        <result column="send_time" property="sendTime" />
+        <result column="is_scan" property="isScan" />
+        <result column="status" property="status" />
+        <result column="is_view" property="isView" />
+        <result column="remark" property="remark" />
+        <result column="version" property="version" />
+        <result column="create_user" property="createUser" />
+        <result column="create_time" property="createTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="respond_result" property="respondResult" />
+    </resultMap>
+
+    <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+    <sql id="Base_Column_List">
+        id, parent_id, head, channel_code, message_type, body, target_from, target_to, message_number, random_code, over_time, send_time, is_scan, status, is_view, remark, version, create_user, create_time, update_user, update_time, respond_result
+    </sql>
+
+</mapper>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index 5cd81d7..28d34b3 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -9,8 +9,10 @@
 import com.ycl.controller.BaseController;
 import com.ycl.entity.dict.DataDictionary;
 import com.ycl.entity.equipment.EquipmentBayonet;
+import com.ycl.entity.region.SccgRegion;
 import com.ycl.service.dict.IDataDictionaryService;
 import com.ycl.service.equipment.IEquipmentBayonetService;
+import com.ycl.service.region.ISccgRegionService;
 import com.ycl.utils.EasyExcelUtils;
 import com.ycl.vo.equipment.EquipmentBayonetVO;
 import io.swagger.annotations.Api;
@@ -43,6 +45,8 @@
     IEquipmentBayonetService iEquipmentBayonetService;
     @Autowired
     IDataDictionaryService iDataDictionaryService;
+    @Autowired
+    ISccgRegionService iSccgRegionService;
 
     @GetMapping("/query")
     @ApiOperation("鏌ヨ")
@@ -63,6 +67,7 @@
                     BeanUtils.copyProperties(item, equipmentBayonetVO);
                     equipmentBayonetVO.setFrontEndType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getFrontEndType())).getName());
                     equipmentBayonetVO.setInOutCityType(iDataDictionaryService.getOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getId, item.getInOutCityType())).getName());
+                    equipmentBayonetVO.setBelongArea(iSccgRegionService.getOne(new LambdaQueryWrapper<SccgRegion>().eq(SccgRegion::getId,item.getBelongArea())).getRegionName());
                     return equipmentBayonetVO;
                 }).collect(Collectors.toList()));
     }
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
index 77aae26..2c16a23 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
@@ -86,6 +86,6 @@
     /**
      * 鎵�灞炲尯鍩�
      */
-    @TableField("belongArea")
-    private String belong_area;
+    @TableField("belong_area")
+    private Integer belongArea;
 }
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
index 7e9ed3e..61df0d7 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
@@ -81,4 +81,6 @@
     @ApiModelProperty(value = "鍑哄叆鍩庣被鍨�")
     @ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�")
     private String inOutCityType;
+
+    private String belongArea;
 }
\ No newline at end of file

--
Gitblit v1.8.0