diff --git a/db/jeecgboot-mysql-5.7.sql b/db/jeecgboot-mysql-5.7.sql index e7c4470..df8f062 100644 --- a/db/jeecgboot-mysql-5.7.sql +++ b/db/jeecgboot-mysql-5.7.sql @@ -1,5 +1,5 @@ -CREATE database if NOT EXISTS `jeecg-boot2` default character set utf8mb4 collate utf8mb4_unicode_ci; -USE `jeecg-boot2`; +CREATE database if NOT EXISTS `jeecg-boot-football` default character set utf8mb4 collate utf8mb4_unicode_ci; +USE `jeecg-boot-football`; /* Navicat Premium Data Transfer diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 1db10d6..a28bff3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -176,7 +176,7 @@ public class SysUserController { return result; } - @RequiresPermissions("system:user:edit") +// @RequiresPermissions("system:user:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody JSONObject jsonObject) { Result result = new Result(); diff --git a/jeecg-module-system/jeecg-system-start/pom.xml b/jeecg-module-system/jeecg-system-start/pom.xml index 3499e86..b6a9ba0 100644 --- a/jeecg-module-system/jeecg-system-start/pom.xml +++ b/jeecg-module-system/jeecg-system-start/pom.xml @@ -48,6 +48,11 @@ org.flywaydb flyway-core + + com.baomidou + mybatis-plus-boot-starter + 3.5.3.1 + diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java index 633249d..e7e9a4a 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -2,6 +2,7 @@ package org.jeecg; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.util.oConvertUtils; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -18,7 +19,6 @@ import java.net.UnknownHostException; */ @Slf4j @SpringBootApplication -//@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class}) public class JeecgSystemApplication extends SpringBootServletInitializer { @Override diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/Reptiles.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/Reptiles.java new file mode 100644 index 0000000..506612b --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/Reptiles.java @@ -0,0 +1,35 @@ +package org.jeecg; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.ProtocolException; +import java.net.URL; + +public class Reptiles { + public static void main(String[] args) throws IOException { + //获取指定url的源码 + URL url=new URL("https://dongqiudi.com/player/50000467.html"); + HttpURLConnection connection=(HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + connection.setConnectTimeout(5000); + connection.setReadTimeout(5000); + //获取数据 + int responseCode=connection.getResponseCode(); + System.out.println(responseCode); + //获取数据 + if(responseCode==200){ + //流读取数据 + BufferedReader reader=new BufferedReader(new InputStreamReader(connection.getInputStream())); + String line; + while((line=reader.readLine())!=null){ + System.out.println(line); + } + reader.close(); + } + + + } +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/FBController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/FBController.java new file mode 100644 index 0000000..2da3629 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/FBController.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.controller; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.modules.service.impl.FBService; +import org.jeecg.common.api.vo.Result; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/football") +public class FBController { + @Resource + private FBService centerService; + @GetMapping(value = "/getMatch") + public Result getMatch() throws InterruptedException { + //休眠时间 + Thread.sleep(2000); + return centerService.getMatch(); + } + @GetMapping(value = "/getPlayer") + public Result getPlayer() throws InterruptedException { + //休眠时间 + Thread.sleep(2000); + return centerService.getPlayer(); + } +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_match.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_match.java new file mode 100644 index 0000000..77f219c --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_match.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.entity; + +import lombok.Data; + +@Data +public class Fb_match { + private String nature; + private String date; + private String address; + private String result; + private String coach; + +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_player.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_player.java new file mode 100644 index 0000000..3dcd934 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/entity/Fb_player.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.entity; + +import lombok.Data; + +@Data +public class Fb_player { + private String name; + private String position; + private int age; + private String height; + private String weight; + private int speed; + private int shoot; + private int pass; + private int dribble; + private int defend; + private int power; + private int sum; +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/main.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/main.java new file mode 100644 index 0000000..a3ddc73 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/main.java @@ -0,0 +1,2 @@ +package org.jeecg.modules;public class main { +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/MatchMapper.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/MatchMapper.java new file mode 100644 index 0000000..4d26111 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/MatchMapper.java @@ -0,0 +1,9 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.Fb_match; +import org.mapstruct.Mapper; + +@Mapper +public interface MatchMapper extends BaseMapper { +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/PlayerMapper.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/PlayerMapper.java new file mode 100644 index 0000000..ec5a434 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/PlayerMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.Fb_player; + +public interface PlayerMapper extends BaseMapper { +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/MatchMapper.xml b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/MatchMapper.xml new file mode 100644 index 0000000..4ab5ce8 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/mapper/xml/MatchMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/IFBService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/IFBService.java new file mode 100644 index 0000000..cb3d664 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/IFBService.java @@ -0,0 +1,10 @@ +package org.jeecg.modules.service; + +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; + +public interface IFBService { + Result getMatch(); + + Result getPlayer(); +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/FBService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/FBService.java new file mode 100644 index 0000000..54d4bb0 --- /dev/null +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/FBService.java @@ -0,0 +1,72 @@ +package org.jeecg.modules.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.entity.Fb_match; +import org.jeecg.modules.entity.Fb_player; +import org.jeecg.modules.mapper.MatchMapper; +import org.jeecg.modules.mapper.PlayerMapper; +import org.jeecg.modules.service.IFBService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class FBService implements IFBService { + @Resource + private MatchMapper matchMapper; + @Resource + private PlayerMapper playerMapper; + @Override + public Result getMatch() { + List list = matchMapper.selectList(null); + JSONArray jsonArray = new JSONArray(); + for(Fb_match i : list){ + JSONObject fb = new JSONObject(); + fb.put("nature",i.getNature()); + fb.put("date",i.getDate()); + fb.put("address",i.getAddress()); + fb.put("result",i.getResult()); + fb.put("coach",i.getCoach()); + jsonArray.add(fb); + } + JSONObject result = new JSONObject(); + result.put("data",jsonArray); + return Result.ok(result); + } + + @Override + public Result getPlayer() { + List list = playerMapper.selectList(null); + JSONArray tableArray = new JSONArray(); +// JSONArray chartArray = new JSONArray(); + for(Fb_player i : list){ + JSONObject Fbtable = new JSONObject(); + List Fbchart = new ArrayList<>(); + Fbtable.put("name",i.getName()); + Fbtable.put("position",i.getPosition()); + Fbtable.put("age",i.getAge()); + Fbtable.put("height",i.getHeight()); + Fbtable.put("weight",i.getWeight()); + Fbtable.put("sum",i.getSum()); + + Fbchart.add(i.getSpeed()); + Fbchart.add(i.getShoot()); + Fbchart.add(i.getPass()); + Fbchart.add(i.getDribble()); + Fbchart.add(i.getDefend()); + Fbchart.add(i.getPower()); + + Fbtable.put("chart",Fbchart); + System.out.println(Fbtable); + tableArray.add(Fbtable); + } + JSONObject result = new JSONObject(); + result.put("data",tableArray); +// result.put("chart",chartArray); + return Result.ok(result); + } +} diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml index 4f7980d..fc5f760 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml @@ -158,7 +158,7 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://127.0.0.1:3306/jeecg-boot2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://127.0.0.1:3306/jeecg-boot-football?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver @@ -174,6 +174,7 @@ spring: host: 82.157.76.162 port: 6379 password: aB3cDeF9 + #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml