Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGateController.java

@@ -78,6 +78,8 @@
    private TOperatorService tOperatorService;
    @Autowired
    private ITSiteService siteService;
    @Autowired
    private IUserService userService;

    /**
     * 跳转到优惠券管理首页
@@ -101,13 +103,14 @@
                    .eq("operatorId", 0)
                    .ne("state", 3));
            model.addAttribute("storeList",list);
            model.addAttribute("operatorId",0);
        }
        if (UserExt.getUser().getObjectType()==2){
            List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", UserExt.getUser().getObjectId())
                    .ne("state", 3));
            model.addAttribute("storeList",list2);
            model.addAttribute("operatorId",UserExt.getUser().getObjectId());
            model.addAttribute("operatorId",0);
        }
        if (UserExt.getUser().getObjectType()==3){
            List<TStore> list3 = new ArrayList<>();
@@ -129,8 +132,6 @@
            .ne("state",3));
            model.addAttribute("siteList",siteList);
        }


        return PREFIX + "gate_add.html";
    }

@@ -153,7 +154,7 @@
        map.put("device_id",device);
        map.put("region_id",""+siteId);
        // 添加门禁
        String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/addDevice", map);
        String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/addDevice", map);
        System.out.println(s1);
        Gson gson = new Gson();
        // 解析请求结果，json：
@@ -185,7 +186,7 @@
        map.put("device_id",device);
        map.put("region_id",""+siteId);
        // 添加门禁
        String s1 = HttpRequestUtil.postRequest("https://try.daowepark.com/v7/user_api/general/editDevice/ids/"+id, map);
        String s1 = HttpRequestUtil.postRequest("https://port.daowepark.com/v7/user_api/general/editDevice/ids/"+id, map);
        System.out.println(s1);
        Gson gson = new Gson();
        // 解析请求结果，json：
@@ -208,7 +209,7 @@
        map.put("sign","0DB011836143EEE2C2E072967C9F4E4B");
        // 添加门禁
        String s1 = HttpRequestUtil.postRequest
                ("https://try.daowepark.com/v7/user_api/general/deleteDevice/ids/"+gateId, map);
                ("https://port.daowepark.com/v7/user_api/general/deleteDevice/ids/"+gateId, map);

        System.out.println(s1);
        Gson gson = new Gson();
@@ -232,20 +233,33 @@
        Gate byId = gateService.getById(id);
        model.addAttribute("id",id);
        model.addAttribute("data",byId);
        TStore byId2 = storeService.getById(byId.getStoreId());
        model.addAttribute("type",byId2.getType());
        Integer objectType = UserExt.getUser().getObjectType();
        model.addAttribute("userType",objectType);
        System.out.println(objectType);
        List<TOperator> list1 = tOperatorService.list();
        List<TOperator> list1 = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        model.addAttribute("yysList",list1);
        if (UserExt.getUser().getObjectType()==1) {
            List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", 0)
                    .ne("state", 3));
            model.addAttribute("storeList",list);
            List<TStore> tStores = new ArrayList<>();
            if (byId.getOperatorId()==0){
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", 0)
                        .eq("type", 1)
                        .ne("state", 3));
            }else{
                tStores = storeService.list(new QueryWrapper<TStore>()
                        .eq("operatorId", byId.getOperatorId())
                        .eq("type", 2)
                        .ne("state", 3));
            }
            model.addAttribute("storeList",tStores);
            List<TSite> siteList = siteService.list(new QueryWrapper<TSite>()
                    .eq("storeId", byId.getStoreId())
                    .ne("state",3));
            model.addAttribute("siteList",siteList);
            model.addAttribute("operatorId",byId.getOperatorId());
        }
        if (UserExt.getUser().getObjectType()==2){
            List<TStore> list2 = storeService.list(new QueryWrapper<TStore>()
@@ -281,7 +295,17 @@
        return PREFIX + "gate_edit.html";
    }

    /**
     * 获取运营商列表
     */
    @RequestMapping(value = "/getOperatorList")
    @ResponseBody
    public List<TOperator> getOperatorList() {
        List<TOperator> list = tOperatorService.list(new QueryWrapper<TOperator>()
                .eq("state", 1));
        return list;

    }
    /**
     * 获取闸机列表
     */
@@ -306,20 +330,45 @@
            storeIds.add(UserExt.getUser().getObjectId());
        }
        List<Map<String,Object>> res = gateService.listAll(name,device,operatorName,storeName,storeIds,page);
        for (Map<String, Object> re : res) {
            Integer integer = Integer.valueOf(re.get("type").toString());
            if (integer==1){
                re.put("operatorName","平台闸机");
            }else{
                TStore storeId = storeService.getById(Integer.valueOf(re.get("storeId").toString()));
                if (storeId!=null){
                    Integer operatorId = storeId.getOperatorId();
                    TOperator byId = tOperatorService.getById(operatorId);
                    if (byId!=null){
                        User byId1 = userService.getById(byId.getUserId());
                        if (byId1!=null){
                            re.put("operatorName",byId1.getName()+"-"+byId1.getPhone());
                        }
                    }
                }
            }
        }
        return res;
    }

    /**
     * 根据运营商id获取门店列表

     */
    @RequestMapping(value = "/getStore")
    @ResponseBody
    public List<TStore> getStore(Integer operatorId) {
        List<TStore> list = storeService.list(new QueryWrapper<TStore>()
                .eq("operatorId", operatorId)
                .ne("state", 3));
        return list;
        List<TStore> tStores = new ArrayList<>();
        if (operatorId==0){
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("type", 1)
                    .ne("state", 3));
        }else{
            tStores = storeService.list(new QueryWrapper<TStore>()
                    .eq("operatorId", operatorId)
                    .eq("type", 2)
                    .ne("state", 3));
        }

        return tStores;

    }
    /**