Merge branch 'master' into dev

wangqian
2 parents b6ced151 89fbee7c
Showing 5 changed files with 61 additions and 23 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadServiceImpl.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/DeptController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
@@ -126,19 +126,28 @@ public class RoadController {
     @Operation(summary = "物联网查询道路")
     @GetMapping("/queryAllRoadList")
     @PermitAll
-    public CommonResult<List<SysRoadRespVO>> queryAllRoadList(@RequestParam(required = false)String roadName,@RequestParam(required = false)String deptCode,@RequestParam(required = false)String companyCode) {
+    public Map<String, Object> queryAllRoadList(@RequestParam(required = false) String roadName, @RequestParam(required = false) String deptCode, @RequestParam(required = false) String companyCode) {
         RoadListReqVO reqVO = new RoadListReqVO();
         reqVO.setRoadName(roadName);
-        reqVO.setCompanyId(Long.valueOf(deptCode));
+        // 处理deptCode为空的情况
+        if (deptCode != null && !deptCode.isEmpty()) {
+            reqVO.setCompanyId(Long.valueOf(deptCode));
+        }
         reqVO.setBusiLine(companyCode);
         List<RoadDO> roadList = roadService.getRoadList(reqVO);
-        List<SysRoadRespVO> deptResps = roadList.stream().map(manager -> {
-            SysRoadRespVO sysDeptResp = new SysRoadRespVO();
-            sysDeptResp.setRoadCode(manager.getId()+"");
-            sysDeptResp.setRoadName(manager.getRoadName());
-            return sysDeptResp;
+        List<Map<String, Object>> roadResps = roadList.stream().map(manager -> {
+            Map<String, Object> roadMap = new HashMap<>();
+            roadMap.put("roadCode", manager.getId() + "");
+            roadMap.put("roadName", manager.getRoadName());
+            return roadMap;
         }).collect(Collectors.toList());
-        return success(deptResps);
+        
+        // 构建返回格式
+        Map<String, Object> result = new HashMap<>();
+        result.put("msg", "操作成功");
+        result.put("code", 200);
+        result.put("data", roadResps);
+        return result;
     }
 }
@@ -159,10 +159,18 @@ public class RoadServiceImpl implements RoadService {
         QueryWrapper<RoadDO> sql = new QueryWrapper<>();
         sql.select("id", "road_name", "level_id","company_id","dept_id");
-        sql.lambda().eq(RoadDO::getCompanyId, reqVO.getCompanyId())
-                .eq(RoadDO::getLevelId, reqVO.getLevelId())
-                .eq(RoadDO::getBusiLine, reqVO.getBusiLine())
-                .likeRight(StringUtils.isNotEmpty(reqVO.getRoadName()), RoadDO::getRoadName, reqVO.getRoadName());
+        if (reqVO.getCompanyId() != null) {
+            sql.lambda().eq(RoadDO::getCompanyId, reqVO.getCompanyId());
+        }
+        if (reqVO.getLevelId() != null) {
+            sql.lambda().eq(RoadDO::getLevelId, reqVO.getLevelId());
+        }
+        if (reqVO.getBusiLine() != null) {
+            sql.lambda().eq(RoadDO::getBusiLine, reqVO.getBusiLine());
+        }
+        if (StringUtils.isNotEmpty(reqVO.getRoadName())) {
+            sql.lambda().like(RoadDO::getRoadName, reqVO.getRoadName());
+        }
         return roadMapper.selectList(sql);
     }
@@ -18,6 +18,9 @@ import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
+
+import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -126,18 +129,24 @@ public class DeptController {
     @Operation(summary = "查询所有组织")
     @GetMapping("/queryAllDeptList")
     @PermitAll
-    public CommonResult<List<SysDeptRespVO>>  queryAllDeptList(@RequestParam(required = false)String companyCode) {
+    public Map<String, Object> queryAllDeptList() {
         List<DeptDO> sysDepts = deptService.getSubDeptAllList();
-        List<SysDeptRespVO> deptResps = sysDepts.stream().map(sysDept -> {
-            SysDeptRespVO sysDeptResp = new SysDeptRespVO();
-            sysDeptResp.setDeptCode(sysDept.getId()+"");
-            sysDeptResp.setDeptName(sysDept.getName());
-            sysDeptResp.setParentDeptCode(sysDept.getParentId()+"");
-            sysDeptResp.setOrderNum(sysDept.getSort());
-            sysDeptResp.setStatus(sysDept.getStatus().toString());
-            return sysDeptResp;
+        List<Map<String, Object>> deptResps = sysDepts.stream().map(sysDept -> {
+            Map<String, Object> deptMap = new HashMap<>();
+            deptMap.put("deptCode", sysDept.getId() + "");
+            deptMap.put("deptName", sysDept.getName());
+            // parentDeptCode为空时返回空字符串
+            deptMap.put("parentDeptCode", sysDept.getParentId() == null || sysDept.getParentId() == 0 ? "" : sysDept.getParentId() + "");
+            deptMap.put("orderNum", sysDept.getSort());
+            return deptMap;
         }).collect(Collectors.toList());
-        return success(deptResps);
+        
+        // 构建返回格式
+        Map<String, Object> result = new HashMap<>();
+        result.put("msg", "操作成功");
+        result.put("code", 200);
+        result.put("data", deptResps);
+        return result;
     }
 }
@@ -181,6 +181,7 @@ public  class BpmCommonConstant {
     public static final String AI_DISPATCHER = "AI_dispatcher";
     /*养护级别-字典key*/
     public static final String CONSERVE_LEVEL = "conserve_level";
+
     public static final String SANHAI_COMPANY = "sanhai_compamys";
     //---------------------------------------------------------------------------------
@@ -305,8 +305,19 @@ public class BpmAIServiceImpl implements BpmAIService{
     @Override
     public boolean isSanhai(Long companyId) {
+        List<DictDataRespDTO> dictData = dictDataCommonApi.getDictDataList(SANHAI_COMPANY);
+        if(null == dictData || dictData.size()==0){
+            throw exception(SANHAI_COMPANY_NOT_EXISTS);
+        }
         List<Long> sanHaiRoadId = new ArrayList<>();
-        sanHaiRoadId.add(115L); // TODO 目前写死
+        for(DictDataRespDTO dto:dictData){
+            try {
+                sanHaiRoadId.add(Long.parseLong(dto.getValue()));
+            }catch (Exception e){
+                throw exception(SANHAI_COMPANY_NOT_EXISTS);
+            }
+        }
+        //sanHaiRoadId.add(115L); // 目前写死 ,上面改为从字典值获取258
         //是否三海路段
         boolean isSanhai = sanHaiRoadId.contains(companyId);
         return isSanhai;