Merge branch 'main' into prod

fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -6,15 +6,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
         select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
-        where
+        where 1=1
         <if test="businessId != null">
             and a.business_id = #{businessId}
         </if>
         <if test="fileId != null">
             and a.file_id = #{fileId}
         </if>
+        <if test="fileType != null">
+            and a.file_type = #{fileType}
+        </if>
         <if test="createBy != null">
-            a.create_by = #{createBy}
+            and a.create_by = #{createBy}
         </if>
         order by a.create_time desc
     </select>

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -9,6 +9,8 @@ import com.fuyuanshen.common.tenant.core.TenantEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Description: 设备表
  * @Author: WY
@@ -114,4 +116,6 @@ public class Device extends TenantEntity {
     private String createByName;
 
     private Long bindingUserId;
+
+    private Date bindingTime;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -533,8 +533,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
             deviceUpdateWrapper.eq("id", device.getId())
                     .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId);
+                    .set("binding_user_id", userId)
-            ;
+                    .set("binding_time", new Date());
+
 
             return baseMapper.update(null, deviceUpdateWrapper);
         } else if (mode == CommunicationModeEnum.BLUETOOTH.getValue()) {
@@ -552,7 +553,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
             deviceUpdateWrapper.eq("id", device.getId())
                     .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId);
+                    .set("binding_user_id", userId)
+                    .set("binding_time", new Date());
             return baseMapper.update(null, deviceUpdateWrapper);
         } else {
             throw new RuntimeException("通讯方式错误");
@@ -571,7 +573,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
         deviceUpdateWrapper.eq("id", device.getId())
                 .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
-                .set("binding_user_id", null);
+                .set("binding_user_id", null)
+                .set("binding_time", null);
         return baseMapper.update(null, deviceUpdateWrapper);
     }
 

pom.xml

@@ -81,10 +81,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <activation>
+            <!-- <activation> -->
-                <!-- 默认环境 -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
-                <activeByDefault>true</activeByDefault>
+            <!--     <activeByDefault>true</activeByDefault> -->
-            </activation>
+            <!-- </activation> -->
         </profile>
         <profile>
             <id>prod</id>
@@ -94,10 +94,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <!-- <activation> -->
+            <activation>
-            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+                <!-- 默认环境 -->
-            <!--     <activeByDefault>true</activeByDefault> -->
+                <activeByDefault>true</activeByDefault>
-            <!-- </activation> -->
+            </activation>
         </profile>
     </profiles>