修复sq当前时间格式

王富生
1 parent ba1af3fd
Showing 3 changed files with 39 additions and 23 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadStreetController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/PlanConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadStreetServiceImpl.java
@@ -82,10 +82,9 @@ public class RoadStreetController {
     @GetMapping("/list")
     @Operation(summary = "获得街道列表")
-    @Parameter(name = "busi_line", description = "业务线", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('garden:road-street:query')")
-    public CommonResult<List<RoadStreetRespVO>> getRoadStreet(@RequestParam("busi_line") @NotBlank String busiLine) {
-        List<RoadStreetDO> roadStreet = roadStreetService.getRoadStreetList(busiLine);
+    public CommonResult<List<RoadStreetRespVO>> getRoadStreet() {
+        List<RoadStreetDO> roadStreet = roadStreetService.getRoadStreetList(null);
         return success(BeanUtils.toBean(roadStreet, RoadStreetRespVO.class));
     }
@@ -17,5 +17,8 @@ public class PlanConstants {
     /*养护类型-浇水-字典key*/
     public static final String MAINTAIN_TYPE = "maintain_type";
+    /*归属街道-字典key*/
+    public static final String STREET_BELONG = "street_belong";
+
 }
 package com.zteits.urbanops.module.garden.service.road;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-import com.zteits.urbanops.module.garden.controller.admin.road.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadStreetDO;
+import com.zteits.urbanops.framework.common.biz.system.dict.DictDataCommonApi;
+import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
+import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadStreetPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadStreetSaveReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadStreetDO;
 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadStreetMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
-import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
+import static com.zteits.urbanops.module.garden.enums.PlanConstants.STREET_BELONG;
 /**
  * 街道 Service 实现类
@@ -34,6 +29,9 @@ public class RoadStreetServiceImpl implements RoadStreetService {
     @Resource
     private RoadStreetMapper roadStreetMapper;
+    @Resource
+    private DictDataCommonApi dictDataCommonApi;
+
     @Override
     public Long createRoadStreet(RoadStreetSaveReqVO createReqVO) {
         // 插入
@@ -86,9 +84,25 @@ public class RoadStreetServiceImpl implements RoadStreetService {
     @Override
     public List<RoadStreetDO> getRoadStreetList(String busiLine) {
-        QueryWrapper<RoadStreetDO> sql = new QueryWrapper<>();
-        sql.lambda().eq(RoadStreetDO::getBusiLine, busiLine).eq(RoadStreetDO::getDeleted,0);
-        return roadStreetMapper.selectList(sql);
+        List<RoadStreetDO> respList = new ArrayList<>();
+        //从数据字典中获取
+        List<DictDataRespDTO> dictDataList = dictDataCommonApi.getDictDataList(STREET_BELONG);
+        if(org.springframework.util.CollectionUtils.isEmpty(dictDataList)){
+            return respList;
+        }
+
+        dictDataList.forEach(dictData -> {
+            RoadStreetDO roadStreet = new RoadStreetDO();
+            roadStreet.setStreetId(dictData.getValue());
+            roadStreet.setStreetName(dictData.getLabel());
+            respList.add(roadStreet);
+        });
+
+//        QueryWrapper<RoadStreetDO> sql = new QueryWrapper<>();
+//        sql.lambda().eq(RoadStreetDO::getBusiLine, busiLine).eq(RoadStreetDO::getDeleted,0);
+//        return roadStreetMapper.selectList(sql);
+
+        return respList;
     }
 }
 \ No newline at end of file