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-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java

@@ -50,12 +50,6 @@ public class UserQueryCriteria extends BaseEntity {
     @Schema(name = "是否启用")
     private Boolean enabled;
 
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @Schema(name = "帐号状态（0正常 1停用）")
-    private String status;
-
     @Schema(name = "部门ID")
     private Long deptId;
 

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/vo/ConsumerVo.java

@@ -58,12 +58,6 @@ public class ConsumerVo  extends TenantEntity {
     @Schema(name = "是否启用")
     private Boolean enabled;
 
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @Schema(name = "帐号状态（0正常 1停用）")
-    private String status;
-
     @Schema(name = "是否为admin账号", hidden = true)
     private Boolean isAdmin = false;
 

fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/service/impl/CustomerServiceImpl.java

@@ -112,11 +112,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateCustomer(Customer resources) throws Exception {
-        if (resources.getEnabled()) {
-            resources.setStatus("0");
-        } else {
-            resources.setStatus("1");
-        }
         saveOrUpdate(resources);
     }
 

fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -68,8 +68,8 @@
             <if test="criteria.id != null">
                 and u1.user_id = #{criteria.id}
             </if>
-            <if test="criteria.status != null">
-                and u.status = #{criteria.status}
+            <if test="criteria.enabled != null">
+                and u1.enabled = #{criteria.enabled}
             </if>
             <if test="criteria.deptIds != null and criteria.deptIds.size() != 0">
                 and u1.dept_id in
@@ -94,7 +94,7 @@
     <!-- 分页查询客户 -->
     <select id="findCustomers" resultType="com.fuyuanshen.customer.domain.Customer">
         select
-        u.user_id as customerId, u.nick_name , u.user_name, u.enabled, u.create_time,u.status
+        u.user_id as customerId, u.nick_name , u.user_name, u.enabled, u.create_time
         from sys_user u
         <where>
             <if test="criteria.ids != null and !criteria.ids.isEmpty()">
@@ -109,8 +109,8 @@
             <if test="criteria.blurry != null and criteria.blurry.trim() != ''">
                 and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%')
             </if>
-            <if test="criteria.status != null">
-                and u.status = #{criteria.status}
+            <if test="criteria.enabled != null">
+                and u.enabled = #{criteria.enabled}
             </if>
             <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
                 and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
@@ -139,8 +139,8 @@
             <if test="criteria.blurry != null and criteria.blurry.trim() != ''">
                 and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%')
             </if>
-            <if test="criteria.status != null">
-                and u.status = #{criteria.status}
+            <if test="criteria.enabled != null">
+                and u.enabled = #{criteria.enabled}
             </if>
             <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
                 and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}

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/domain/DeviceAssignments.java

@@ -34,7 +34,7 @@ public class DeviceAssignments extends TenantEntity {
     private Long fromCustomerId;
 
     /**
-     * 接收方(当前设备所处位置)
+     * 接收方
      */
     private Long toCustomerId;
 

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

@@ -44,7 +44,6 @@ import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -320,9 +319,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         List<DeviceTypeGrants> deviceTypeGrants = new ArrayList<>();
         for (DeviceAssignments assignment : assignments) {
 
-            if (assignment.getToCustomerId() != null && assignment.getToCustomerId() != 0L) {
+            if (assignment.getToCustomerId() != null) {
                 log.info("设备已经分配客户！！！");
-                throw new RuntimeException("设备已经分配客户！！！");
+                continue;
             }
 
             Device device = deviceMapper.selectById(assignment.getDeviceId());
@@ -413,6 +412,54 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     }
 
 
+    /**
+     * 撤回设备
+     *
+     * @param ids
+     */
+    // @Override
+    // public void withdrawDevice(List<Long> ids) {
+    //     ids.forEach((id) -> {
+    //         List<Device> deviceChain = getDeviceChain(id);
+    //         deviceChain.forEach((device) -> {
+    //             device.setDeviceStatus(DeviceStatusEnum.INVALID.getCode());
+    //             deviceMapper.updateById(device);
+    //         });
+    //     });
+    //
+    //     ids.forEach((id) -> {
+    //         Device device = new Device();
+    //         device.setId(id);
+    //         device.setCustomerId(null);
+    //         device.setCustomerName("");
+    //         deviceMapper.updateById(device);
+    //     });
+    //
+    // }
+    //
+    //
+    // public List<Device> getDeviceChain(Long originalDeviceId) {
+    //     List<Device> chain = new ArrayList<>();
+    //     Set<Long> visited = new HashSet<>(); // 防止循环引用
+    //     findNext(chain, visited, originalDeviceId);
+    //     return chain;
+    // }
+    //
+    // private void findNext(List<Device> chain, Set<Long> visited, Long currentOriginalDeviceId) {
+    //     if (visited.contains(currentOriginalDeviceId)) {
+    //         log.info("检测到循环引用，终止递归");
+    //         return;
+    //     }
+    //     visited.add(currentOriginalDeviceId);
+    //
+    //     List<Device> devices = deviceMapper.findByOriginalDeviceId(currentOriginalDeviceId);
+    //     for (Device device : devices) {
+    //         chain.add(device);
+    //         findNext(chain, visited, device.getId());
+    //     }
+    // }
+
+
     /**
      * 撤回设备
      *
@@ -427,7 +474,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
             Device device = deviceMapper.selectById(assignment.getDeviceId());
             // 接收者
             assignment.setAssigneeName("");
-            assignment.setToCustomerId(0L);
+            assignment.setToCustomerId(null);
             deviceAssignmentsMapper.updateById(assignment);
 
             // 获取所有已分配的设备
@@ -486,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()) {
@@ -505,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("通讯方式错误");
@@ -524,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>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
         </profile>
         <profile>
             <id>prod</id>
@@ -94,10 +94,10 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-            <!-- <activation> -->
-            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
-            <!--     <activeByDefault>true</activeByDefault> -->
-            <!-- </activation> -->
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>