'新增设备信息类型-租户设备类型列表\告警类型表-租户告警类型列表两个接口、优化设备信息表-删除记录接口，增加“已关联设施的不能删除”校验规则'

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseAlarmTypeController.java

@@ -6,11 +6,14 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.BaseAlarmType;
 import com.usky.iot.service.BaseAlarmTypeService;
 import com.usky.iot.service.vo.BaseAlarmTypeRequestVO;
+import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警类型表 前端控制器
@@ -59,10 +62,24 @@ public class BaseAlarmTypeController {
         return ApiResult.success();
     }
 
+    /**
+     * 分页
+     * @param baseAlarmTypeRequestVO
+     * @return
+     */
     @PostMapping("page")
     public ApiResult<CommonPage<BaseAlarmType>> page(@RequestBody BaseAlarmTypeRequestVO baseAlarmTypeRequestVO){
         return ApiResult.success(baseAlarmTypeService.page(baseAlarmTypeRequestVO));
     }
 
+    /**
+     * 租户告警类型列表
+     * @return
+     */
+    @GetMapping("tenantIdAlarmTypeList")
+    public ApiResult<List<BaseAlarmType>> tenantIdAlarmTypeList(){
+        return ApiResult.success(baseAlarmTypeService.tenantIdAlarmTypeList());
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/DmpDeviceTypeController.java

@@ -76,5 +76,14 @@ public class DmpDeviceTypeController {
         return ApiResult.success(dmpDeviceTypeService.getDeviceTypeList(typeCode,typeName,pageNum,pageSize));
     }
 
+    /**
+     * 租户设备类型列表
+     * @return
+     */
+    @GetMapping("tenantIdDeviceTypeList")
+    public ApiResult<List<DmpDeviceType>> tenantIdDeviceTypeList(){
+        return ApiResult.success(dmpDeviceTypeService.tenantIdDeviceTypeList());
+    }
+
 }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseAlarm.java

@@ -140,4 +140,10 @@ public class BaseAlarm implements Serializable {
      */
     @TableField(exist = false)
     private Integer handleRange;
+
+    /**
+     * 图标
+     */
+    @TableField(exist = false)
+    private String typeImg;
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseAlarmMapper.java

@@ -2,6 +2,9 @@ package com.usky.iot.mapper;
 
 import com.usky.iot.domain.BaseAlarm;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.iot.domain.BaseAlarmType;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,5 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @since 2023-07-13
  */
 public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
-
+    BaseAlarmType getAlarmTypeOne(String alarmType);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseAlarmTypeMapper.java

@@ -1,8 +1,11 @@
 package com.usky.iot.mapper;
 
+import com.usky.iot.domain.BaseAlarm;
 import com.usky.iot.domain.BaseAlarmType;
 import com.usky.common.mybatis.core.CrudMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 告警类型表 Mapper 接口
@@ -13,4 +16,5 @@ import com.usky.common.mybatis.core.CrudMapper;
  */
 public interface BaseAlarmTypeMapper extends CrudMapper<BaseAlarmType> {
 
+    List<BaseAlarm> getAlarmInfo(Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceTypeMapper.java

@@ -1,7 +1,11 @@
 package com.usky.iot.mapper;
 
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.DmpDeviceType;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.iot.domain.DmpProductInfo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @since 2023-06-06
  */
 public interface DmpDeviceTypeMapper extends CrudMapper<DmpDeviceType> {
-
+    List<DmpProductInfo> getProductInfo(Integer tenantId);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseAlarmTypeService.java

@@ -8,6 +8,7 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.iot.domain.DmpProductInfo;
 import com.usky.iot.service.vo.BaseAlarmTypeRequestVO;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -28,6 +29,8 @@ public interface BaseAlarmTypeService extends CrudService<BaseAlarmType> {
 
     CommonPage<BaseAlarmType> page(BaseAlarmTypeRequestVO baseAlarmTypeRequestVO);
 
+    List<BaseAlarmType> tenantIdAlarmTypeList();
+
     boolean checkNameUnique(BaseAlarmType baseAlarmType);
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceInfoService.java

@@ -28,6 +28,8 @@ public interface DmpDeviceInfoService extends CrudService<DmpDeviceInfo> {
 
     boolean checkNameUnique(DmpDeviceInfo dmpDeviceInfo);
 
+    boolean checkNameUnique1(DmpDeviceInfo dmpDeviceInfo,Integer tenantId);
+
     CommonPage<DmpDeviceInfo> page(DmpDeviceInfoRequest dmpDeviceInfoRequest);
 
     boolean remove(Integer id);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/DmpDeviceTypeService.java

@@ -26,6 +26,8 @@ public interface DmpDeviceTypeService extends CrudService<DmpDeviceType> {
 
     CommonPage<DmpDeviceType> getDeviceTypeList(String typeCode, String typeName, Integer pageNum, Integer pageSize);
 
+    List<DmpDeviceType> tenantIdDeviceTypeList();
+
     List<Map<String, Object>> getDeviceTypeImges(List<Integer> deviceTypes);
 
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -133,6 +133,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         queryWrapper
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
                 .eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
+                .eq(null != baseAlarmListVO.getHandleStatus(),BaseAlarm::getHandleStatus,baseAlarmListVO.getHandleStatus())
                 .between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
                 .eq(BaseAlarm::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(BaseAlarm::getId);
@@ -148,6 +149,11 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                     records.get(i).setDeviceName(deviceInfo.getDeviceName());
                 }
 
+                BaseAlarmType baseAlarmType = baseMapper.getAlarmTypeOne(records.get(i).getAlarmType());
+                if(baseAlarmType != null){
+                    records.get(i).setTypeImg(baseAlarmType.getTypeImg());
+                }
+
             }
         }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmTypeServiceImpl.java

@@ -2,6 +2,7 @@ package com.usky.iot.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,10 +22,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * <p>
@@ -93,6 +91,26 @@ public class BaseAlarmTypeServiceImpl extends AbstractCrudService<BaseAlarmTypeM
 
     }
 
+    @Override
+    public List<BaseAlarmType> tenantIdAlarmTypeList(){
+        List<BaseAlarmType> list = new ArrayList<>();
+        List<String> typeList = new ArrayList<>();
+        List<BaseAlarm> list1 = baseMapper.getAlarmInfo(SecurityUtils.getTenantId());
+        if(list1.size() > 0){
+            for(int i=0;i<list1.size();i++){
+                typeList.add(list1.get(i).getAlarmType());
+            }
+        }
+        if(typeList.size()>0){
+            LambdaQueryWrapper<BaseAlarmType> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(CollectionUtils.isNotEmpty(typeList),BaseAlarmType::getTypeCode,typeList)
+                    .eq(BaseAlarmType::getDeleteFlag,0);
+            list = this.list(queryWrapper);
+        }
+
+        return list;
+    }
+
     @Override
     public boolean checkNameUnique(BaseAlarmType baseAlarmType) { //根据告警类型判断唯一
         Integer id = null == baseAlarmType.getId() ? -1 : baseAlarmType.getId();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDataInfoServiceImpl.java

@@ -55,24 +55,22 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
     public void data(DmpDeviceDataRequestVO dmpDeviceDataRequestVO){
         DeviceDataInfoVO dataInfo = new DeviceDataInfoVO();
 
-        LambdaQueryWrapper<DmpDeviceInfo> dmpDeviceQuery = Wrappers.lambdaQuery();
-        dmpDeviceQuery.eq(DmpDeviceInfo::getDeleteFlag,0)
-                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId())
-                .eq(DmpDeviceInfo::getTenantId, SecurityUtils.getTenantId());
-        List<DmpDeviceInfo> deviceDataInfo = dmpDeviceInfoService.list(dmpDeviceQuery);
-        if(CollectionUtils.isEmpty(deviceDataInfo)){
-            throw new BusinessException("录入数据失败，"+dmpDeviceDataRequestVO.getDeviceId()+" 这个设备没有注册");
-        }
-
-
         LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DmpProductInfo::getId,DmpProductInfo::getDeviceType)
+        queryWrapper.select(DmpProductInfo::getId,DmpProductInfo::getDeviceType,DmpProductInfo::getTenantId)
                 .eq(DmpProductInfo::getDeleteFlag,0)
-                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode())
-                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
+                .eq(DmpProductInfo::getProductCode,dmpDeviceDataRequestVO.getProductCode());
         List<DmpProductInfo> list = dmpProductInfoService.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list)){
 
+            LambdaQueryWrapper<DmpDeviceInfo> dmpDeviceQuery = Wrappers.lambdaQuery();
+            dmpDeviceQuery.eq(DmpDeviceInfo::getDeleteFlag,0)
+                    .eq(DmpDeviceInfo::getDeviceId,dmpDeviceDataRequestVO.getDeviceId())
+                    .eq(DmpDeviceInfo::getTenantId, list.get(0).getTenantId());
+            List<DmpDeviceInfo> deviceDataInfo = dmpDeviceInfoService.list(dmpDeviceQuery);
+            if(CollectionUtils.isEmpty(deviceDataInfo)){
+                throw new BusinessException("录入数据失败，"+dmpDeviceDataRequestVO.getDeviceId()+" 这个设备没有注册");
+            }
+
             LambdaQueryWrapper<DmpDeviceType> deviceTypeList = Wrappers.lambdaQuery();
             deviceTypeList.eq(DmpDeviceType::getTypeCode,list.get(0).getDeviceType());
             List<DmpDeviceType> lt = dmpDeviceTypeService.list(deviceTypeList);
@@ -84,7 +82,7 @@ public class DmpDataInfoServiceImpl extends AbstractCrudService<DmpDataInfoMappe
             LambdaQueryWrapper<DmpProductAttribute> queryWrapper1 = Wrappers.lambdaQuery();
             queryWrapper1.select(DmpProductAttribute::getAttributeCode)
                     .eq(DmpProductAttribute::getDeleteFlag,0)
-                    .eq(DmpProductAttribute::getTenantId,SecurityUtils.getTenantId())
+                    .eq(DmpProductAttribute::getTenantId,list.get(0).getTenantId())
                     .eq(DmpProductAttribute::getProductId,list.get(0).getId());
             List<DmpProductAttribute> list1 = dmpProductAttributeService.list(queryWrapper1);
             if(CollectionUtils.isNotEmpty(list1)){

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.iot.domain.*;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.mapper.DmpDeviceInfoMapper;
+import com.usky.iot.service.BaseFacilityDeviceService;
 import com.usky.iot.service.DmpDeviceInfoService;
 import com.usky.iot.service.DmpDeviceStatusService;
 import com.usky.iot.service.vo.BaseFacilityDeviceVO;
@@ -54,6 +55,9 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
     @Autowired
     private DmpDeviceStatusService dmpDeviceStatusService;
 
+    @Autowired
+    private BaseFacilityDeviceService baseFacilityDeviceService;
+
     @Override
     public void add(DmpDeviceInfo dmpDeviceInfo) {
         if (checkNameUnique(dmpDeviceInfo)){
@@ -104,6 +108,19 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
         return null != one && !Objects.equals(one.getId(), id);
     }
 
+    @Override
+    public boolean checkNameUnique1(DmpDeviceInfo dmpDeviceInfo,Integer tenantId) {
+        Integer id = null == dmpDeviceInfo.getId() ? -1 : dmpDeviceInfo.getId();
+        LambdaQueryWrapper<DmpDeviceInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper
+                .eq(DmpDeviceInfo::getDeviceId,dmpDeviceInfo.getDeviceId())
+                .eq(DmpDeviceInfo::getProductCode,dmpDeviceInfo.getProductCode())
+                .eq(DmpDeviceInfo::getDeleteFlag,0)
+                .eq(DmpDeviceInfo::getTenantId,tenantId);
+        DmpDeviceInfo one = this.getOne(queryWrapper);
+        return null != one && !Objects.equals(one.getId(), id);
+    }
+
     @Override
     public CommonPage<DmpDeviceInfo> page(DmpDeviceInfoRequest diRequest) {
         IPage<DmpDeviceInfo> page = new Page<>(diRequest.getCurrent(), diRequest.getSize());
@@ -115,6 +132,15 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
     public boolean remove(Integer id) {
         DmpDeviceInfo dmpDeviceInfo = this.getById(id);
         Optional.ofNullable(dmpDeviceInfo).orElseThrow(() -> new BusinessException("设备不存在"));
+
+        //已关联设施的不能删除
+        LambdaQueryWrapper<BaseFacilityDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(BaseFacilityDevice::getDeviceId,dmpDeviceInfo.getDeviceId());
+        int count = baseFacilityDeviceService.count(queryWrapper);
+        if(count > 0){
+            throw new BusinessException("已关联设施的不能删除");
+        }
+
         dmpDeviceInfo.setDeleteFlag(1);
         return this.updateById(dmpDeviceInfo);
     }
@@ -151,16 +177,18 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
             throw new BusinessException("数据不能为空");
         }
         for(int i=0;i<devList.size();i++){
-            if (checkNameUnique(devList.get(i))){
-                throw new BusinessException("新增设备信息'" + devList.get(i).getDeviceId() + "'失败，设备信息已存在");
-            }
             List<DmpProductInfo> list = baseMapper.getProductInfo(devList.get(i).getProductCode());
             if(CollectionUtils.isNotEmpty(list)){
+
+                if (checkNameUnique1(devList.get(i),list.get(0).getTenantId())){
+                    throw new BusinessException("新增设备信息'" + devList.get(i).getDeviceId() + "'失败，设备信息已存在");
+                }
+
                 devList.get(i).setDeviceType(list.get(0).getDeviceType());
                 devList.get(i).setProductId(list.get(0).getId());
                 devList.get(i).setCreatedBy(SecurityUtils.getUsername());
                 devList.get(i).setCreatedTime(LocalDateTime.now());
-                devList.get(i).setTenantId(SecurityUtils.getTenantId());
+                devList.get(i).setTenantId(list.get(0).getTenantId());
                 devList.get(i).setServiceStatus(1);
 
                 DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceTypeServiceImpl.java

@@ -4,7 +4,9 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +16,7 @@ import com.usky.common.security.utils.SecurityUtils;
 import com.usky.iot.domain.DmpDeviceStatus;
 import com.usky.iot.domain.DmpDeviceType;
 import com.usky.iot.domain.DmpProductAttribute;
+import com.usky.iot.domain.DmpProductInfo;
 import com.usky.iot.mapper.DmpDeviceTypeMapper;
 import com.usky.iot.service.DmpDeviceTypeService;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -21,10 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * <p>
@@ -80,6 +80,25 @@ public class DmpDeviceTypeServiceImpl extends AbstractCrudService<DmpDeviceTypeM
         return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DmpDeviceType> tenantIdDeviceTypeList(){
+        List<DmpDeviceType> list = new ArrayList<>();
+        List<String> typeList = new ArrayList<>();
+        List<DmpProductInfo> list1 = baseMapper.getProductInfo(SecurityUtils.getTenantId());
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int i=0;i<list1.size();i++){
+                typeList.add(list1.get(i).getDeviceType().toString());
+            }
+        }
+        if(CollectionUtils.isNotEmpty(typeList)){
+            LambdaQueryWrapper<DmpDeviceType> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.in(DmpDeviceType::getTypeCode, typeList);
+            list = this.list(queryWrapper);
+        }
+
+        return list;
+    }
+
     @Override
     public List<Map<String, Object>> getDeviceTypeImges(List<Integer> deviceTypes) {
         QueryWrapper<DmpDeviceType> query = Wrappers.query();

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseAlarmListVO.java

@@ -33,6 +33,11 @@ public class BaseAlarmListVO {
      */
     private String alarmType;
 
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
     /**
      * 开始时间
      */

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmMapper.xml

@@ -24,5 +24,17 @@
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
     </resultMap>
-
+    <select id="getAlarmTypeOne" resultType="com.usky.iot.domain.BaseAlarmType">
+        select
+        *
+        from base_alarm_type
+        <where>
+            <if test="alarmType != null">
+                and type_code = #{alarmType}
+            </if>
+            <if test="1 == 1">
+                and delete_flag = 0
+            </if>
+        </where>
+    </select>
 </mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseAlarmTypeMapper.xml

@@ -8,7 +8,6 @@
         <result column="type_code" property="typeCode" />
         <result column="type_abbrevia" property="typeAbbrevia" />
         <result column="type_name" property="typeName" />
-        <result column="product_code" property="productCode" />
         <result column="type_img" property="typeImg" />
         <result column="alarm_desc" property="alarmDesc" />
         <result column="delete_flag" property="deleteFlag" />
@@ -19,5 +18,15 @@
         <result column="dept_id" property="deptId" />
         <result column="tenant_id" property="tenantId" />
     </resultMap>
+    <select id="getAlarmInfo" resultType="com.usky.iot.domain.BaseAlarm">
+        select
+        distinct alarm_type
+        from base_alarm
+        <where>
+            <if test="tenantId != null">
+                and tenant_id = #{tenantId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceTypeMapper.xml

@@ -18,5 +18,18 @@
         <result column="updated_by" property="updatedBy" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
+    <select id="getProductInfo" resultType="com.usky.iot.domain.DmpProductInfo">
+        select
+        distinct device_type
+        from dmp_product
+        <where>
+            <if test="tenantId != null">
+                and tenant_id = #{tenantId}
+            </if>
+            <if test="1 == 1">
+                and delete_flag = 0
+            </if>
+        </where>
+    </select>
 
 </mapper>