From cb542fd619d49f723f1b89babd43c394be44039f Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Wed, 7 Aug 2024 19:36:41 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bracelet/vo/BindDeviceVo.java | 5 +- .../common/entity/bracelet/vo/DeviceVo.java | 4 + .../entity/bracelet/vo/QueryConstruction.java | 79 +----------------- .../entity/bracelet/vo/SidebandDeviceVo.java | 4 + .../controller/SidebandController.java | 5 +- .../bonus/bracelet/mapper/SidebandMapper.java | 16 ++++ .../bracelet/service/ISidebandService.java | 3 +- .../service/impl/SidebandServiceImpl.java | 47 +++++++---- .../mapper/bracelet/BraceletMapper.xml | 1 - .../mapper/bracelet/DeviceMapper.xml | 3 +- .../mapper/bracelet/SidebandMapper.xml | 82 ++++++++++++++++--- 11 files changed, 137 insertions(+), 112 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BindDeviceVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BindDeviceVo.java index a7c4bf8..eb081c8 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BindDeviceVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/BindDeviceVo.java @@ -5,6 +5,9 @@ import com.bonus.common.core.annotation.Excel.ColumnType; import io.swagger.annotations.Api; import lombok.Data; +import java.util.List; +import java.util.Map; + @Api("BindDeviceVo") @Data @@ -17,7 +20,7 @@ public class BindDeviceVo /** 设备id */ @Excel(name = "设备id") - private int[] deviceIds; + private List> deviceIds; } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java index 9662df1..31daedb 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/DeviceVo.java @@ -19,6 +19,10 @@ public class DeviceVo @Excel(name = "设备类型") private String deviceType; + /** 设备类型名称 */ + @Excel(name = "设备类型名称") + private String deviceTypeName; + /** 设备名称 */ @Excel(name = "设备名称") private String deviceName; diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java index c53aa33..b4629ac 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/QueryConstruction.java @@ -3,6 +3,7 @@ package com.bonus.common.entity.bracelet.vo; import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.web.domain.BaseEntity; import io.swagger.annotations.Api; +import lombok.Data; import java.sql.Date; @@ -12,6 +13,7 @@ import java.sql.Date; * @author bonus */ @Api("BaseProject") +@Data public class QueryConstruction extends BaseEntity { /** 工程名称 */ @@ -47,81 +49,4 @@ public class QueryConstruction extends BaseEntity private int warnnum; - public String getProname() { - return proname; - } - - public void setProname(String proname) { - this.proname = proname; - } - - public String getDepartname() { - return departname; - } - - public void setDepartname(String departname) { - this.departname = departname; - } - - public String getTeamname() { - return teamname; - } - - public void setTeamname(String teamname) { - this.teamname = teamname; - } - - public String getTeamleader() { - return teamleader; - } - - public void setTeamleader(String teamleader) { - this.teamleader = teamleader; - } - - public int getTeamnum() { - return teamnum; - } - - public void setTeamnum(int teamnum) { - this.teamnum = teamnum; - } - - public int getTempnum() { - return tempnum; - } - - public void setTempnum(int tempnum) { - this.tempnum = tempnum; - } - - public int getWarnnum() { - return warnnum; - } - - public void setWarnnum(int warnnum) { - this.warnnum = warnnum; - } - - public Date getLytime() { - return lytime; - } - - public void setLytime(Date lytime) { - this.lytime = lytime; - } - - @Override - public String toString() { - return "QueryConstruction{" + - "proname='" + proname + '\'' + - ", departname='" + departname + '\'' + - ", teamname='" + teamname + '\'' + - ", teamleader='" + teamleader + '\'' + - ", teamnum=" + teamnum + - ", tempnum=" + tempnum + - ", lytime=" + lytime + - ", warnnum=" + warnnum + - '}'; - } } diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandDeviceVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandDeviceVo.java index 565a963..20f1796 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandDeviceVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/SidebandDeviceVo.java @@ -34,6 +34,10 @@ public class SidebandDeviceVo @Excel(name = "设备类型") private String deviceType; + /** 设备类型名称 */ + @Excel(name = "设备类型名称") + private String deviceTypeName; + /** 设备名称 */ @Excel(name = "设备名称") private String deviceName; diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/SidebandController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/SidebandController.java index 2e1898b..fbf00fb 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/SidebandController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/SidebandController.java @@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.Map; /** * @className:SidebandController @@ -147,8 +148,8 @@ public class SidebandController extends BaseController { @SysLog(title = "边带管理", businessType = OperaType.QUERY, logType = 0, module = "施工管控->边带管理", details = "绑定") public AjaxResult bindDevice(@RequestBody BindDeviceVo vo) { int sidebandId = vo.getSidebandId(); - return sidebandservice.bindDevice(sidebandId,vo.getDeviceIds()); - + List> list= vo.getDeviceIds(); + return sidebandservice.bindDevice(sidebandId,list); } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/SidebandMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/SidebandMapper.java index 3f508a4..41a4fe6 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/SidebandMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/SidebandMapper.java @@ -37,6 +37,13 @@ public interface SidebandMapper { */ List getDeviceLists(SidebandDeviceVo data); + /** + * 杆塔绑定设备列表2 + * @param data + * @return + */ + List getShLists(SidebandDeviceVo data); + /** * 杆塔未绑定设备列表 * @param data @@ -113,6 +120,13 @@ public interface SidebandMapper { */ int delDevice(SidebandDeviceVo vo); + /** + * 解除绑定2 + * @param vo + * @return + */ + int delSh(SidebandDeviceVo vo); + /** * 获取人员管理表中领用人名称 * @param id @@ -129,4 +143,6 @@ public interface SidebandMapper { void bindDevice(@Param("sidebandId") int sidebandId,@Param("deviceId") int deviceId); + void bindSh(@Param("sidebandId") int sidebandId,@Param("deviceId") int deviceId); + } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/ISidebandService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/ISidebandService.java index 34d43c7..5636ff6 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/ISidebandService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/ISidebandService.java @@ -5,6 +5,7 @@ import com.bonus.common.entity.bracelet.BraceletParamsDto; import com.bonus.common.entity.bracelet.vo.*; import java.util.List; +import java.util.Map; /** * @className:SidebandService @@ -98,6 +99,6 @@ public interface ISidebandService { * @param deviceIds * @return */ - AjaxResult bindDevice(int sidebandId,int[] deviceIds); + AjaxResult bindDevice(int sidebandId,List> list); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/SidebandServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/SidebandServiceImpl.java index 4646a33..834da63 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/SidebandServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/SidebandServiceImpl.java @@ -18,10 +18,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @className:SidebandServiceImpl @@ -59,14 +56,20 @@ public class SidebandServiceImpl implements ISidebandService { try { list = sidebandMapper.getDeviceLists(data); for (int i = 0; i < list.size(); i++) { - if(list.get(i).getLyType()==0){ + if(list.get(i).getLyType()==0 && !list.get(i).getDeviceTypeName().equals("手提箱")){ String name = sidebandMapper.getDeviceLyName(list.get(i).getLyId()); list.get(i).setLyName(name); - }else if(list.get(i).getLyType()==1){ + }else if(list.get(i).getLyType()==1 && !list.get(i).getDeviceTypeName().equals("手提箱")){ String name = sidebandMapper.getDeviceLyNameTemp(list.get(i).getLyId()); list.get(i).setLyName(name); } + if(list.get(i).getLyName()!=null && list.get(i).getDeviceTypeName().equals("手提箱")){ + list.get(i).setDeviceStatus(0); + }else if(list.get(i).getLyName()==null && list.get(i).getDeviceTypeName().equals("手提箱")){ + list.get(i).setDeviceStatus(1); + } } + } catch (Exception e) { log.error(e.toString(), e); } @@ -176,9 +179,6 @@ public class SidebandServiceImpl implements ISidebandService { @Transactional(rollbackFor = Exception.class) public AjaxResult delSideband(SidebandVo vo) { try { - if (vo.getBindNum()!=0) { - return AjaxResult.error("边带数量不为0，无法删除"); - } int result = sidebandMapper.delSideband(vo); if(result==1){ return AjaxResult.success(); @@ -199,8 +199,14 @@ public class SidebandServiceImpl implements ISidebandService { @Override @Transactional(rollbackFor = Exception.class) public AjaxResult delDevice(SidebandDeviceVo vo) { + int result = 0; try { - int result = sidebandMapper.delDevice(vo); + if(vo.getDeviceTypeName().equals("手环箱")){ + result = sidebandMapper.delSh(vo); + }else{ + result = sidebandMapper.delDevice(vo); + } + if(result==1){ return AjaxResult.success(); } @@ -214,14 +220,21 @@ public class SidebandServiceImpl implements ISidebandService { @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult bindDevice(int sidebandId,int[] deviceIds) { - if(deviceIds.length==0){ - return AjaxResult.error("请至少选择一个要绑定的设备"); - } + public AjaxResult bindDevice(int sidebandId,List> list) { +// if(deviceIds.length==0){ +// return AjaxResult.error("请至少选择一个要绑定的设备"); +// } + Map map = new HashMap<>(); try { - for (int i = 0; i < deviceIds.length; i++) { - int deviceId = deviceIds[i]; - sidebandMapper.bindDevice(sidebandId,deviceId); + for (int i = 0; i < list.size(); i++) { + map = list.get(i); + if(map.get("type").equals("手环箱")){ + int deviceId = (int) map.get("id"); + sidebandMapper.bindSh(sidebandId,deviceId); + }else{ + int deviceId = (int) map.get("id"); + sidebandMapper.bindDevice(sidebandId,deviceId); + } } } catch (Exception e) { log.error(e.toString(), e); diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml index 2d53d7c..f0a1dd8 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BraceletMapper.xml @@ -90,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by tsb.id order by tsb.id ASC - diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml index 2e53420..0207e61 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml @@ -6,8 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ss.id as sidebandId,ss.sideband_name as sidebandName,ss.sideband_code as sidebandCode,project_name as projectName, - gt_code as gtCode,bind_time as bindTime,count(tb.id) as bindNum,remarks as remarks + gt_code as gtCode,bind_time as bindTime,(count(distinct tb.id) + count(distinct tsb.id)) as bindNum,remarks as remarks from sys_sideband ss left join tb_device tb on ss.id = tb.bind_id and tb.del_flag = 0 + left join tb_sh_box tsb on ss.id = tsb.bind_id and tsb.del_flag = 0 where ss.del_flag = 0 AND INSTR(ss.sideband_name,#{sidebandName}) > 0 @@ -31,31 +32,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -133,6 +177,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{deviceId} + + + UPDATE tb_sh_box + SET bind_id = null + where id = #{deviceId} + +