Merge remote-tracking branch 'origin/master'

# Conflicts:
#	park-overview-service/src/main/java/com/zksy/park/controller/ParkVisualVideoController.java

park-overview-service/src/main/java/com/zksy/park/controller/ParkStemScreenController.java

@@ -0,0 +1,71 @@
+package com.zksy.park.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.common.annotation.Log;
+import com.zksy.common.core.domain.Result;
+import com.zksy.common.enums.BusinessType;
+import com.zksy.common.utils.SearchUtil;
+import com.zksy.park.domain.dto.PackInfoDto;
+import com.zksy.park.domain.dto.ParkStemScreenDto;
+import com.zksy.park.service.ParkInfoService;
+import com.zksy.park.service.ParkStemScreenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project dh-server-micro
+ * @description 园区灯杆大屏
+ * @date 2024/12/23 08:42:12
+ */
+@RestController
+@RequestMapping("/parkStemScreen")
+@Api(tags = "园区灯杆大屏", description = "园区灯杆大屏desc")
+public class ParkStemScreenController {
+
+    @Autowired
+    private ParkStemScreenService service;
+
+    @GetMapping("/getById")
+    @ApiOperation(value = "园区灯杆大屏搜索getById")
+    public Result getById(@PathVariable String id) {
+        return service.getByIdWithFile(id);
+    }
+
+    @GetMapping("/findByPage")
+    @ApiOperation(value = "园区灯杆大屏分页")
+    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    }
+
+    @GetMapping("/getList")
+    @ApiOperation(value = "园区灯杆大屏查询所有")
+    public Result getList(String conditionJson) throws Exception {
+        return Result.ok(service.list(SearchUtil.parseWhereSql(conditionJson)));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "园区灯杆大屏新增")
+    @Log(title = "新增园区灯杆大屏", businessType = BusinessType.INSERT)
+    public Result<Object> save(@ModelAttribute ParkStemScreenDto dto) {
+        return service.saveParkStemScreen(dto);
+    }
+
+    @PutMapping("/updateById")
+    @ApiOperation(value = "园区灯杆大屏修改")
+    @Log(title = "修改园区灯杆大屏", businessType = BusinessType.UPDATE)
+    public Result<String> updateById(@ModelAttribute ParkStemScreenDto dto) {
+        return service.updateByParkStemScreenId(dto);
+    }
+
+    @DeleteMapping("/deleteById")
+    @ApiOperation(value = "园区灯杆大屏删除")
+    @Log(title = "修改园区灯杆大屏", businessType = BusinessType.DELETE)
+    public Result<String> deleteById(String id) {
+        return service.deleteById(id);
+    }
+
+}

park-overview-service/src/main/java/com/zksy/park/domain/ParkStemScreen.java

@@ -0,0 +1,52 @@
+package com.zksy.park.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project dh-server-micro
+ * @description 园区灯杆大屏
+ * @date 2024/12/23 08:55:49
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("park_stem_screen")
+@ApiModel(value = "园区灯杆大屏")
+public class ParkStemScreen extends Model<ParkStemScreen> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @ApiModelProperty(value = "灯杆名称、属性")
+    private String type;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "文件路径")
+    @TableField(exist = false)
+    private List<String> filePath;
+}

park-overview-service/src/main/java/com/zksy/park/domain/dto/ParkStemScreenDto.java

@@ -0,0 +1,18 @@
+package com.zksy.park.domain.dto;
+
+import com.zksy.park.domain.ParkStemScreen;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class ParkStemScreenDto extends ParkStemScreen {
+    @ApiModelProperty(value = "文件")
+    private List<MultipartFile> files;
+}

park-overview-service/src/main/java/com/zksy/park/mapper/ParkStemScreenMapper.java

@@ -0,0 +1,17 @@
+package com.zksy.park.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zksy.park.domain.ParkInfo;
+import com.zksy.park.domain.ParkStemScreen;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author Administrator
+ * @version 1.0
+ * @project dh-server-micro
+ * @description 园区灯杆大屏
+ * @date 2024/12/23 08:55:08
+ */
+@Mapper
+public interface ParkStemScreenMapper extends BaseMapper<ParkStemScreen> {
+}

park-overview-service/src/main/java/com/zksy/park/service/ParkStemScreenService.java

@@ -0,0 +1,25 @@
+package com.zksy.park.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zksy.common.core.domain.Result;
+import com.zksy.park.domain.ParkInfo;
+import com.zksy.park.domain.ParkStemScreen;
+import com.zksy.park.domain.dto.PackInfoDto;
+import com.zksy.park.domain.dto.ParkStemScreenDto;
+
+/**
+ * @author nahida
+ * @version 1.0
+ * @project dh-server-micro
+ * @description 园区灯杆大屏
+ * @date 2024/12/23 08:54:28
+ */
+public interface ParkStemScreenService extends IService<ParkStemScreen> {
+    Result<Object> saveParkStemScreen(ParkStemScreenDto dto);
+
+    Result<String> updateByParkStemScreenId(ParkStemScreenDto dto);
+
+    Result<String> deleteById(String id);
+
+    Result<ParkStemScreen> getByIdWithFile(String id);
+}

park-overview-service/src/main/java/com/zksy/park/service/imp/ParkInfoServiceImpl.java

@@ -19,10 +19,10 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 
 /**
- * 经营异常名录Service业务层处理
+ * 园区信息Service业务层处理
  *
  * @author sy
- * @date 2024-05-08
+ * @date 2024-12-30
  */
 @Service
 public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> implements ParkInfoService {

park-overview-service/src/main/java/com/zksy/park/service/imp/ParkStemScreenServiceImpl.java

@@ -0,0 +1,124 @@
+package com.zksy.park.service.imp;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zksy.common.core.domain.Result;
+import com.zksy.park.domain.FileGeneral;
+import com.zksy.park.domain.ParkStemScreen;
+import com.zksy.park.domain.dto.ParkStemScreenDto;
+import com.zksy.park.mapper.ParkStemScreenMapper;
+import com.zksy.park.service.FileGeneralService;
+import com.zksy.park.service.ParkStemScreenService;
+import com.zksy.service.MinioFileStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 园区灯杆大屏Service业务层处理
+ *
+ * @author sy
+ * @date 2024-05-08
+ */
+@Service
+public class ParkStemScreenServiceImpl extends ServiceImpl<ParkStemScreenMapper, ParkStemScreen> implements ParkStemScreenService {
+    @Autowired
+    private FileGeneralService fileGeneralService;
+    @Autowired
+    private MinioFileStorageService minioFileStorageService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<Object> saveParkStemScreen(ParkStemScreenDto dto) {
+        try {
+            if (dto.getFiles() != null) {
+                List<String> filePath = minioFileStorageService.uploadFileBatch(dto.getFiles(), "yqdgdp");
+                dto.setFilePath(filePath);
+            }
+            ParkStemScreen entity = BeanUtil.copyProperties(dto, ParkStemScreen.class);
+            entity.setCreateTime(LocalDateTime.now());
+            entity.setUpdateTime(LocalDateTime.now());
+            baseMapper.insert(entity);
+            if (dto.getFilePath() != null) {
+                dto.getFilePath().forEach(q ->{
+                    FileGeneral fileGeneral = new FileGeneral();
+                    fileGeneral.setFormId(entity.getId());
+                    fileGeneral.setFilePath(q);
+                    fileGeneralService.save(fileGeneral);
+                });
+            }
+            return Result.ok("新增成功");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<String> updateByParkStemScreenId(ParkStemScreenDto dto) {
+        try {
+            if (dto.getFiles() != null) {
+                LambdaQueryWrapper<FileGeneral> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(FileGeneral::getFormId, dto.getId());
+                fileGeneralService.remove(wrapper);
+                List<String> filePath = minioFileStorageService.uploadFileBatch(dto.getFiles(), "yqdgdp");
+                dto.setFilePath(filePath);
+                if (filePath != null){
+                    filePath.forEach(q ->{
+                        FileGeneral fileGeneral = new FileGeneral();
+                        fileGeneral.setFormId(dto.getId());
+                        fileGeneral.setFilePath(q);
+                        fileGeneralService.save(fileGeneral);
+                    });
+                }
+            }
+            ParkStemScreen entity = BeanUtil.copyProperties(dto, ParkStemScreen.class);
+            entity.setUpdateTime(LocalDateTime.now());
+            this.updateById(entity);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return Result.ok("更新成功");
+    }
+
+    @Override
+    @Transactional
+    public Result<String> deleteById(String id) {
+        if (StrUtil.isNotBlank(id)) {
+            LambdaQueryWrapper<FileGeneral> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(FileGeneral::getFormId, id);
+            FileGeneral one = fileGeneralService.getOne(wrapper);
+            if(one!=null){
+                minioFileStorageService.deleteFile(one.getFilePath());
+                fileGeneralService.remove(wrapper);
+            }
+            this.removeById(id);
+            return Result.ok("删除成功");
+        }
+        return Result.error("删除失败");
+    }
+
+    @Override
+    public Result<ParkStemScreen> getByIdWithFile(String id) {
+        if (StrUtil.isNotBlank(id)) {
+            ParkStemScreen parkStemScreen = this.getById(id);
+            LambdaQueryWrapper<FileGeneral> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(FileGeneral::getFormId, id);
+            List<FileGeneral> fileGeneralList = fileGeneralService.list(wrapper);
+            if(fileGeneralList != null){
+                List<String> stringList = null;
+                fileGeneralList.forEach(q ->{
+                    stringList.add(q.getFilePath());
+                });
+                    parkStemScreen.setFilePath(stringList);
+            }
+            return Result.ok(parkStemScreen);
+        }
+        return Result.error("获取失败");
+    }
+}