内容（报警信息）

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserCenterController.java

@@ -1,6 +1,7 @@
 package com.fuyuanshen.app.controller;
 
 import com.fuyuanshen.app.model.AppRegisterBody;
+import com.fuyuanshen.app.model.AppUpdatePasswordBody;
 import com.fuyuanshen.app.service.AppLoginService;
 import com.fuyuanshen.app.service.AppRegisterService;
 import com.fuyuanshen.common.core.domain.R;
@@ -38,7 +39,7 @@ public class AppUserCenterController {
      * 修改密码
      */
     @PostMapping("/updatePassword")
-    public R<Void> updatePassword(@Validated @RequestBody AppRegisterBody body) {
+    public R<Void> updatePassword(@Validated @RequestBody AppUpdatePasswordBody body) {
         registerService.updatePassword(body);
         return R.ok();
     }

fys-admin/src/main/java/com/fuyuanshen/app/model/AppUpdatePasswordBody.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.app.model;
+
+import lombok.Data;
+
+@Data
+public class AppUpdatePasswordBody {
+
+    /**
+     * 登录密码
+     */
+    private String password;
+}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppRegisterService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fuyuanshen.app.domain.AppUser;
 import com.fuyuanshen.app.mapper.AppUserMapper;
 import com.fuyuanshen.app.model.AppRegisterBody;
+import com.fuyuanshen.app.model.AppUpdatePasswordBody;
 import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.domain.model.RegisterBody;
@@ -144,7 +145,7 @@ public class AppRegisterService {
         userMapper.update(updateWrapper);
     }
 
-    public void updatePassword(AppRegisterBody body) {
+    public void updatePassword(AppUpdatePasswordBody body) {
         String username = AppLoginHelper.getUsername();
         String password = body.getPassword();
         UpdateWrapper<AppUser> updateWrapper = new UpdateWrapper<>();

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java

@@ -38,7 +38,6 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 @Slf4j
 public class BjqAlarmRule implements MqttMessageRule {
 
-
     private final IDeviceAlarmService deviceAlarmService;
     private final DeviceService deviceService;
 
@@ -89,6 +88,8 @@ public class BjqAlarmRule implements MqttMessageRule {
                     deviceAlarmBo.setFinishTime(new Date());
                     String durationBetween = DurationUtils.getDurationBetween(deviceAlarmVo.getStartTime(), deviceAlarmBo.getFinishTime());
                     deviceAlarmBo.setDurationTime(durationBetween);
+                    // 0已处理，1未处理
+                    deviceAlarmBo.setTreatmentState(0);
                     deviceAlarmService.updateByBo(deviceAlarmBo);
                 }
             }

fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java

@@ -126,9 +126,8 @@ public class AppPasswordAuthStrategy implements IAuthStrategy {
                 .eq(AppUser::getUserType, UserType.APP_USER.getUserType()));
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", username);
-//            throw new UserException("user.not.exists", phonenumber);
-            // 新增AppUser用户
-            return null;
+            throw new UserException("user.not.exists", username);
+
         } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
             log.info("登录用户：{} 已被停用.", username);
             throw new UserException("user.blocked", username);

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

@@ -68,12 +68,12 @@ public class DeviceAlarm extends TenantEntity {
     /**
      * 经度
      */
-    private Long longitude;
+    private Double longitude;
 
     /**
      * 纬度
      */
-    private Long latitude;
+    private Double latitude;
 
     /**
      * 报警位置
@@ -99,7 +99,7 @@ public class DeviceAlarm extends TenantEntity {
      * 0已处理，1未处理
      * treatment_state
      */
-    private Long treatmentState;
+    private Integer treatmentState;
 
 
     /**

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

@@ -36,7 +36,7 @@ public class DeviceAlarmBo extends TenantEntity {
     /**
      * 报警事项
      * device_action
-     *  0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
+     * 0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
      */
     private Integer deviceAction;
 
@@ -63,7 +63,7 @@ public class DeviceAlarmBo extends TenantEntity {
     private String dataSource;
 
     /**
-     * 内容
+     * 内容（报警信息）
      */
     private String content;
 

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

@@ -267,9 +267,13 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
 
         // 处理上传的图片
         if (deviceForm.getFile() != null) {
-            SysOssVo upload = ossService.upload(deviceForm.getFile());
             // 设置图片路径
-            deviceForm.setDevicePic(upload.getUrl());
+            SysOssVo oss = ossService.upload(deviceForm.getFile());
+            // 强制将HTTP替换为HTTPS
+            if (oss.getUrl() != null && oss.getUrl().startsWith("http://")) {
+                oss.setUrl(oss.getUrl().replaceFirst("^http://", "https://"));
+            }
+            deviceForm.setDevicePic(oss.getUrl());
         }
 
         // 更新字段
@@ -665,7 +669,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
      * 获取设备使用数据
      *
      * @param deviceTypeId 设备ID
-     * @param range    时间范围 1:半年 2:一年
+     * @param range        时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
     @Override

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceAlarmMapper.xml

@@ -6,17 +6,21 @@
 
     <!-- 查询设备告警列表 -->
     <select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
-        select da.*, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        select da.*, d.device_mac as deviceMac, d.device_imei as deviceImei,d.device_name as deviceName,
+        d.device_type as deviceType,
         d.type_name as deviceTypeName, d.device_pic as devicePic
         from device_alarm da
         left join device d on da.device_id = d.id
-        left join device_type dt on dt.id = da.device_type
+        left join device_type dt on dt.id = d.device_type
         <where>
+            <if test="bo.content != null">
+                and d.device_name like concat('%', #{bo.content}, '%') or dt.type_name like concat('%', #{bo.content}, '%')
+            </if>
             <if test="bo.deviceName != null">
-                and da.device_name = #{bo.deviceName}
+                and d.device_name like concat('%', #{bo.deviceName}, '%')
             </if>
             <if test="bo.deviceType != null">
-                and da.device_type = #{bo.deviceType}
+                and dt.id = #{bo.deviceType}
             </if>
             <if test="bo.deviceAction != null">
                 and da.device_action = #{bo.deviceAction}

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -351,13 +351,13 @@
 
     <!-- 获取告警信息 -->
     <select id="getAlarmInformation" resultType="com.fuyuanshen.equipment.domain.vo.AlarmInformationVo">
-        SELECT (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0) AS alarmsTotal
+        SELECT (SELECT COUNT(1) FROM device_alarm) AS alarmsTotal
              , (SELECT COUNT(1)
                 FROM device_alarm
-                WHERE treatment_state = 0)                                   AS processingAlarm
+                WHERE treatment_state = 0)         AS processingAlarm
              , (SELECT COUNT(1)
                 FROM device_alarm
-                WHERE treatment_state = 0 AND
+                WHERE
             DATE (create_time) = CURDATE()) AS alarmsTotalToday
              , (
         SELECT COUNT (1)
@@ -425,7 +425,9 @@
 
     <!-- 根据设备IMEI查询设备 -->
     <select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device">
-        SELECT * FROM device WHERE device_imei = #{deviceImei}
+        SELECT *
+        FROM device
+        WHERE device_imei = #{deviceImei}
     </select>
 
 </mapper>