修正消息新增

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/LcdInfoController.java

@@ -1,31 +1,25 @@
 package com.ruoyi.web.controller.system;
 
 
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.domain.PostUser;
-import com.ruoyi.system.domain.vo.LcdInfoVo;
-import com.ruoyi.system.service.ILcdInfoImportDataService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.LcdInfo;
+import com.ruoyi.system.domain.vo.LcdInfoVo;
 import com.ruoyi.system.service.ILcdInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.multipart.MultipartFile;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 消息Controller
@@ -93,7 +87,7 @@ public class LcdInfoController extends BaseController
         lcdInfoVo.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
         lcdInfoVo.setUpdateBy(getUsername());
         lcdInfoVo.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
-        return CheckTitleError(lcdInfoService.insertLcdInfo(lcdInfoVo));
+        return lcdInfoService.insertLcdInfo(lcdInfoVo);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -1,12 +1,5 @@
 package com.ruoyi.common.core.controller;
 
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.constant.HttpStatus;
@@ -20,6 +13,14 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+
+import java.beans.PropertyEditorSupport;
+import java.util.Date;
+import java.util.List;
 
 /**
  * web层通用数据处理
@@ -149,10 +150,7 @@ public class BaseController
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
-    protected AjaxResult CheckTitleError(int rows)
-    {
-        return rows > 0 ? AjaxResult.success() : AjaxResult.CheckTitleError();
-    }
+
     /**
      * 响应返回结果
      * 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -1,9 +1,10 @@
 package com.ruoyi.common.core.domain;
 
-import java.util.HashMap;
 import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.utils.StringUtils;
 
+import java.util.HashMap;
+
 /**
  * 操作消息提醒
  * 
@@ -132,11 +133,7 @@ public class AjaxResult extends HashMap<String, Object>
     public static AjaxResult error()
     {
         return AjaxResult.error("操作失败");
-    }
-    public static AjaxResult CheckTitleError(){
-        return AjaxResult.error("存在相同标题，请删除重试！");
-    }
-    /**
+    }/**
      * 返回错误消息
      * 
      * @param msg 返回内容

ruoyi-system/src/main/java/com/ruoyi/system/domain/LcdInfoUserRelation.java

@@ -1,11 +1,12 @@
 package com.ruoyi.system.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.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
 
 /**
  * 【请填写功能名称】对象 lcd_info_user_relation
@@ -31,12 +32,12 @@ public class LcdInfoUserRelation extends BaseEntity
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createAt;
+    private Date createTime;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date updateAt;
+    private Date updateTime;
 
     public void setId(Long id)
     {
@@ -65,23 +66,25 @@ public class LcdInfoUserRelation extends BaseEntity
     {
         return lcdReceiveUserId;
     }
-    public void setCreateAt(Date createAt)
-    {
-        this.createAt = createAt;
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
     }
 
-    public Date getCreateAt()
-    {
-        return createAt;
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
-    public void setUpdateAt(Date updateAt)
-    {
-        this.updateAt = updateAt;
+
+    @Override
+    public Date getUpdateTime() {
+        return updateTime;
     }
 
-    public Date getUpdateAt()
-    {
-        return updateAt;
+    @Override
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
 
     @Override
@@ -90,8 +93,8 @@ public class LcdInfoUserRelation extends BaseEntity
                 .append("id", getId())
                 .append("lcdInfoId", getLcdInfoId())
                 .append("lcdReceiveUserId", getLcdReceiveUserId())
-                .append("createAt", getCreateAt())
-                .append("updateAt", getUpdateAt())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
                 .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/LcdInfoMapper.java

@@ -1,13 +1,13 @@
 package com.ruoyi.system.mapper;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import com.ruoyi.system.domain.LcdInfo;
 import com.ruoyi.system.domain.vo.LcdInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 消息Mapper接口
  *
@@ -46,9 +46,9 @@ public interface LcdInfoMapper
     public int selectUserId(String mob);
 
     /*
-    * 根据手机号查消息ID
+    * 查重
     * */
-    public Integer selectTitleById(String title);
+    public Long selectTitleById(String title);
     /**
      * 修改消息
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ILcdInfoService.java

@@ -1,10 +1,12 @@
 package com.ruoyi.system.service;
 
-import java.util.Date;
-import java.util.List;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.LcdInfo;
 import com.ruoyi.system.domain.vo.LcdInfoVo;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 消息Service接口
  *
@@ -35,7 +37,7 @@ public interface ILcdInfoService
      * @param lcdInfovo 消息
      * @return 结果
      */
-    public int insertLcdInfo(LcdInfoVo lcdInfovo);
+    public AjaxResult insertLcdInfo(LcdInfoVo lcdInfovo);
 
     public int selectUserId(LcdInfoVo lcdInfoVo);
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/LcdInfoServiceImpl.java

@@ -1,22 +1,23 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.LcdInfo;
 import com.ruoyi.system.domain.LcdInfoUserRelation;
 import com.ruoyi.system.domain.vo.LcdInfoVo;
+import com.ruoyi.system.mapper.LcdInfoMapper;
 import com.ruoyi.system.mapper.LcdInfoUserRelationMapper;
+import com.ruoyi.system.service.ILcdInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.LcdInfoMapper;
-import com.ruoyi.system.domain.LcdInfo;
-import com.ruoyi.system.service.ILcdInfoService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 消息Service业务层处理
  *
@@ -72,20 +73,28 @@ public class LcdInfoServiceImpl implements ILcdInfoService {
      * @return 结果
      */
     @Override
-    public int insertLcdInfo(LcdInfoVo lcdInfoVo) {
+    public AjaxResult insertLcdInfo(LcdInfoVo lcdInfoVo) {
         lcdInfoVo.setCreateTime(DateUtils.getNowDate());//插入前端传入的数据
-        if (lcdInfoMapper.selectTitleById(lcdInfoVo.getTitle()) == null){
-        int row = lcdInfoMapper.insertLcdInfo(lcdInfoVo);
-        long info_id =lcdInfoVo.getId();//根据前端传入数据查询消息id
-        for (int i = 0; i < lcdInfoVo.getMobile().size(); i++) {
-            int userId = lcdInfoMapper.selectUserId(lcdInfoVo.getMobile().get(i));//根据电话号获取userId
-            LcdInfoUserRelation lcdInfoUserRelation = new LcdInfoUserRelation();//插入中间表数据
-            lcdInfoUserRelation.setLcdInfoId(info_id);
-            lcdInfoUserRelation.setLcdReceiveUserId(userId);
-            lcdInfoUserRelationMapper.insertLcdInfoUserRelation(lcdInfoUserRelation);
+        if (lcdInfoVo.getTitle()!=null){
+            if (lcdInfoMapper.selectTitleById(lcdInfoVo.getTitle())==null){
+                int row = lcdInfoMapper.insertLcdInfo(lcdInfoVo);
+                long info_id =lcdInfoVo.getId();//根据前端传入数据查询消息id
+                for (int i = 0; i < lcdInfoVo.getMobile().size(); i++) {
+                    int userId = lcdInfoMapper.selectUserId(lcdInfoVo.getMobile().get(i));//根据电话号获取userId
+                    LcdInfoUserRelation lcdInfoUserRelation = new LcdInfoUserRelation();//插入中间表数据
+                    lcdInfoUserRelation.setLcdInfoId(info_id);
+                    lcdInfoUserRelation.setLcdReceiveUserId(userId);
+                    lcdInfoUserRelation.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+                    lcdInfoUserRelation.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+                    lcdInfoUserRelationMapper.insertLcdInfoUserRelation(lcdInfoUserRelation);
+                }
+                return AjaxResult.success("新增成功");
+            }else {
+                return AjaxResult.error("存在相同标题，请删除重试！");
+            }
+        }else {
+            return AjaxResult.error("标题不能为空");
         }
-        return row;
-        }else return 0;
     }
 
     @Override

ruoyi-system/src/main/resources/mapper/system/LcdInfoMapper.xml

@@ -90,8 +90,9 @@
     <!--
     根据手机号查消息ID
     -->
-    <select id="selectTitleById" resultType="Integer">
-        SELECT id FROM lcd_info WHERE title = #{title}
+    <select id="selectTitleById" resultType="Long" parameterType="String">
+        <include refid="selectLcdInfoVo"/>
+        WHERE title = #{title}
     </select>
 
     <!--

ruoyi-system/src/main/resources/mapper/system/LcdInfoUserRelationMapper.xml

@@ -8,12 +8,12 @@
         <result property="id"    column="id"    />
         <result property="lcdInfoId"    column="lcd_info_id"    />
         <result property="lcdReceiveUserId"    column="lcd_receive_user_id"    />
-        <result property="createAt"    column="create_at"    />
-        <result property="updateAt"    column="update_at"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectLcdInfoUserRelationVo">
-        select id, lcd_info_id, lcd_receive_user_id, create_at, update_at from lcd_info_user_relation
+        select id, lcd_info_id, lcd_receive_user_id, create_time, update_time from lcd_info_user_relation
     </sql>
 
     <select id="selectLcdInfoUserRelationList" parameterType="LcdInfoUserRelation" resultMap="LcdInfoUserRelationResult">
@@ -21,8 +21,8 @@
         <where>
             <if test="lcdInfoId != null "> and lcd_info_id = #{lcdInfoId}</if>
             <if test="lcdReceiveUserId != null "> and lcd_receive_user_id = #{lcdReceiveUserId}</if>
-            <if test="createAt != null "> and create_at = #{createAt}</if>
-            <if test="updateAt != null "> and update_at = #{updateAt}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
 
@@ -36,14 +36,14 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="lcdInfoId != null">lcd_info_id,</if>
             <if test="lcdReceiveUserId != null">lcd_receive_user_id,</if>
-            <if test="createAt != null">create_at,</if>
-            <if test="updateAt != null">update_at,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="lcdInfoId != null">#{lcdInfoId},</if>
             <if test="lcdReceiveUserId != null">#{lcdReceiveUserId},</if>
-            <if test="createAt != null">#{createAt},</if>
-            <if test="updateAt != null">#{updateAt},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>
 
@@ -52,8 +52,8 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="lcdInfoId != null">lcd_info_id = #{lcdInfoId},</if>
             <if test="lcdReceiveUserId != null">lcd_receive_user_id = #{lcdReceiveUserId},</if>
-            <if test="createAt != null">create_at = #{createAt},</if>
-            <if test="updateAt != null">update_at = #{updateAt},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
         where id = #{id}
     </update>