类型编号生成，设施所属领域增加

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

@@ -0,0 +1,40 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.iot.domain.BaseFacilityArea;
+import com.usky.iot.service.BaseFacilityAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-06-20
+ */
+@RestController
+@RequestMapping("/baseFacilityArea")
+public class BaseFacilityAreaController {
+    @Autowired
+    private BaseFacilityAreaService baseFacilityAreaService;
+    /**
+     * 设施所属领域根据ID查询
+     *
+     * @param id   主键ID
+     * @return
+     */
+    @GetMapping("areaSelect")
+    public ApiResult<List<BaseFacilityArea>> areaSelect(@RequestParam(value = "id", required = false) Integer id) {
+        return ApiResult.success(baseFacilityAreaService.areaSelect(id));
+    }
+}
+

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

@@ -57,7 +57,7 @@ public class BaseFacilityTypeController {
     /**
      * 设施类型根据ID查询
      *
-     * @param id   单位名称
+     * @param id   主键ID
      * @return
      */
     @GetMapping("typeSelect")

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

@@ -0,0 +1,58 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author han
+ * @since 2023-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseFacilityArea implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 领域名称
+     */
+    private String areaName;
+
+    /**
+     * 描述
+     */
+    private String areaDesc;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseFacilityArea;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-06-20
+ */
+public interface BaseFacilityAreaMapper extends CrudMapper<BaseFacilityArea> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseFacilityArea;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.domain.BaseFacilityType;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-06-20
+ */
+public interface BaseFacilityAreaService extends CrudService<BaseFacilityArea> {
+    /**
+     * 设施所属领域根据ID查询
+     *
+     * @param id   主键ID
+     * @return
+     */
+    List<BaseFacilityArea> areaSelect(Integer id);
+}

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

@@ -0,0 +1,32 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseFacilityArea;
+import com.usky.iot.domain.BaseFacilityType;
+import com.usky.iot.mapper.BaseFacilityAreaMapper;
+import com.usky.iot.service.BaseFacilityAreaService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-06-20
+ */
+@Service
+public class BaseFacilityAreaServiceImpl extends AbstractCrudService<BaseFacilityAreaMapper, BaseFacilityArea> implements BaseFacilityAreaService {
+    @Override
+    public List<BaseFacilityArea> areaSelect(Integer id) {
+        LambdaQueryWrapper<BaseFacilityArea> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(null != id,BaseFacilityArea::getId,id);
+        List<BaseFacilityArea> list1 = this.list(lambdaQuery);
+        return list1;
+    }
+}

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

@@ -41,7 +41,7 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
     public List<BaseGgpFacilityTypeVO> typeInfo() {
         List<BaseGgpFacilityTypeVO> list = new ArrayList<>();
         LambdaQueryWrapper<BaseFacilityType> queryWrapper = Wrappers.lambdaQuery();
-//        queryWrapper.eq(BaseFacilityType::getTenantId, 1);
+        queryWrapper.eq(BaseFacilityType::getTenantId, SecurityUtils.getTenantId());
         List<BaseFacilityType> list1 = this.list(queryWrapper);
         Integer typeNum = baseMapper.selectCount(queryWrapper);
         if (CollectionUtils.isNotEmpty(list1)) {
@@ -58,12 +58,12 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
             baseGgpFacilityTypeVO.setTypeNum(typeNum);
             if (CollectionUtils.isNotEmpty(typeIdList)) {
                 Integer[] a2 = typeIdList.toArray(new Integer[typeIdList.size()]);
-                list2 = baseMapper.typeNumList(1);
-                list3 = baseMapper.typeNormalNumList(1);
-                list4 = baseMapper.typeUpkeepNumList(1);
-                list5 = baseMapper.typeCloseNumList(1);
+                list2 = baseMapper.typeNumList(SecurityUtils.getTenantId());
+                list3 = baseMapper.typeNormalNumList(SecurityUtils.getTenantId());
+                list4 = baseMapper.typeUpkeepNumList(SecurityUtils.getTenantId());
+                list5 = baseMapper.typeCloseNumList(SecurityUtils.getTenantId());
                 LambdaQueryWrapper<BaseGgpFacility> queryWrapper1 = Wrappers.lambdaQuery();
-//                queryWrapper1.eq(BaseGgpFacility::getTenantId, 1);
+                queryWrapper1.eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId());
                 facilityNum = baseGgpFacilityService.getBaseMapper().selectCount(queryWrapper1);
                 baseGgpFacilityTypeVO.setFacilityNum(facilityNum);
             }
@@ -101,6 +101,7 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
                 typeName)
                 .eq(StringUtils.isNotBlank(typeCode),BaseFacilityType::getTypeCode,
                         typeCode)
+                .eq(BaseFacilityType::getTenantId, SecurityUtils.getTenantId())
                 .orderByDesc(BaseFacilityType::getId);
         page = this.page(page,lambdaQuery);
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
@@ -108,7 +109,8 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
     @Override
     public List<BaseFacilityType> typeSelect(Integer id) {
         LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
-        lambdaQuery.eq(null != id,BaseFacilityType::getId,id);
+        lambdaQuery.eq(null != id,BaseFacilityType::getId,id)
+        .eq(BaseFacilityType::getTenantId, SecurityUtils.getTenantId());
         List<BaseFacilityType> list1 = this.list(lambdaQuery);
         return list1;
     }
@@ -117,6 +119,17 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
     public boolean add(BaseFacilityType baseFacilityType) {
         baseFacilityType.setCreatedBy(SecurityUtils.getUsername());
         baseFacilityType.setCreatedTime(LocalDateTime.now());
+        baseFacilityType.setTenantId(SecurityUtils.getTenantId());
+        LambdaQueryWrapper<BaseFacilityType> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.orderByDesc(BaseFacilityType::getId)
+                .last(" limit 1");
+        List<BaseFacilityType> list1 = this.list(lambdaQuery);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            Integer num1 = Integer.parseInt(list1.get(0).getTypeCode())+1;
+            baseFacilityType.setTypeCode(Integer.toString(num1));
+        }else{
+            baseFacilityType.setTypeCode("10001");
+        }
         return this.save(baseFacilityType);
     }
 

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

@@ -22,6 +22,7 @@ import com.usky.system.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -49,16 +50,10 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
 
     @Override
     public boolean add(BaseGgpFacility baseGgpFacility) {
-        Calendar Cld = Calendar.getInstance();
-        int YY = Cld.get(Calendar.YEAR) ;
-        int MM = Cld.get(Calendar.MONTH)+1;
-        int DD = Cld.get(Calendar.DATE);
-        int HH = Cld.get(Calendar.HOUR_OF_DAY);
-        int mm = Cld.get(Calendar.MINUTE);
-        int SS = Cld.get(Calendar.SECOND);
-        int MI = Cld.get(Calendar.MILLISECOND);
+        Calendar cal = Calendar.getInstance();
+        Date date = cal.getTime();
         List<BaseFacilityType> typeList = baseFacilityTypeMapper.typeList(baseGgpFacility.getFacilityType());
-        baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+'-'+YY+MM+DD+HH+mm+SS+MI);
+        baseGgpFacility.setFacilityNum(typeList.get(0).getTypeAbbrevia()+'-'+new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date));
         baseGgpFacility.setCreator(SecurityUtils.getUsername());
         baseGgpFacility.setCreateTime(LocalDateTime.now());
         baseGgpFacility.setTenantId(SecurityUtils.getTenantId());

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

@@ -0,0 +1,16 @@
+<?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.usky.iot.mapper.BaseFacilityAreaMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseFacilityArea">
+        <id column="id" property="id" />
+        <result column="area_name" property="areaName" />
+        <result column="area_desc" property="areaDesc" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+</mapper>

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

@@ -24,11 +24,11 @@
         typeFacilityNum
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
-<!--        <where>-->
-<!--            <if test="tenantId != null and tenantId != ''">-->
-<!--                and d.tenant_id = #{tenantId}-->
-<!--            </if>-->
-<!--        </where>-->
+        <where>
+            <if test="tenantId != null and tenantId != ''">
+                and d.tenant_id = #{tenantId}
+            </if>
+        </where>
         GROUP BY d.id
     </select>
     <select id="typeNormalNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
@@ -37,9 +37,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-<!--            <if test="tenantId != null and tenantId != ''">-->
-<!--                and d.tenant_id = #{tenantId}-->
-<!--            </if>-->
+            <if test="tenantId != null and tenantId != ''">
+                and d.tenant_id = #{tenantId}
+            </if>
                 and e.status = 0
         </where>
         GROUP BY d.id
@@ -50,9 +50,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-<!--            <if test="tenantId != null and tenantId != ''">-->
-<!--                and d.tenant_id = #{tenantId}-->
-<!--            </if>-->
+            <if test="tenantId != null and tenantId != ''">
+                and d.tenant_id = #{tenantId}
+            </if>
             and e.status = 1
         </where>
         GROUP BY d.id
@@ -63,9 +63,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-<!--            <if test="tenantId != null and tenantId != ''">-->
-<!--                and d.tenant_id = #{tenantId}-->
-<!--            </if>-->
+            <if test="tenantId != null and tenantId != ''">
+                and d.tenant_id = #{tenantId}
+            </if>
             and e.status = 2
         </where>
         GROUP BY d.id