修改图片业务,上传保存本地,不保存数据库

src/main/java/org/springblade/modules/business/controller/MorningEveningController.java

@@ -0,0 +1,67 @@
+package org.springblade.modules.business.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tenant.annotation.TenantDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.business.entity.MorningEvening;
+import org.springblade.modules.business.service.IMorningEveningService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author chents
+ */
+@TenantDS
+@Slf4j
+@RestController
+@RequestMapping(CommonConstant.APPLICATION_BUSINESS_NAME + "/poc_morning_evening")
+@RequiredArgsConstructor
+@Api(value = "早晚高峰", tags = "早晚高峰接口")
+public class MorningEveningController extends BladeController {
+
+    private final IMorningEveningService morningEveningService;
+
+
+    /**
+     * 查询所有数据
+     *
+     * @return
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "查询所有数据")
+    @GetMapping("get-list-all")
+    public R listAll() {
+        QueryWrapper<MorningEvening> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id","morning_start","morning_end","evening_start","evening_end");
+        List<MorningEvening> morningEveningList = morningEveningService.list(queryWrapper);
+        return R.data(morningEveningList);
+    }
+
+    /**
+     * 修改早晚高峰
+     */
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "修改数据")
+    @PostMapping("update")
+    public R update(@RequestBody MorningEvening morningEvening) {
+        boolean result = morningEveningService.updateById(morningEvening);
+        if (result) {
+            return R.success("修改成功");
+        } else {
+            return R.fail("修改失败");
+        }
+    }
+
+}
+

src/main/java/org/springblade/modules/business/entity/BusLine.java

@@ -58,9 +58,5 @@ public class BusLine extends BaseEntity {
 	private String imgMap;
 	// 景区图片
 	private String imgScenic;
-//	//经度
-//	private Double jingdu;
-//	//纬度
-//	private Double weidu;
 
 }

src/main/java/org/springblade/modules/business/entity/MorningEvening.java

@@ -0,0 +1,46 @@
+package org.springblade.modules.business.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.time.LocalTime;
+
+/**
+ * 早晚高峰表
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("poc_morning_evening")
+public class MorningEvening extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@JsonSerialize(
+		using = ToStringSerializer.class
+	)
+	@ApiModelProperty("主键id")
+	@TableId(
+		value = "id",
+		type = IdType.ASSIGN_ID
+	)
+	private Long id;
+
+	@JsonFormat(pattern = "HH:mm")
+	private LocalTime morningStart;
+	@JsonFormat(pattern = "HH:mm")
+	private LocalTime morningEnd;
+	@JsonFormat(pattern = "HH:mm")
+	private LocalTime eveningStart;
+	@JsonFormat(pattern = "HH:mm")
+	private LocalTime eveningEnd;
+
+}

src/main/java/org/springblade/modules/business/mapper/MorningEveningMapper.java

@@ -0,0 +1,13 @@
+package org.springblade.modules.business.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.modules.business.entity.CarLiveChannel;
+import org.springblade.modules.business.entity.MorningEvening;
+
+/**
+ * Mapper 接口
+ *
+ * @author Chill
+ */
+public interface MorningEveningMapper extends BaseMapper<MorningEvening> {
+
+}

src/main/java/org/springblade/modules/business/mapper/MorningEveningMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.modules.business.mapper.MorningEveningMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="MorningEveningResultMap" type="org.springblade.modules.business.entity.MorningEvening">
+        <result column="id" property="id"/>
+        <result column="morning_start" property="morningStart"/>
+        <result column="morning_end" property="morningEnd"/>
+        <result column="evening_start" property="eveningStart"/>
+        <result column="evening_end" property="eveningEnd"/>
+    </resultMap>
+
+</mapper>

src/main/java/org/springblade/modules/business/service/IMorningEveningService.java

@@ -0,0 +1,15 @@
+package org.springblade.modules.business.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+import org.springblade.modules.business.entity.CarLiveChannel;
+import org.springblade.modules.business.entity.MorningEvening;
+
+/**
+ * 服务类
+ *
+ * @author chents
+ */
+public interface IMorningEveningService extends BaseService<MorningEvening> {
+
+}

src/main/java/org/springblade/modules/business/service/impl/MorningEveningServiceImpl.java

@@ -0,0 +1,16 @@
+package org.springblade.modules.business.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.business.entity.MorningEvening;
+import org.springblade.modules.business.mapper.MorningEveningMapper;
+import org.springblade.modules.business.service.IMorningEveningService;
+import org.springframework.stereotype.Service;
+
+/**
+*@Author: Chents
+*@Create: 2023-05-16
+*/
+@Service
+public class MorningEveningServiceImpl extends BaseServiceImpl<MorningEveningMapper, MorningEvening> implements IMorningEveningService {
+
+}

src/main/java/org/springblade/modules/business/service/impl/StationHintServiceImpl.java

@@ -58,8 +58,6 @@ public class StationHintServiceImpl extends BaseServiceImpl<BusLineMapper, BusLi
             busLineVo.setLinename(x.getLinename());
             busLineVo.setUpdown(x.getUpdown());
             busLineVo.setSnameKey(x.getSnameKey());
-//            busLineVo.setJingdu(x.getJingdu().toString());
-//            busLineVo.setWeidu(x.getWeidu().toString());
             return busLineVo;
         }).collect(Collectors.toList());
         return R.data(busLineVoList);

src/main/java/org/springblade/modules/business/vo/BusLineUpdateVo.java

@@ -21,6 +21,7 @@ public class BusLineUpdateVo implements Serializable {
     //公交线路
     private BusLine busLine;
 
+
     //图片列表
     private List<PocBusLineImg> imgList;
 }

src/main/java/org/springblade/modules/job/CarInfoTask.java

@@ -83,6 +83,7 @@ public class CarInfoTask {
         JSONArray carInfoList = json.getJSONArray("bus");
         for (Object o : carInfoList) {
             JSONObject carInfo = (JSONObject) o;
+            log.info("============="+carInfo.getString("busno"));
             if (carNo.equals(carInfo.getString("busno"))) {
                 info = BeanUtil.copy(carInfo, CarInfoVO.class);
             }
@@ -185,6 +186,8 @@ public class CarInfoTask {
             resultMap.put("imgData", new ArrayList<>());
             resultMap.put("busNo", "");
             resultMap.put("speed", "");
+            resultMap.put("weidu", "");
+            resultMap.put("jingdu", "");
         } else {
             resultMap.put("siteTips", busLine.getTips());
             resultMap.put("articleData", busLine.getActicle());
@@ -192,6 +195,8 @@ public class CarInfoTask {
             resultMap.put("scenicData", busLine.getScenic());
             resultMap.put("busNo", info.getBusno());
             resultMap.put("speed", info.getSpeed());
+            resultMap.put("weidu",info.getWeidu());
+            resultMap.put("jingdu",info.getJingdu());
             BusLine busLineByName = stationHintService.getBusLineByName(nextSite.getSname(), nextSite.getWeizhi());
             Long busLineId = busLineByName.getId();
             List<imgVo> imgList = proBusLineImgService.getImgByid(busLineId);

src/main/java/org/springblade/upload/controller/PosBusLineController.java

@@ -20,8 +20,11 @@ public class PosBusLineController {
     private IProBusLineImgService proBusLineImgService;
 
     @PostMapping("/upload")
-    public R upload(@RequestParam("file") MultipartFile file, @RequestParam("imgType") Integer imgType,@RequestParam("busLineId") Long busLineId) {
-        return proBusLineImgService.upload(file, imgType,busLineId);
+    public R upload(@RequestParam("file") MultipartFile file, @RequestParam("imgType") Integer imgType) {
+        if (file.getSize() > 1024 * 1024) {
+            return R.fail("上传失败，文件大小不能超过1MB！");
+        }
+        return proBusLineImgService.upload(file, imgType);
     }
 
     @GetMapping("/query-list")

src/main/java/org/springblade/upload/service/IProBusLineImgService.java

@@ -19,7 +19,7 @@ public interface IProBusLineImgService {
      *文件上传接口
      * @return
      */
-    R upload(MultipartFile file, Integer imgType,Long busLineId);
+    R upload(MultipartFile file, Integer imgType);
 
     R queryList(Long id);
 

src/main/java/org/springblade/upload/service/impl/ProBusLineImgImpl.java

@@ -2,22 +2,19 @@ package org.springblade.upload.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springblade.core.tool.api.R;
 import org.springblade.modules.business.vo.imgVo;
 import org.springblade.upload.entity.PocBusLineImg;
 import org.springblade.upload.mapper.ProBusLineImgMapper;
 import org.springblade.upload.service.IProBusLineImgService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 
 /**
@@ -31,7 +28,8 @@ public class ProBusLineImgImpl implements IProBusLineImgService {
     ProBusLineImgMapper pocBusLineImgMapper;
 
     @Override
-    public R upload(MultipartFile file, Integer imgType,Long busLineId) {
+    @Transactional(rollbackFor = Exception.class)
+    public R upload(MultipartFile file, Integer imgType) {
         String fileName = file.getOriginalFilename();
         String suffixName = fileName.substring(fileName.lastIndexOf("."));
         String newFileName = UUID.randomUUID().toString() + suffixName;
@@ -44,18 +42,11 @@ public class ProBusLineImgImpl implements IProBusLineImgService {
         File dest = new File(absolutePath + newFileName);
         try {
             file.transferTo(dest);
-            PocBusLineImg pocBusLineImg = new PocBusLineImg();
-            pocBusLineImg.setImgName(fileName);
-            pocBusLineImg.setImgUrl(newFileName);
-            pocBusLineImg.setImgType(imgType);
-            pocBusLineImg.setBusLineId(busLineId);
-            // TODO: 设置创建人
-            pocBusLineImg.setCreateTime(new Date());
-            // TODO: 设置修改人
-            pocBusLineImg.setUpdateTime(new Date());
-            pocBusLineImg.setIsDeleted(0);
-            pocBusLineImgMapper.insert(pocBusLineImg);
-            return R.data(pocBusLineImg);
+            String imgUrl = newFileName;
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("imgType",imgType);
+            map.put("imgUrl",imgUrl);
+            return R.data(map);
         } catch (IOException e) {
             e.printStackTrace();
         }