Merge branch '6170' into prod

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java

@@ -739,7 +739,6 @@ public class DeviceXinghanBizService {
         device.setCreateByName(loginUser.getNickname());
         device.setTypeName(deviceTypes.getTypeName());
         device.setDeviceType(deviceTypes.getId());
-        device.setDevicePic(deviceTypes.getDevicePic());
         if (device.getDeviceImei() != null) {
             device.setPubTopic("A/" + device.getDeviceImei());
             device.setSubTopic("B/" + device.getDeviceImei());

fys-admin/src/main/resources/application-jingquan.yml

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:

fys-admin/src/main/resources/application-prod.yml

@@ -11,8 +11,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java

@@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -51,7 +50,7 @@ public class DeviceTypeController {
     // @Log("新增设备类型")
     @Operation(summary = "新增设备类型")
     @PostMapping(value = "/add")
-    public R<Void> createDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
+    public R<Void> createDeviceType(@Validated @RequestBody DeviceType resources) {
         deviceTypeService.create(resources);
         return R.ok();
     }
@@ -60,7 +59,7 @@ public class DeviceTypeController {
     // @Log("修改设备类型")
     @Operation(summary = "修改设备类型")
     @PutMapping(value = "/update")
-    public  R<Void>  updateDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
+    public  R<Void>  updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) {
         deviceTypeService.update(resources);
         return R.ok();
     }

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

@@ -85,8 +85,5 @@ public class DeviceType extends TenantEntity {
     @Schema(title = "型号字典用于PC页面跳转")
     private String pcModelDictionary;
 
-    @Schema(title = "设备图片")
-    private String devicePic;
-
 
 }

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

@@ -2,7 +2,6 @@ package com.fuyuanshen.equipment.domain.form;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @Description: 设备类型
@@ -49,10 +48,5 @@ public class DeviceTypeForm {
      */
     @Schema(title = "型号字典用于PC页面跳转")
     private String pcModelDictionary;
-    @Schema(title = "设备图片")
-    private String devicePic;
-
-    @Schema(title = "设备图片")
-    private MultipartFile file;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java

@@ -12,7 +12,6 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
 import com.fuyuanshen.equipment.domain.dto.ImportResult;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
-import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.handler.ImageWriteHandler;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import lombok.extern.slf4j.Slf4j;
@@ -438,10 +437,8 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
                     newDeviceType.setAppModelDictionary(originalDto.getAppModelDictionary());
                     newDeviceType.setPcModelDictionary(originalDto.getPcModelDictionary());
 
-                    DeviceTypeForm deviceTypeForm = new DeviceTypeForm();
-                    BeanUtil.copyProperties(newDeviceType, deviceTypeForm, true);
                     // 创建新的设备类型
-                    params.getDeviceTypeService().create(deviceTypeForm);
+                    params.getDeviceTypeService().create(newDeviceType);
 
                     // 重新查询确保获取到正确的ID
                     deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());

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

@@ -8,7 +8,6 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -64,14 +63,14 @@ public interface DeviceTypeService extends IService<DeviceType> {
      *
      * @param resources /
      */
-    void create(DeviceTypeForm resources) throws IOException;
+    void create(DeviceType resources);
 
     /**
      * 修改设备类型
      *
      * @param resources /
      */
-    void update(DeviceTypeForm resources) throws IOException;
+    void update(DeviceTypeForm resources);
 
     /**
      * 多选删除

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

@@ -19,16 +19,12 @@ import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import com.fuyuanshen.equipment.service.DeviceTypeService;
-import com.fuyuanshen.equipment.utils.FileHashUtil;
-import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
-import com.fuyuanshen.system.service.ISysOssService;
 import com.fuyuanshen.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -50,8 +46,6 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
     private final ISysRoleService roleService;
-    private final ISysOssService ossService;
-    private final FileHashUtil fileHashUtil;
 
 
     /**
@@ -187,38 +181,24 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(DeviceTypeForm resources) throws IOException {
+    public void create(DeviceType resources) {
 
         // 校验设备类型名称
         List<DeviceType> typeName = deviceTypeMapper.selectList(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
         if (CollectionUtil.isNotEmpty(typeName)) {
             throw new RuntimeException("设备类型名称已存在，无法新增!!!");
         }
-        // 保存图片并获取URL
-        if (resources.getFile() != null) {
-            String fileHash = fileHashUtil.hash(resources.getFile());
-            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
-            // 强制将HTTP替换为HTTPS
-            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
-                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
-            }
-            // 设置图片路径
-            resources.setDevicePic(upload.getUrl());
-        }
-
-        DeviceType deviceType = new DeviceType();
-        BeanUtil.copyProperties(resources, deviceType, true);
 
         LoginUser loginUser = LoginHelper.getLoginUser();
-        deviceType.setCustomerId(loginUser.getUserId());
-        deviceType.setOwnerCustomerId(loginUser.getUserId());
-        deviceType.setOriginalOwnerId(loginUser.getUserId());
-        deviceType.setCreateByName(loginUser.getNickname());
-        deviceTypeMapper.insert(deviceType);
+        resources.setCustomerId(loginUser.getUserId());
+        resources.setOwnerCustomerId(loginUser.getUserId());
+        resources.setOriginalOwnerId(loginUser.getUserId());
+        resources.setCreateByName(loginUser.getNickname());
+        deviceTypeMapper.insert(resources);
 
         // 自动授权给自己
         DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
-        deviceTypeGrants.setDeviceTypeId(deviceType.getId());
+        deviceTypeGrants.setDeviceTypeId(resources.getId());
         deviceTypeGrants.setCustomerId(loginUser.getUserId());
         deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
         deviceTypeGrants.setGrantedAt(new Date());
@@ -233,7 +213,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(DeviceTypeForm resources) throws IOException {
+    public void update(DeviceTypeForm resources) {
         DeviceTypeGrants deviceTypeGrants = deviceTypeGrantsMapper.selectById(resources.getId());
         if (deviceTypeGrants == null) {
             throw new RuntimeException("设备类型不存在");
@@ -264,17 +244,6 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
                 throw new RuntimeException("无权修改该设备类型");
             }
         }
-        // 保存图片并获取URL
-        if (resources.getFile() != null) {
-            String fileHash = fileHashUtil.hash(resources.getFile());
-            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
-            // 强制将HTTP替换为HTTPS
-            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
-                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
-            }
-            // 设置图片路径
-            resources.setDevicePic(upload.getUrl());
-        }
 
         BeanUtil.copyProperties(resources, deviceType);
         deviceTypeMapper.updateById(deviceType);

pom.xml

@@ -85,10 +85,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>
@@ -98,10 +98,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>
         <profile>
             <id>jingquan</id>