From 34019e52fe939479dca08b22e94602cd2889fec7 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Thu, 18 May 2023 11:59:19 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/TerminalChannelVo.java                 |  2 +-
 .../dao/TerminalChannelsDao.java              |  6 +++++
 .../resources/mappers/TerminalChannelsDao.xml | 25 ++++++++++++++++++-
 .../impl/TerminalChannelServiceImpl.java      | 16 ++++++++++++
 .../service/TerminalPhotoService.java         |  2 +-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java
index 6b69a51..5e758fb 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalChannelVo.java
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
-@ApiModel(value = "通道对象", description = "通道对象描述")
+@ApiModel(value = "添加通道对象", description = "添加通道对象描述")
 public class TerminalChannelVo {
 
     @NotNull(message = "装置列表不能缺少")
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
index b67dc53..8d7d432 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalChannelsDao.java
@@ -5,6 +5,8 @@ import com.shxy.xymanager_common.dto.TermChannelAndMapperDto;
 import com.shxy.xymanager_common.entity.TerminalChannels;
 import com.shxy.xymanager_common.entity.TerminalScheduleMapper;
 import com.shxy.xymanager_common.entity.Terminals;
+import com.shxy.xymanager_common.vo.TerminalChannelVo;
+import com.shxy.xymanager_common.vo.UpdateTerminalChannelVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -32,4 +34,8 @@ public interface TerminalChannelsDao {
 
     int deleteList(@Param("list") List<TerminalChannels> list,@Param("status") Integer status,@Param("updateat") Date update);
 
+    int selectChannelCount(List<TerminalChannelVo.ChannelItem> list);
+
+    int selectChannelCountById(UpdateTerminalChannelVo vo);
+
 }
\ No newline at end of file
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
index 397a3e7..279cc67 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml
@@ -60,6 +60,29 @@
         where status = #{status}
     </select>
 
+    <select id="selectChannelCount" parameterType="com.shxy.xymanager_common.vo.TerminalChannelVo" resultType="java.lang.Integer">
+        select
+         count(1)
+        from terminal_channels
+        where
+        id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item.id}
+        </foreach> or
+        channel_name in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item.channelname}
+        </foreach>
+    </select>
+
+    <select id="selectChannelCountById" parameterType="com.shxy.xymanager_common.vo.UpdateTerminalChannelVo" resultType="java.lang.Integer">
+        select
+        count(1)
+        from terminal_channels
+        where
+        id  =  #{id} and  channel_name = #{channelname}
+    </select>
+
     <select id="selectAllChannelList" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
@@ -81,7 +104,7 @@
         <if test="termid != null">
             and x.term_id = #{termid}
         </if>
-        order by x.create_time desc
+        order by x.create_time asc
     </select>
     <select id="selectAllAndChannelByTermid" resultMap="LineAndTerminalMap">
         SELECT
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
index 60136bb..152502c 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalChannelServiceImpl.java
@@ -3,6 +3,7 @@ package com.shxy.xymanager_service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.dto.DyLineAndTerminalAndChannelDto;
@@ -22,8 +23,11 @@ import com.shxy.xymanager_dao.dao.TerminalStatusDao;
 import com.shxy.xymanager_service.service.TerminalChannelService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import java.sql.SQLException;
+import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -51,7 +55,13 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
     public ServiceBody<String> addChannelList(TerminalChannelVo vo) {
         List<TerminalChannels> list = BeanUtil.copyToList(vo.getList(), TerminalChannels.class, CopyOptions.create().ignoreCase());
         Date date = new Date();
+        int count = terminalChannelsDao.selectChannelCount(vo.getList());
+        if(count>0){
+            return Asserts.success("通道重复");
+        }
         int i = terminalChannelsDao.insertList(list, CommonStatus.EFFECTIVE.value(), date, date);
+
+
         if (i != 0) {
             return Asserts.success("录入成功");
         } else {
@@ -67,6 +77,10 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
      */
     @Override
     public ServiceBody<String> updateChannelList(UpdateTerminalChannelVo vo) {
+        int count = terminalChannelsDao.selectChannelCountById(vo);
+        if(count>0){
+            return Asserts.success("通道重复");
+        }
         TerminalChannels bean = new TerminalChannels();
         BeanUtil.copyProperties(vo, bean, CopyOptions.create().ignoreCase());
         int i = terminalChannelsDao.updateByPrimaryKeySelective(bean, new Date());
@@ -154,6 +168,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
     public ServiceBody<TerminalChannelMapperListModel> getChannelByTermid(TerminalIdVo vo) {
         TerminalChannelMapperListModel model = new TerminalChannelMapperListModel();
         List<TermChannelAndMapperDto> list = terminalChannelsDao.selectByTermid(vo.getTermid(), CommonStatus.EFFECTIVE.value());
+        log.info("通道查出数据:{}", JSON.toJSONString(list));
         boolean empty = CollectionUtil.isEmpty(list);
         if (empty) {
             model.setList(new ArrayList<>());
@@ -165,6 +180,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
         if (!BeanUtil.isEmpty(terminalStatus)) {
             model.setGpsstatus(terminalStatus.getGpsStatus());
         }
+        log.info("通道查出返回数据:{}", JSON.toJSONString(model));
         return Asserts.success(model);
     }
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
index 83e4ac1..0a07bb7 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
@@ -58,7 +58,7 @@ public interface TerminalPhotoService {
     ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo);
 
     /**
-     * 拍照时间表
+     *
      *
      * @return
      */