cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -1085,7 +1085,8 @@ @PostMapping("/student/queryUserAge1") public HashMap<String, Object> queryUserAge1() { HashMap<String, Object> map = new HashMap<>(); List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)); List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1) .isNotNull(TAppUser::getCity)); List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList()); if (collect.size() == 0) { collect.add(-1); cloud-server-activity/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@ #datasource.names=master0 #datasource.master0.type=com.alibaba.druid.pool.DruidDataSource #datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver #datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai #datasource.master0.username=root #datasource.master0.password=123456 #datasource.master0.maxActive=20 #datasource.master0.maxWait=60000 #datasource.master0.minIdle=5 #datasource.master0.initialSize=2 datasource.names=master0 datasource.master0.type=com.alibaba.druid.pool.DruidDataSource datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai datasource.master0.username=root datasource.master0.password=playpai2023! datasource.master0.password=123456 datasource.master0.maxActive=20 datasource.master0.maxWait=60000 datasource.master0.minIdle=5 @@ -24,4 +11,17 @@ #datasource.names=master0 #datasource.master0.type=com.alibaba.druid.pool.DruidDataSource #datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver #datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai #datasource.master0.username=root #datasource.master0.password=playpai2023! #datasource.master0.maxActive=20 #datasource.master0.maxWait=60000 #datasource.master0.minIdle=5 #datasource.master0.initialSize=2
@@ -217,7 +217,6 @@ <springProfile name="prod"> <root level="info"> <!-- 生产环境最好不配置console写文件 --> <appender-ref ref="DEBUG_FILE"/> <appender-ref ref="INFO_FILE"/> <appender-ref ref="WARN_FILE"/> <appender-ref ref="ERROR_FILE"/> cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
@@ -75,7 +75,7 @@ List<TAppUser> queryByNamePhone(QueryByNamePhone queryByNamePhone); @PostMapping("/base/appUser/queryById") TAppUser queryById(Integer appUserId); TAppUser queryById(@RequestBody Integer appUserId); @PostMapping("/student/webStudentList") List<TStudentDto> queryWebUser(@RequestBody StudentSearch search);
@@ -22,6 +22,7 @@ // 数据统计 @PostMapping("/student/getData") @ResponseBody List<TGameRecord> getData(@RequestBody GameDataQuery query); // 根据门店ids 获取游戏记录 @PostMapping("/game/getGameByStoreIds") cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/GateDataController.java
@@ -132,6 +132,7 @@ @ResponseBody public Object totalNum(Integer storeId) { try { if (storeId!=null){ String apiUrl = "https://port.daowepark.com/v7/user_api/general/spaceDoorData?space_id="+storeId; URL url = new URL(apiUrl); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); @@ -139,6 +140,7 @@ // 发送请求并获取响应 int responseCode = connection.getResponseCode(); if (responseCode == HttpURLConnection.HTTP_OK) { System.err.println("調用======"); BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); String line; StringBuilder response = new StringBuilder(); @@ -156,11 +158,22 @@ String message = res.getMessage(); // 场地总入场人数 int totalNum = res.getData().getTotal_num(); return totalNum; int temp = 0 ; List<GateDataResponse.Data.Region> regionNumList = res.getData().getRegion_num(); System.err.println("返回列表"+regionNumList); for (GateDataResponse.Data.Region regionNum : regionNumList) { String name = regionNum.getName(); int enterNum = regionNum.getEnter_num(); temp+=enterNum; System.out.println("Region: " + name + ", EnterNum: " + enterNum); } System.err.println("最終===="+temp); return temp; } else { System.out.println("请求失败: " + responseCode); } } } catch (IOException e) { e.printStackTrace(); } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopEvaluationController.java
@@ -82,7 +82,7 @@ model.addAttribute("list",list); String roleid = UserExt.getUser().getRoleid(); model.addAttribute("role",roleid); return PREFIX + "tShop_add.html"; return PREFIX + "TShop_add.html"; } @@ -110,11 +110,13 @@ User byId1 = userMapper.selectById(byId.getStoreStaffId()); model.addAttribute("city",byId1); model.addAttribute("type",1); return PREFIX + "tShop_edit.html"; return PREFIX + "TShop_edit.html"; } @RequestMapping("/tShop_info/{id}") public String tCityInfo(@PathVariable Integer id, Model model) { public String tCityInfo(@PathVariable("id") Integer id, Model model) { System.err.println("進入"); TEvaluationListVo vo = evaluationService.info(id); System.err.println("查詢vo"); model.addAttribute("item",vo); ArrayList<String> strings = new ArrayList<>(); String imgs = vo.getImgs(); @@ -124,14 +126,14 @@ model.addAttribute("imgs",strings); model.addAttribute("name1",vo.getPName()); model.addAttribute("name2",vo.getCName()); return PREFIX + "tShop_edit.html"; return PREFIX + "TShop_edit.html"; } @RequestMapping("/tShop_gift/{id}") public String tCityGift(@PathVariable Integer id, Model model) { TStore byId = storeService.getById(id); model.addAttribute("welfarePicture",byId.getWelfarePicture()); model.addAttribute("id",id); return PREFIX + "tShop_img.html"; return PREFIX + "TShop_img.html"; } @RequestMapping("/tShop_indexSet/{id}") public String tCityIndexSet(@PathVariable Integer id, Model model) { @@ -152,7 +154,7 @@ StoreConfig c8 = storeConfigService.getOne(new LambdaQueryWrapper<StoreConfig>().eq(StoreConfig::getStoreId, id).eq(StoreConfig::getType,8)); model.addAttribute("c8",c8); model.addAttribute("id",id); return PREFIX + "tShop_imgAll.html"; return PREFIX + "TShop_imgAll.html"; }
@@ -55,7 +55,9 @@ public TEvaluationListVo info(Integer id) { TEvaluationListVo info = this.baseMapper.info(id); Integer appUserId = info.getAppUserId(); System.err.println("查詢用戶"); TAppUser tAppUser = appUserClient.queryById(appUserId); System.err.println("========="+tAppUser); info.setName(tAppUser.getName()); info.setPhone(tAppUser.getPhone()); return info;
