站点修改-图片

admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -8,10 +8,7 @@ import com.kym.service.admin.StationService;
 import com.kym.service.utils.KymCache;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import static com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isNotNull;
 
@@ -38,7 +35,7 @@ public class StationController {
 
     @SysLog("充电站数据统计")
     @GetMapping("/stationStatusDetail")
-    R stationStatusDetail(@RequestParam("stationId") String stationId,
+    R<?> stationStatusDetail(@RequestParam("stationId") String stationId,
                           @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String startTime,
                           @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String endTime) {
         // 请求en+接口
@@ -46,10 +43,9 @@ public class StationController {
         return R.success(response);
     }
 
-    // TODO: 2023-09-01 充电站列表（站点id,站点名称，站点编号，站点类型，充电桩数量，站点状态）
-
+    @SysLog("站点列表")
     @GetMapping("listStation")
-    R listStation(@RequestParam(required = false) String stationName) {
+    R<?> listStation(@RequestParam(required = false) String stationName) {
         // 判断数据权限
         var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
         var res = stationService.lambdaQuery()
@@ -59,13 +55,20 @@ public class StationController {
         return R.success(res);
     }
 
+    @SysLog("修改站点信息")
+    @PutMapping()
+    R<?> modifyStation(@RequestBody Station station){
+        stationService.modifyStation(station);
+        return R.success();
+    }
+
     /**
      * 拉取EN+充电站信息数据并更新本地服务器数据
      *
      * @return
      */
     @GetMapping("/pullEnStations")
-    R pullEnStationInfos() {
+    R<?> pullEnStationInfos() {
         stationService.pullEnStationInfos();
         return R.success();
     }

entity/src/main/java/com/kym/entity/admin/Station.java

@@ -72,20 +72,6 @@ public class Station extends BaseEntity implements Serializable {
     @JSONField(name = "AreaCode")
     private String areaCode;
 
-    /**
-     * 图片
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject picture;
-
     /**
      * 地址
      */

entity/src/main/java/com/kym/entity/admin/vo/StationVo.java

@@ -74,20 +74,6 @@ public class StationVo extends BaseEntity implements Serializable {
     @JSONField(name = "AreaCode")
     private String areaCode;
 
-    /**
-     * 图片
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject picture;
-
     /**
      * 地址
      */

service/src/main/java/com/kym/service/admin/StationService.java

@@ -29,4 +29,5 @@ public interface StationService extends IService<Station> {
     @Transactional(rollbackFor = Exception.class)
     public void pullEnStationInfos();
 
+    void modifyStation(Station station);
 }

service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.utils.AESUtil;
+import com.kym.common.utils.CommUtil;
 import com.kym.entity.admin.EquipmentInfo;
 import com.kym.entity.admin.Station;
 import com.kym.entity.admin.vo.StationVo;
@@ -138,4 +139,11 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
         equipmentInfoService.saveBatch(equipmentList.stream().filter(equipmentInfo -> !equipments.contains(equipmentInfo.getEquipmentId())).toList());
     }
 
+    @Override
+    @Transactional
+    public void modifyStation(Station station) {
+        lambdaUpdate().set(!CommUtil.isEmptyOrNull(station.getPictures()), Station::getPictures, station.getPictures())
+                .eq(Station::getStationId, station.getStationId()).update();
+    }
+
 }