diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java b/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java deleted file mode 100644 index bdd1212..0000000 --- a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainService.java +++ /dev/null @@ -1,64 +0,0 @@ -package vboot.app.module.sa.cust.main; - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import vboot.app.module.sa.agent.main.SaAgentMain; -import vboot.app.module.sa.agent.main.SaAgentMainRepo; -import vboot.core.xutil.lang.XstrUtil; - -import javax.annotation.Resource; - - -@Service -@Transactional(rollbackFor = Exception.class) -public class SaCustMainService { - - public SaCustMain findOne(String id) { - - return custMapper.selectById(id); - } - - public String insert(SaCustMain cust) { - cust.setId(XstrUtil.getUUID()); - custMapper.insert(cust); - return cust.getId(); - } - - public String update(SaCustMain cust) { - custMapper.updateById(cust); - return cust.getId(); - } - - public int delete(String[] ids) { - for (String id : ids) { - custMapper.deleteById(id); - } - return ids.length; - } - - public void test() { - //先通过JPA新增一个代理商 - SaAgentMain agentMain=new SaAgentMain(); - agentMain.setId(XstrUtil.getUUID()); - agentMain.setName("有事务的项目"); - agentRepo.save(agentMain); - - //再通过mybatis-plus新增一个项目，并让它报错 - SaCustMain sdCustMain=new SaCustMain(); - sdCustMain.setId(XstrUtil.getUUID()+"XXXXXXXXXXXXXXXX");//超出长度保存出错 - sdCustMain.setNotes("有事务的客户"); - custMapper.insert(sdCustMain); - } - - @Resource - private SaAgentMainRepo agentRepo; - - @Resource - private SaCustMainMapper custMapper; - - - - - -} - diff --git a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java deleted file mode 100644 index bcca3b0..0000000 --- a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMain.java +++ /dev/null @@ -1,26 +0,0 @@ -package vboot.app.module.sa.draw.main; - -import vboot.core.common.entity.BaseMainEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Column; -import javax.persistence.Entity; - -@Entity -@Getter -@Setter -public class SaDrawMain extends BaseMainEntity { - - @Column(length = 32) - private String catid;//所属分类 - - private Integer ornum; - - @ApiModelProperty("备注") - private String notes; - - - -} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java deleted file mode 100644 index bbab69c..0000000 --- a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.sa.draw.main; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SaDrawMainRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java b/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java deleted file mode 100644 index 2a94c9f..0000000 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.sa.prod.tem; - -import org.springframework.data.jpa.repository.JpaRepository; - - -public interface SaProdTemRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java b/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java deleted file mode 100644 index b9cc6d6..0000000 --- a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMain.java +++ /dev/null @@ -1,27 +0,0 @@ -package vboot.app.module.sa.proj.main; - -import vboot.app.module.sa.prod.group.SaProdGroup; -import vboot.core.common.entity.BaseMainEntity; -import lombok.Getter; -import lombok.Setter; - -import javax.persistence.Entity; -import javax.persistence.Transient; -import java.util.ArrayList; -import java.util.List; - -@Entity -@Getter -@Setter -public class SaProjMain extends BaseMainEntity { - - //备注 - private String notes; - - //项目地址 - private String addre; - - @Transient - private List groups = new ArrayList<>(); //产品组 - -} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java b/vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java deleted file mode 100644 index 186452c..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/cont/WcCont.java +++ /dev/null @@ -1,22 +0,0 @@ -package vboot.app.module.wc.cont; - -import lombok.Data; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; - -@Data -@Entity -public class WcCont { - - @Id - @Column(length = 32) - private String id; - - @Column(length = 64) - private String name; - - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java deleted file mode 100644 index cd923b5..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/match/main/Dataxx.java +++ /dev/null @@ -1,44 +0,0 @@ -package vboot.app.module.wc.match.main; - -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; -import vboot.core.xutil.lang.XnumberUtil; - -import java.io.IOException; -import java.math.BigDecimal; - -public class Dataxx { - - public static final String MY_URL2 = "http://match.sports.sina.com.cn/football/player.php?id=14937"; - public static final String MY_URL = "http://info.sports.sina.com.cn/api/live/opta_lineup.php?format=json&_t=0.7390982927490362&id=o_958029&callback=fun_786506334825271269"; - - public static void getRealAddressByIP() { - String my_url="http://info.sports.sina.com.cn/api/live/opta_lineup.php?format=json&_t=0.7390982927490362&id=o_"+"958029"+"&callback=fun_786506334825271269"; - String str = HttpUtil.createGet(my_url).execute().body(); - String xx = str.split("fun_786506334825271269")[1]; - xx = xx.substring(1, xx.length() - 13); - JSONObject json = JSONObject.parseObject(xx); - -// JsonObject returnData = new JsonParser().parse(xx).getAsJsonObject(); - JSONObject json2 = (JSONObject) json.get("result"); - JSONObject json3 = (JSONObject) json2.get("data"); - System.out.println(json3); -// JSONArray array = (JSONArray) json3.get("event"); - } - - - - public static void main(String[] args) throws IOException { -// getRealAddressByIP(); -// get2(); - System.out.println(XnumberUtil.getRandomBigDecimal(new BigDecimal(10),new BigDecimal(50))); - System.out.println(XnumberUtil.getRandomBigDecimal(new BigDecimal(30),new BigDecimal(100))); - System.out.println(XnumberUtil.getRandomBigDecimal(new BigDecimal(30),new BigDecimal(100))); - System.out.println(XnumberUtil.getRandomBigDecimal(new BigDecimal(30),new BigDecimal(100))); -// System.out.println((int)(Math.random()*50) + 50); -// System.out.println((int)(Math.random()*50) + 50); - - } - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java deleted file mode 100644 index 8fb1d68..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatch.java +++ /dev/null @@ -1,39 +0,0 @@ -package vboot.app.module.wc.match.main; - -import lombok.Data; - -import javax.persistence.*; - -@Data -@Entity -public class WcMatch { - - @Id - @Column(length = 32) - private String id; - - @Column(length = 128) - private String name;//round_cn - - @Column(length = 32) - private String homeId; - - private Integer homeScore; - - @Column(length = 32) - private String awayId; - - private Integer awayScore; - - - - - -// @ManyToMany -// @JoinTable(name = "wc_match_link_team", joinColumns = {@JoinColumn(name = "match_id")}, -// inverseJoinColumns = {@JoinColumn(name = "team_id")}) -// private List teams; - - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java deleted file mode 100644 index 077100d..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/match/main/WcMatchRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.wc.match.main; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WcMatchRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java deleted file mode 100644 index 8394e90..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayer.java +++ /dev/null @@ -1,47 +0,0 @@ -package vboot.app.module.wc.palyer.main; - -import lombok.Data; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import java.math.BigDecimal; -import java.util.Date; - -@Data -@Entity -public class WcPlayer { - - @Id - @Column(length = 32) - private String id;//主键 - - @Column(length = 64) - private String name;//中文名称 - - @Column(length = 64) - private String enName;//英文名称 - - private String enFullName;//英文全称 - - private Date birthday;//出生日期 - - private Integer height;//身高（cm） - - private Integer weight;//体重（kg） - - private String position;//场上位置 - - private String shirtNumber;//球衣号 - - private String teamId;//球队ID - - private String club;//俱乐部 - - private BigDecimal weekly;//周薪 可以改成 salary - - private BigDecimal adrate;//每年广告费 - - private String idolId;//偶像的ID - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java deleted file mode 100644 index be4d9ec..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.wc.palyer.main; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WcPlayerRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java b/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java deleted file mode 100644 index a9470aa..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/palyer/main/WcPlayerService.java +++ /dev/null @@ -1,203 +0,0 @@ -package vboot.app.module.wc.palyer.main; - -import cn.hutool.http.HttpUtil; -import vboot.app.module.wc.match.main.WcMatch; -import vboot.app.module.wc.match.main.WcMatchRepo; -import vboot.app.module.wc.stat.WcStat; -import vboot.app.module.wc.stat.WcStatRepo; -import vboot.app.module.wc.team.main.WcTeam; -import vboot.app.module.wc.team.main.WcTeamRepo; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import vboot.core.xutil.lang.XdateUtil; -import vboot.core.xutil.lang.XnumberUtil; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.select.Elements; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.io.IOException; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - - -@Service -@Transactional(rollbackFor = Exception.class) -public class WcPlayerService { - - public void crawlData(String id){ - String my_url="http://info.sports.sina.com.cn/api/live/opta_lineup.php?format=json&_t=0.7390982927490362&id=o_"+id+"&callback=fun_786506334825271269"; - String str = HttpUtil.createGet(my_url).execute().body(); - String xx = str.split("fun_786506334825271269")[1]; - xx = xx.substring(1, xx.length() - 13); - JSONObject json = JSONObject.parseObject(xx); - -// JsonObject returnData = new JsonParser().parse(xx).getAsJsonObject(); - JSONObject json2 = (JSONObject) json.get("result"); - JSONObject json3 = (JSONObject) json2.get("data"); - JSONObject matchJson = (JSONObject) json3.get("match"); - //第一步 保存球队 - WcTeam team1 = new WcTeam(); - team1.setId(""+matchJson.get("home_id")); - team1.setName(""+matchJson.get("home_name_cn")); - team1.setCoach(""+matchJson.get("home_trainer_cn")); - teamRepo.save(team1); - - WcTeam team2 = new WcTeam(); - team2.setId(""+matchJson.get("away_id")); - team2.setName(""+matchJson.get("away_name_cn")); - team2.setCoach(""+matchJson.get("away_trainer_cn")); - teamRepo.save(team2); - - //第二步 保存比赛 - WcMatch match = new WcMatch(); - match.setId(""+matchJson.get("id")); - match.setHomeId(team1.getId()); - match.setHomeScore(Integer.parseInt(matchJson.get("home_score")+"")); - match.setAwayId(team2.getId()); - match.setAwayScore(Integer.parseInt(matchJson.get("away_score")+"")); - match.setName(""+matchJson.get("round_cn")+":"+team1.getName()+"VS"+team2.getName()); - matchRepo.save(match); - - - //第三步 保存球员 - JSONArray array = (JSONArray) json3.get("event"); - List playerList = new ArrayList<>(); - for (Object obj : array) { - WcPlayer player = new WcPlayer(); - JSONObject playerJson = (JSONObject) obj; - System.out.println(playerJson); - System.out.println(playerJson.get("id")); - Optional id1 = playerStatRepo.findById("" + playerJson.get("id")); - if(id1.isPresent()){ - continue; - } - System.out.println(playerJson.get("l_name_cn")); - player.setId("" + playerJson.get("id")); - player.setName("" + playerJson.get("l_name_cn")); - player.setShirtNumber("" + playerJson.get("shirt_number")); - player.setPosition("" + playerJson.get("position_long_cn")); - String url = "http://match.sports.sina.com.cn/football/player.php?id=" + player.getId(); - Document doc = null; - try { - doc = Jsoup.connect(url).get(); - } catch (IOException e) { - e.printStackTrace(); - } - Elements elements = doc.select(".txt .t dd"); - player.setEnName(elements.get(1).html()); - player.setEnFullName(elements.get(2).html()); - player.setBirthday(XdateUtil.strToDate(elements.get(3).html())); - player.setHeight(Integer.parseInt(elements.get(4).html().replaceAll("[^0-9.]", ""))); - player.setWeight(Integer.parseInt(elements.get(5).html().replaceAll("[^0-9.]", ""))); - player.setWeekly(XnumberUtil.getRandomBigDecimal(new BigDecimal(10),new BigDecimal(50))); - if("替补".equals(player.getPosition())){ - player.setPosition(elements.get(7).html()); - } - if("0".equals(""+playerJson.get("lr_position"))){ - player.setTeamId(team1.getId()); - }else{ - player.setTeamId(team2.getId()); - } -// player.setCountry(elements.get(8).html()); - player.setClub(elements.get(9).html()); - playerList.add(player); - } - repo.saveAll(playerList); - - //保存该比赛的球员技术统计 - playerStat(id); - } - - private void playerStat(String id){ - String url = "http://info.sports.sina.com.cn/api/live/opta_player_stats.php?format=json&_t=0.46432963703738617&id=o_"+id+"&callback=fun_718625181803029488"; - - String str = HttpUtil.createGet(url).execute().body(); - String xx = str.split("fun_718625181803029488")[1]; - xx = xx.substring(1, xx.length() - 13); - JSONObject json = JSONObject.parseObject(xx); - JSONObject json2 = (JSONObject) json.get("result"); - JSONObject json3 = (JSONObject) json2.get("data"); - JSONObject json4 = (JSONObject) json3.get("stats"); - JSONArray homeArray = (JSONArray) json4.get("home"); - JSONArray awayArray = (JSONArray) json4.get("away"); - List stats = new ArrayList<>(); - - for (Object obj : homeArray) { - WcStat stat = new WcStat(); - JSONObject statJson = (JSONObject) obj; - System.out.println(statJson); - stat.setId("" + statJson.get("id")); - stat.setMatchId(id); - stat.setPalyerId("" + statJson.get("player_id")); - stat.setTotalScoringAtt(Integer.parseInt("" + statJson.get("total_scoring_att"))); - stat.setOntargetScoringAtt(Integer.parseInt("" + statJson.get("ontarget_scoring_att"))); - stat.setGoals(Integer.parseInt("" + statJson.get("goals"))); - stat.setGoalAssist(Integer.parseInt("" + statJson.get("goal_assist"))); - stat.setMinsPlayed(Integer.parseInt("" + statJson.get("mins_played"))); - stat.setFouls(Integer.parseInt("" + statJson.get("fouls"))); - stat.setWasFouled(Integer.parseInt("" + statJson.get("was_fouled"))); - stat.setTotalPass(Integer.parseInt("" + statJson.get("total_pass"))); - stat.setAccuratePass(Integer.parseInt("" + statJson.get("accurate_pass"))); - stat.setSaves(Integer.parseInt("" + statJson.get("saves"))); - if("z".equals("" + statJson.get("status")) ){ - stat.setStatus(true); - }else{ - stat.setStatus(false); - } - stat.setIsHome(true); - stats.add(stat); - } - - for (Object obj : awayArray) { - WcStat stat = new WcStat(); - JSONObject statJson = (JSONObject) obj; - System.out.println(statJson); - stat.setId("" + statJson.get("id")); - stat.setMatchId(id); - stat.setPalyerId("" + statJson.get("player_id")); - stat.setTotalScoringAtt(Integer.parseInt("" + statJson.get("total_scoring_att"))); - stat.setOntargetScoringAtt(Integer.parseInt("" + statJson.get("ontarget_scoring_att"))); - stat.setGoals(Integer.parseInt("" + statJson.get("goals"))); - stat.setGoalAssist(Integer.parseInt("" + statJson.get("goal_assist"))); - stat.setMinsPlayed(Integer.parseInt("" + statJson.get("mins_played"))); - stat.setFouls(Integer.parseInt("" + statJson.get("fouls"))); - stat.setWasFouled(Integer.parseInt("" + statJson.get("was_fouled"))); - stat.setTotalPass(Integer.parseInt("" + statJson.get("total_pass"))); - stat.setAccuratePass(Integer.parseInt("" + statJson.get("accurate_pass"))); - stat.setSaves(Integer.parseInt("" + statJson.get("saves"))); - if("z".equals("" + statJson.get("status")) ){ - stat.setStatus(true); - }else{ - stat.setStatus(false); - } - stat.setIsHome(false); - stats.add(stat); - } - playerStatRepo.saveAll(stats); - } - - public void test(){ - Optional id1 = repo.findById("109888"); - System.out.println(id1); - System.out.println(id1.isPresent()); - } - - @Autowired - private WcStatRepo playerStatRepo; - - @Autowired - private WcTeamRepo teamRepo; - - @Autowired - private WcMatchRepo matchRepo; - - @Autowired - private WcPlayerRepo repo; - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java deleted file mode 100644 index 1752e16..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStat.java +++ /dev/null @@ -1,47 +0,0 @@ -package vboot.app.module.wc.stat; - -import lombok.Data; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; - -@Data -@Entity -public class WcStat { - - @Id - @Column(length = 32) - private String id; - - @Column(length = 32) - private String palyerId;//球员ID - - @Column(length = 32) - private String matchId;//比赛ID - - private Integer totalScoringAtt;//射门次数 - - private Integer ontargetScoringAtt;//射正次数 - - private Integer goals;//进球数 - - private Integer goalAssist;//助攻 - - private Integer minsPlayed;//出场时间 - - private Integer fouls;//犯规 - - private Integer wasFouled;//被犯规 - - private Integer totalPass;//总传球数 - - private Integer accuratePass;//成功传球数 - - private Integer saves;//扑救数 - - private Boolean status;//是否首发 - - private Boolean isHome;//是否为主队 - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java deleted file mode 100644 index ae75181..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/stat/WcStatRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.wc.stat; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WcStatRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java deleted file mode 100644 index a909a0c..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeam.java +++ /dev/null @@ -1,28 +0,0 @@ -package vboot.app.module.wc.team.main; - -import lombok.Data; - -import javax.persistence.*; - -@Data -@Entity -public class WcTeam { - - @Id - @Column(length = 32) - private String id; - - @Column(length = 32) - private String name; - -// @Column(length = 64) -// private String enName; - - @Column(length = 32) - private String coach;//主教练 - - @Column(length = 32) - private String contId;//大洲的ID - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java deleted file mode 100644 index 7295e61..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamRepo.java +++ /dev/null @@ -1,9 +0,0 @@ -package vboot.app.module.wc.team.main; - - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface WcTeamRepo extends JpaRepository { - - -} diff --git a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java b/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java deleted file mode 100644 index 0c18f84..0000000 --- a/vboot-application/src/main/java/vboot/app/module/wc/team/main/WcTeamService.java +++ /dev/null @@ -1,19 +0,0 @@ -package vboot.app.module.wc.team.main; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - - - -@Service -@Transactional(rollbackFor = Exception.class) -public class WcTeamService { - - - - @Autowired - private WcTeamRepo repo; - - -} diff --git a/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java b/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java index 4792de6..d2eacbc 100644 --- a/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java +++ b/vboot-core/src/main/java/vboot/core/common/init/SysPortalInit.java @@ -457,7 +457,7 @@ public class SysPortalInit { SysPortalMenu menu223 = new SysPortalMenu(); menu223.setId("MonLogError"); - menu223.setName("操作日志"); + menu223.setName("错误日志"); menu223.setCode("MonLogError"); menu223.setPath("/mon/log/error"); menu223.setComp("/mon/log/error/index"); diff --git a/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java b/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java index 339df7f..071fc24 100644 --- a/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java +++ b/vboot-core/src/main/java/vboot/core/common/service/BaseMainService.java @@ -53,7 +53,7 @@ public abstract class BaseMainService { } //---------------------------------------增删改------------------------------------- - public T insert(T main) { + public String insert(T main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } @@ -61,7 +61,8 @@ public abstract class BaseMainService { if (main.getCrman() == null) { main.setCrman(XuserUtil.getUser()); } - return repo.save(main); + repo.save(main); + return main.getId(); } public int delete(String[] ids) { @@ -71,12 +72,13 @@ public abstract class BaseMainService { return ids.length; } - public T update(T main) { + public String update(T main) { main.setUptim(new Date()); if (main.getUpman() == null) { main.setUpman(XuserUtil.getUser()); } - return repo.save(main); + repo.save(main); + return main.getId(); } public T save(T t) { diff --git a/vboot-core/src/main/java/vboot/core/common/service/BaseService.java b/vboot-core/src/main/java/vboot/core/common/service/BaseService.java index ca9cced..5ba44cf 100644 --- a/vboot-core/src/main/java/vboot/core/common/service/BaseService.java +++ b/vboot-core/src/main/java/vboot/core/common/service/BaseService.java @@ -48,11 +48,12 @@ public abstract class BaseService { //---------------------------------------增删改------------------------------------- - public T insert(T main) { + public String insert(T main) { if (main.getId() == null||"".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } - return repo.save(main); + repo.save(main); + return main.getId(); } public int delete(String[] ids) { @@ -62,8 +63,9 @@ public abstract class BaseService { return ids.length; } - public T update(T main) { - return repo.save(main); + public String update(T main) { + repo.save(main); + return main.getId(); } public T save(T t) { diff --git a/vboot-core/src/main/java/vboot/core/module/ass/addr/main/AssAddrMainApi.java b/vboot-core/src/main/java/vboot/core/module/ass/addr/main/AssAddrMainApi.java index aa8dc2b..e7d58db 100644 --- a/vboot-core/src/main/java/vboot/core/module/ass/addr/main/AssAddrMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/addr/main/AssAddrMainApi.java @@ -46,12 +46,12 @@ public class AssAddrMainApi { @PostMapping public R post(@RequestBody AssAddrMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody AssAddrMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/ass/coge/form/AssCogeFormApi.java b/vboot-core/src/main/java/vboot/core/module/ass/coge/form/AssCogeFormApi.java index b41afdf..13d82c0 100644 --- a/vboot-core/src/main/java/vboot/core/module/ass/coge/form/AssCogeFormApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/coge/form/AssCogeFormApi.java @@ -25,12 +25,12 @@ public class AssCogeFormApi { @PostMapping public R post(@RequestBody AssCogeForm main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody AssCogeForm main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/ass/coge/table/AssCogeTableApi.java b/vboot-core/src/main/java/vboot/core/module/ass/coge/table/AssCogeTableApi.java index 381a8d0..b666338 100644 --- a/vboot-core/src/main/java/vboot/core/module/ass/coge/table/AssCogeTableApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/coge/table/AssCogeTableApi.java @@ -54,12 +54,12 @@ public class AssCogeTableApi { @PostMapping public R post(@RequestBody AssCogeTable main) throws DocumentException { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody AssCogeTable main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java index 93cff16..ab99c7a 100644 --- a/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/data/AssDictDataApi.java @@ -42,12 +42,12 @@ public class AssDictDataApi { @PostMapping public R post(@RequestBody AssDictData main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody AssDictData main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java index f0f0185..4f1e7de 100644 --- a/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/ass/dict/main/AssDictMainApi.java @@ -38,12 +38,12 @@ public class AssDictMainApi { @PostMapping public R post(@RequestBody AssDictMain main) throws DocumentException { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody AssDictMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java index 219ef48..30b4334 100644 --- a/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/bpm/proc/main/BpmProcMainApi.java @@ -191,12 +191,12 @@ public class BpmProcMainApi { @PostMapping public R post(@RequestBody BpmProcMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BpmProcMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogError.java b/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogError.java index 8723632..5978576 100644 --- a/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogError.java +++ b/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogError.java @@ -31,6 +31,7 @@ public class MonLogError implements Serializable { private String method; /** 参数 */ + @Lob private String params; /** 日志类型 */ diff --git a/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogErrorApi.java b/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogErrorApi.java index 4b6b859..fdf8e01 100644 --- a/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogErrorApi.java +++ b/vboot-core/src/main/java/vboot/core/module/mon/log/error/MonLogErrorApi.java @@ -16,6 +16,7 @@ public class MonLogErrorApi { @GetMapping public R get() { Sqler sqler = new Sqler("t.*", "mon_log_error"); + sqler.addOrder("t.crtim desc"); sqler.addLeftJoin("u.name as usena,u.usnam","sys_org_user u","u.id=t.useid"); return R.ok(jdbcDao.findPageData(sqler)); } diff --git a/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOper.java b/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOper.java index 01c34dd..81f29b8 100644 --- a/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOper.java +++ b/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOper.java @@ -30,6 +30,7 @@ public class MonLogOper implements Serializable { private String method; /** 参数 */ + @Lob private String params; /** 日志类型 */ diff --git a/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOperApi.java b/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOperApi.java index 681c7bc..6dc0293 100644 --- a/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOperApi.java +++ b/vboot-core/src/main/java/vboot/core/module/mon/log/oper/MonLogOperApi.java @@ -15,6 +15,7 @@ public class MonLogOperApi { @GetMapping public R get() { Sqler sqler = new Sqler("t.*", "mon_log_oper"); + sqler.addOrder("t.crtim desc"); sqler.addLeftJoin("u.name as usena,u.usnam","sys_org_user u","u.id=t.useid"); return R.ok(jdbcDao.findPageData(sqler)); } diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java index b122012..f8b65aa 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupApi.java @@ -25,12 +25,12 @@ public class SysOrgGroupApi { @PostMapping public R post(@RequestBody SysOrgGroup main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysOrgGroup main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java index a1f5e82..a9aa22b 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/group/SysOrgGroupService.java @@ -27,21 +27,23 @@ public class SysOrgGroupService { return jdbcDao.findPageData(sqler); } - public SysOrgGroup insert(SysOrgGroup main) { + public String insert(SysOrgGroup main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); orgRepo.save(sysOrg); - return groupRepo.save(main); + groupRepo.save(main); + return main.getId(); } - public SysOrgGroup update(SysOrgGroup main) { + public String update(SysOrgGroup main) { main.setUptim(new Date()); SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); orgRepo.save(sysOrg); - return groupRepo.save(main); + groupRepo.save(main); + return main.getId(); } public int delete(String[] ids) { diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java index 396f0ad..4dd689c 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostApi.java @@ -29,12 +29,12 @@ public class SysOrgPostApi { @PostMapping public R post(@RequestBody SysOrgPost main) throws InterruptedException { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysOrgPost main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java index 9d2cd5b..c37b986 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/post/SysOrgPostService.java @@ -22,7 +22,7 @@ public class SysOrgPostService { } - public SysOrgPost insert(SysOrgPost main) { + public String insert(SysOrgPost main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } @@ -34,10 +34,11 @@ public class SysOrgPostService { } SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); orgRepo.save(sysOrg); - return postRepo.save(main); + postRepo.save(main); + return main.getId(); } - public SysOrgPost update(SysOrgPost main) { + public String update(SysOrgPost main) { main.setUptim(new Date()); SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); if (main.getDept() == null || StrUtil.isBlank(main.getDept().getId())) { @@ -48,7 +49,7 @@ public class SysOrgPostService { } SysOrgPost backPost = postRepo.save(main); orgRepo.save(sysOrg); - return backPost; + return backPost.getId(); } public int delete(String[] ids) { diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java index 2f6cc86..be1f48f 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserApi.java @@ -37,12 +37,12 @@ public class SysOrgUserApi { @PostMapping public R post(@RequestBody SysOrgUser main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysOrgUser main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java index 6161f0e..056cbdf 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/org/user/SysOrgUserService.java @@ -47,7 +47,7 @@ public class SysOrgUserService { } - public SysOrgUser insert(SysOrgUser main) { + public String insert(SysOrgUser main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } @@ -60,11 +60,12 @@ public class SysOrgUserService { main.setPacod(DigestUtils.md5DigestAsHex(("abc" + main.getPacod() + "xyz").getBytes())); SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); orgRepo.save(sysOrg); - return userRepo.save(main); + userRepo.save(main); + return main.getId(); } - public SysOrgUser update(SysOrgUser main) { + public String update(SysOrgUser main) { main.setUptim(new Date()); SysOrg sysOrg = new SysOrg(main.getId(), main.getName()); if (main.getDept() == null || StrUtil.isBlank(main.getDept().getId())) { @@ -73,9 +74,9 @@ public class SysOrgUserService { String tier = jdbcDao.findOneString("select tier from sys_org_dept where id=?", main.getDept().getId()); main.setTier(tier + main.getId() + "x"); } - SysOrgUser backUser = userRepo.save(main); + userRepo.save(main); orgRepo.save(sysOrg); - return backUser; + return main.getId(); } public int delete(String[] ids) { diff --git a/vboot-core/src/main/java/vboot/core/module/sys/portal/main/SysPortalMainApi.java b/vboot-core/src/main/java/vboot/core/module/sys/portal/main/SysPortalMainApi.java index 712441b..9680e3e 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/portal/main/SysPortalMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/portal/main/SysPortalMainApi.java @@ -31,12 +31,12 @@ public class SysPortalMainApi { @PostMapping public R post(@RequestBody SysPortalMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysPortalMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuApi.java b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuApi.java index 9a61731..847064c 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuApi.java @@ -46,13 +46,13 @@ public class SysPortalMenuApi { @PostMapping public R post(@RequestBody SysPortalMenu main) { System.out.println("插入"); - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysPortalMenu main) { System.out.println("修改"); - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java index 8fdc667..4069791 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/portal/menu/SysPortalMenuService.java @@ -22,11 +22,12 @@ public class SysPortalMenuService { return repo.findById(id).get(); } - public SysPortalMenu insert(SysPortalMenu main) { + public String insert(SysPortalMenu main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } - return repo.save(main); + repo.save(main); + return main.getId(); } diff --git a/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java index b8bf48a..0913b7b 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainApi.java @@ -31,12 +31,12 @@ public class SysTodoMainApi { @PostMapping public R post(@RequestBody SysTodoMain main) throws DocumentException { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody SysTodoMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java index 4f73562..2b6acce 100644 --- a/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java +++ b/vboot-core/src/main/java/vboot/core/module/sys/todo/main/SysTodoMainService.java @@ -20,11 +20,11 @@ import java.util.Map; @Transactional(rollbackFor = Exception.class) public class SysTodoMainService { - public void sendTodo(Zbpm zbpm, Znode znode) { + public void sendTodo(Zbpm zbpm, Znode znode) { SysTodoMain todo = new SysTodoMain(); todo.setId(XstrUtil.getUUID()); todo.setName(zbpm.getProna()); - todo.setLink("/#/page/ofmv?id="+zbpm.getProid()); + todo.setLink("/#/page/ofmv?id=" + zbpm.getProid()); todo.setModid(zbpm.getProid()); @@ -36,33 +36,34 @@ public class SysTodoMainService { targetRepo.save(todoTarget); } - public void doneTodo(Zbpm zbpm) { - String sql="select m.id,t.id as tid from sys_todo_main m inner join sys_todo_user t on t.tid=m.id " + + public void doneTodo(Zbpm zbpm) { + String sql = "select m.id,t.id as tid from sys_todo_main m inner join sys_todo_user t on t.tid=m.id " + "where t.uid=? and m.modid=?"; Map map = jdbcDao.findMap(sql, zbpm.getHaman(), zbpm.getProid()); String delsql = "delete from sys_todo_user where id=?"; - jdbcDao.update(delsql,map.get("tid")); + jdbcDao.update(delsql, map.get("tid")); SysTodoDone done = new SysTodoDone(); done.setId(XstrUtil.getUUID()); - done.setTid(""+map.get("id")); + done.setTid("" + map.get("id")); done.setUid(zbpm.getHaman()); doneRepo.save(done); } - - public SysTodoMain insert(SysTodoMain main) { + public String insert(SysTodoMain main) { if (main.getId() == null || "".equals(main.getId())) { main.setId(XstrUtil.getUUID()); } main.setCrtim(new Date()); - return repo.save(main); + repo.save(main); + return main.getId(); } - public SysTodoMain update(SysTodoMain main) { - return repo.save(main); + public String update(SysTodoMain main) { + repo.save(main); + return main.getId(); } public int delete(String[] ids) { diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java index 12bc1cf..4d885e0 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/conn/main/BiConnMainApi.java @@ -29,12 +29,12 @@ public class BiConnMainApi { @PostMapping public R post(@RequestBody BiTableMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiTableMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java index 8b70ea4..bd4e5f7 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/boy/BiDemoBoyApi.java @@ -39,12 +39,12 @@ public class BiDemoBoyApi { @PostMapping public R post(@RequestBody BiDemoBoy main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiDemoBoy main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java index b76e938..15e4fe3 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/girl/BiDemoGirlApi.java @@ -27,12 +27,12 @@ public class BiDemoGirlApi { @PostMapping public R post(@RequestBody BiDemoGirl main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiDemoGirl main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java index a73cf03..7950177 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/demo/student/BiDemoStudentApi.java @@ -27,12 +27,12 @@ public class BiDemoStudentApi { @PostMapping public R post(@RequestBody BiDemoStudent main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiDemoStudent main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java index f11b793..6beac93 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/etl/main/BiEtlMainApi.java @@ -40,7 +40,7 @@ public class BiEtlMainApi { @PostMapping public R post(@RequestBody BiEtlMain main) { main.setAvtag(false); - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping @@ -48,7 +48,7 @@ public class BiEtlMainApi { if (main.getAvtag()) { handler.startEtlJob(main); } - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @PostMapping("start") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java index 3dabc1a..c75dd3a 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/field/main/BiFieldMainApi.java @@ -26,12 +26,12 @@ public class BiFieldMainApi { @PostMapping public R post(@RequestBody BiFieldMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiFieldMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java index a77de95..4b150dc 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/bi/table/main/BiTableMainApi.java @@ -26,12 +26,12 @@ public class BiTableMainApi { @PostMapping public R post(@RequestBody BiTableMain main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody BiTableMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOne.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOne.java new file mode 100644 index 0000000..9f75a69 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOne.java @@ -0,0 +1,16 @@ +package vboot.extend.module.oa.demo.one; + +import lombok.Getter; +import lombok.Setter; +import vboot.core.common.entity.BaseMainEntity; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +public class OaDemoOne extends BaseMainEntity { + + private String notes;//备注 + +} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneApi.java similarity index 54% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneApi.java index 619fd3a..211d46e 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneApi.java @@ -1,22 +1,25 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.oa.demo.one; import cn.hutool.script.ScriptRuntimeException; import cn.hutool.script.ScriptUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.write.builder.ExcelWriterBuilder; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import vboot.core.common.api.R; -import vboot.core.common.dao.JdbcDao; import vboot.core.common.dao.Sqler; -import vboot.core.module.ass.num.main.AssNumMainService; import vboot.core.module.mon.log.oper.Oplog; import vboot.core.xutil.file.ExcelUtil; +import vboot.core.xutil.file.FileUtils; import vboot.core.xutil.file.excel.ExcelResult; import vboot.core.xutil.lang.XnumberUtil; import javax.script.CompiledScript; import javax.script.ScriptException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; @@ -24,12 +27,12 @@ import java.util.List; import java.util.Map; @RestController -@RequestMapping("sa/agent/main") -public class SaAgentMainApi { +@RequestMapping("oa/demo/one") +public class OaDemoOneApi { - @Oplog("查询代理商") + @Oplog("查询DEMO") @GetMapping - public R get(String name, String catid) { + public R get(String name, String catid) throws Exception { CompiledScript script = ScriptUtil.compile("var map={};var a=1;var b=2;map.xx=" + XnumberUtil.getRandom6() +"+a+b;map"); try { @@ -42,7 +45,7 @@ public class SaAgentMainApi { // if(true){ // throw new Exception("错误了"); // } - Sqler sqler = new Sqler("sa_agent_main"); + Sqler sqler = new Sqler("oa_demo_one"); sqler.addLike("t.name", name); sqler.addSelect("t.addre,t.senum"); return R.ok(service.findPageData(sqler)); @@ -59,24 +62,16 @@ public class SaAgentMainApi { @GetMapping("exp") public void getExp(HttpServletResponse response) throws Exception { - Sqler sqler=new Sqler("t.id,t.name,t.crtim,t.uptim","sa_agent_main"); - sqler.addLeftJoin("o1.name as crman","sys_org o1","o1.id=t.crman"); - sqler.addLeftJoin("o2.name as upman","sys_org o2","o2.id=t.upman"); - sqler.addSelect("t.addre,t.adcoo,t.notes,t.senum"); - List list = jdbcDao.getTp().query(sqler.getSql(), - sqler.getParams(), new BeanPropertyRowMapper<>(SaAgentMainExp.class)); - ExcelUtil.exportExcel(list, "代理商清单", SaAgentMainExp.class, response); - -// response.setContentType("application/vnd.ms-excel"); -// response.setCharacterEncoding("utf-8"); -// String fileName = "测试1ss.xlsx"; -// FileUtils.setAttachmentResponseHeader(response, fileName); -// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); -// ServletOutputStream outputStream = response.getOutputStream(); -// ExcelWriterBuilder writeWorkBook = EasyExcel.write(outputStream, Student.class) -// .registerWriteHandler((new LongestMatchColumnWidthStyleStrategy())); -// ExcelWriterSheetBuilder sheet = writeWorkBook.sheet(); -// sheet.doWrite(initData()); + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String fileName = "测试1ss.xlsx"; + FileUtils.setAttachmentResponseHeader(response, fileName); + response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8"); + ServletOutputStream outputStream = response.getOutputStream(); + ExcelWriterBuilder writeWorkBook = EasyExcel.write(outputStream, Student.class) + .registerWriteHandler((new LongestMatchColumnWidthStyleStrategy())); + ExcelWriterSheetBuilder sheet = writeWorkBook.sheet(); + sheet.doWrite(initData()); } private static List initData(){ @@ -94,20 +89,18 @@ public class SaAgentMainApi { @GetMapping("one/{id}") public R getOne(@PathVariable String id) { - - SaAgentMain main = service.findOne(id); + OaDemoOne main = service.findOne(id); return R.ok(main); } @PostMapping - public R post(@RequestBody SaAgentMain main) { - main.setSenum(numService.getNum("AGENT")); - return R.ok(service.insert(main).getId()); + public R post(@RequestBody OaDemoOne main) { + return R.ok(service.insert(main)); } @PutMapping - public R put(@RequestBody SaAgentMain main) { - return R.ok(service.update(main).getId()); + public R put(@RequestBody OaDemoOne main) { + return R.ok(service.update(main)); } @DeleteMapping("{ids}") @@ -115,13 +108,8 @@ public class SaAgentMainApi { return R.ok(service.delete(ids)); } - @Autowired - private AssNumMainService numService; @Autowired - private SaAgentMainService service; - - @Autowired - private JdbcDao jdbcDao; + private OaDemoOneService service; } diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneRepo.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneRepo.java new file mode 100644 index 0000000..89db893 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneRepo.java @@ -0,0 +1,9 @@ +package vboot.extend.module.oa.demo.one; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OaDemoOneRepo extends JpaRepository { + + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneService.java similarity index 64% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneService.java index 74517c0..bcf68a9 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneService.java @@ -1,18 +1,18 @@ -package vboot.app.module.sa.prod.tem; +package vboot.extend.module.oa.demo.one; -import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import vboot.core.common.service.BaseMainService; import javax.annotation.PostConstruct; @Service -public class SaProdTemService extends BaseMainService { +public class OaDemoOneService extends BaseMainService { + - //----------bean注入------------ @Autowired - private SaProdTemRepo repo; + private OaDemoOneRepo repo; @PostConstruct public void initDao() { diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/Student.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/Student.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/Student.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/Student.java index b9e68f3..4b517ac 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/Student.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/Student.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.oa.demo.one; import com.alibaba.excel.annotation.ExcelIgnore; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/StudentImportListener.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/StudentImportListener.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/StudentImportListener.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/StudentImportListener.java index 111dd6a..d9eab1c 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/StudentImportListener.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/StudentImportListener.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.oa.demo.one; import com.alibaba.excel.context.AnalysisContext; import vboot.core.xutil.file.excel.ExcelListener; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwo.java similarity index 68% rename from vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwo.java index 11e0699..4f81c4f 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwo.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.cust.main; +package vboot.extend.module.oa.demo.two; import lombok.Getter; import lombok.Setter; @@ -9,7 +9,7 @@ import javax.persistence.Entity; @Entity @Getter @Setter -public class SaCustMain extends BaseMainEntity { +public class OaDemoTwo extends BaseMainEntity { //备注 private String notes; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoApi.java similarity index 72% rename from vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoApi.java index 697b5c7..9180764 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.cust.main; +package vboot.extend.module.oa.demo.two; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -7,13 +7,18 @@ import vboot.core.common.dao.JdbcDao; import vboot.core.common.dao.Sqler; @RestController -@RequestMapping("sa/cust/main") -public class SaCustMainApi { +@RequestMapping("oa/demo/two") +public class OaDemoTwoApi { + + @GetMapping("list") + public R getList() { + return R.ok(service.findAll()); + } //分页查询项目清单 @GetMapping public R get(String name) { - Sqler sqler = new Sqler("sa_cust_main"); + Sqler sqler = new Sqler("oa_demo_two"); sqler.addLike("t.name", name); sqler.addSelect("t.notes"); return R.ok(jdbcDao.findPageData(sqler)); @@ -22,19 +27,19 @@ public class SaCustMainApi { //查询单个项目 @GetMapping("one/{id}") public R getOne(@PathVariable String id) { - SaCustMain main = service.findOne(id); + OaDemoTwo main = service.findOne(id); return R.ok(main); } //新增项目 @PostMapping - public R post(@RequestBody SaCustMain main) { + public R post(@RequestBody OaDemoTwo main) { return R.ok(service.insert(main)); } //修改项目 @PutMapping - public R put(@RequestBody SaCustMain main) { + public R put(@RequestBody OaDemoTwo main) { return R.ok(service.update(main)); } @@ -53,7 +58,7 @@ public class SaCustMainApi { } @Autowired - private SaCustMainService service; + private OaDemoTwoService service; @Autowired private JdbcDao jdbcDao; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoMapper.java similarity index 52% rename from vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java rename to vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoMapper.java index 41e6361..d4ec2f6 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/cust/main/SaCustMainMapper.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoMapper.java @@ -1,10 +1,10 @@ -package vboot.app.module.sa.cust.main; +package vboot.extend.module.oa.demo.two; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface SaCustMainMapper extends BaseMapper +public interface OaDemoTwoMapper extends BaseMapper { } \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoService.java new file mode 100644 index 0000000..fd873ee --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/demo/two/OaDemoTwoService.java @@ -0,0 +1,65 @@ +package vboot.extend.module.oa.demo.two; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import vboot.extend.module.oa.demo.one.OaDemoOne; +import vboot.extend.module.oa.demo.one.OaDemoOneRepo; +import vboot.core.xutil.lang.XstrUtil; + +import javax.annotation.Resource; +import java.util.List; + + +@Service +@Transactional(rollbackFor = Exception.class) +public class OaDemoTwoService { + + public OaDemoTwo findOne(String id) { + return demoTwoMapper.selectById(id); + } + + public List findAll() { + return demoTwoMapper.selectList(null); + } + + public String insert(OaDemoTwo cust) { + cust.setId(XstrUtil.getUUID()); + demoTwoMapper.insert(cust); + return cust.getId(); + } + + public String update(OaDemoTwo cust) { + demoTwoMapper.updateById(cust); + return cust.getId(); + } + + public int delete(String[] ids) { + for (String id : ids) { + demoTwoMapper.deleteById(id); + } + return ids.length; + } + + public void test() { + //先通过JPA新增一个代理商 + OaDemoOne demoMain=new OaDemoOne(); + demoMain.setId(XstrUtil.getUUID()); + demoMain.setName("有事务的项目"); + demoOneRepo.save(demoMain); + + //再通过mybatis-plus新增一个项目，并让它报错 + OaDemoTwo demoMain2=new OaDemoTwo(); + demoMain2.setId(XstrUtil.getUUID()+"XXXXXXXXXXXXXXXX");//超出长度保存出错 + demoMain2.setNotes("有事务的客户"); + demoTwoMapper.insert(demoMain2); + } + + @Resource + private OaDemoOneRepo demoOneRepo; + + @Resource + private OaDemoTwoMapper demoTwoMapper; + + +} + diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainApi.java index e72e0bc..af0db0a 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainApi.java @@ -26,12 +26,12 @@ public class OaDocMainApi { @PostMapping public R post(@RequestBody OaDocMain main) throws DocumentException { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody OaDocMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainService.java index b91f9ce..4a9a118 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/doc/main/OaDocMainService.java @@ -10,11 +10,10 @@ import javax.annotation.PostConstruct; @Service public class OaDocMainService extends BaseMainService { - public OaDocMain insert(OaDocMain OaDocMain) { - OaDocMain dbMain = super.insert(OaDocMain); + public String insert(OaDocMain OaDocMain) { // BpmProcMain wfFlowMain = new BpmProcMain(dbMain); // flowService.start(wfFlowMain); - return dbMain; + return super.insert(OaDocMain); } //----------bean注入------------ diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java index ce38ec5..f499e6b 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/main/OaFlowMainService.java @@ -6,6 +6,7 @@ import vboot.core.module.bpm.proc.main.Zbpm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import vboot.core.module.bpm.proc.main.Znode; +import vboot.core.xutil.web.XuserUtil; import javax.annotation.PostConstruct; import java.util.Date; @@ -16,7 +17,10 @@ public class OaFlowMainService extends BaseMainService { public void insertx(OaFlowMain oaFlowMain) { oaFlowMain.setState("20"); oaFlowMain.setUptim(new Date()); - OaFlowMain dbMain = super.insert(oaFlowMain); + if (oaFlowMain.getCrman() == null) { + oaFlowMain.setCrman(XuserUtil.getUser()); + } + OaFlowMain dbMain = repo.save(oaFlowMain); Zbpm zbpm = oaFlowMain.getZbpm(); zbpm.setProid(dbMain.getId()); diff --git a/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java index d088cca..6fa8451 100644 --- a/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/oa/flow/temp/OaFlowTempService.java @@ -14,7 +14,7 @@ import java.util.List; @Service public class OaFlowTempService extends BaseMainService { - public OaFlowTemp insertx(OaFlowTemp oaFlowTemp) { + public String insertx(OaFlowTemp oaFlowTemp) { BpmProcTemp bpmProcTemp = new BpmProcTemp(oaFlowTemp); bpmProcTemp.setOrxml(oaFlowTemp.getPrxml()); String chxml = "" @@ -22,12 +22,12 @@ public class OaFlowTempService extends BaseMainService { .replaceAll("bpmn2:", "") .replaceAll("activiti:", "") + "process>"; bpmProcTemp.setChxml(chxml); - BpmProcTemp dbProcTemp = bpmProcTempService.insert(bpmProcTemp); - oaFlowTemp.setProtd(dbProcTemp.getId()); + String temid = bpmProcTempService.insert(bpmProcTemp); + oaFlowTemp.setProtd(temid); return super.insert(oaFlowTemp); } - public OaFlowTemp updatex(OaFlowTemp oaFlowTemp) { + public String updatex(OaFlowTemp oaFlowTemp) { BpmProcTemp bpmProcTemp = bpmProcTempService.findOne(oaFlowTemp.getProtd()); bpmProcTemp.setOrxml(oaFlowTemp.getPrxml()); String chxml = "" diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java new file mode 100644 index 0000000..8c0b07f --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCate.java @@ -0,0 +1,19 @@ +package vboot.extend.module.sa.agent.cate; + +import lombok.Getter; +import lombok.Setter; +import vboot.core.common.entity.BaseMainEntity; + +import javax.persistence.Entity; + +@Entity +@Getter +@Setter +public class SaAgentCate extends BaseMainEntity { + + private Integer ornum;//排序号 + + private String notes; //备注 + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java new file mode 100644 index 0000000..2514e35 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateApi.java @@ -0,0 +1,50 @@ +package vboot.extend.module.sa.agent.cate; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import vboot.core.common.api.R; +import vboot.core.common.dao.Sqler; + +@RestController +@RequestMapping("sa/agent/cate") +public class SaAgentCateApi { + + @GetMapping("list") + public R getList() { + return R.ok(service.findAll()); + } + + @GetMapping + public R get(String name) { + Sqler sqler = new Sqler("sa_agent_cate"); + sqler.addLike("t.name", name); + sqler.addOrder("t.ornum").addSelect("t.notes"); + return R.ok(service.findPageData(sqler)); + } + + + @GetMapping("one/{id}") + public R getOne(@PathVariable String id) { + SaAgentCate main = service.findOne(id); + return R.ok(main); + } + + @PostMapping + public R post(@RequestBody SaAgentCate main) { return R.ok(service.insert(main)); } + + @PutMapping + public R put(@RequestBody SaAgentCate main) { + return R.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public R delete(@PathVariable String[] ids) { + return R.ok(service.delete(ids)); + } + + + @Autowired + private SaAgentCateService service; + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java new file mode 100644 index 0000000..cfca483 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateRepo.java @@ -0,0 +1,9 @@ +package vboot.extend.module.sa.agent.cate; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SaAgentCateRepo extends JpaRepository { + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java new file mode 100644 index 0000000..b11b98f --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/cate/SaAgentCateService.java @@ -0,0 +1,21 @@ +package vboot.extend.module.sa.agent.cate; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import vboot.core.common.service.BaseMainService; + +import javax.annotation.PostConstruct; + +@Service +public class SaAgentCateService extends BaseMainService { + + + @Autowired + private SaAgentCateRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java similarity index 66% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java index 24a6db1..6bde6fd 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMain.java @@ -1,6 +1,5 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.sa.agent.main; -import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import vboot.core.common.entity.BaseMainEntity; @@ -39,18 +38,21 @@ public class SaAgentMain extends BaseMainEntity { @Column(length = 32) private String level;//代理商资质 + @Column(length = 32) + private String catid;//代理商分类 + @Column(length = 32) private String senum;//流水号 - @ApiModelProperty("备注") - private String notes; - - @ManyToOne - @JoinColumn(name = "opman") - private SysOrg opman;//创建人 + private String notes;//备注 @ManyToMany - @JoinTable(name = "sa_agent_main_viewer", joinColumns = {@JoinColumn(name = "mid")}, + @JoinTable(name = "sa_agent_viewer", joinColumns = {@JoinColumn(name = "mid")}, inverseJoinColumns = {@JoinColumn(name = "oid")}) - private List viewers; + private List viewers;//可查看者 + + @ManyToMany + @JoinTable(name = "sa_agent_editor", joinColumns = {@JoinColumn(name = "mid")}, + inverseJoinColumns = {@JoinColumn(name = "oid")}) + private List editors;//可编辑者 } \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java new file mode 100644 index 0000000..f542acf --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainApi.java @@ -0,0 +1,78 @@ +package vboot.extend.module.sa.agent.main; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.BeanPropertyRowMapper; +import org.springframework.web.bind.annotation.*; +import vboot.core.common.api.R; +import vboot.core.common.dao.JdbcDao; +import vboot.core.common.dao.Sqler; +import vboot.core.module.ass.num.main.AssNumMainService; +import vboot.core.module.mon.log.oper.Oplog; +import vboot.core.xutil.file.ExcelUtil; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@RestController +@RequestMapping("sa/agent/main") +public class SaAgentMainApi { + + + @GetMapping("list") + public R getList() { + return R.ok(service.findAll()); + } + + @Oplog("查询代理商") + @GetMapping + public R get(String name) { + Sqler sqler = new Sqler("sa_agent_main"); + sqler.addLike("t.name", name); + sqler.addSelect("t.addre,t.senum"); + return R.ok(service.findPageData(sqler)); + } + + @GetMapping("exp") + public void getExp(HttpServletResponse response) throws Exception { + Sqler sqler=new Sqler("t.id,t.name,t.crtim,t.uptim","sa_agent_main"); + sqler.addLeftJoin("o1.name as crman","sys_org o1","o1.id=t.crman"); + sqler.addLeftJoin("o2.name as upman","sys_org o2","o2.id=t.upman"); + sqler.addSelect("t.addre,t.adcoo,t.notes,t.senum"); + List list = jdbcDao.getTp().query(sqler.getSql(), + sqler.getParams(), new BeanPropertyRowMapper<>(SaAgentMainExp.class)); + ExcelUtil.exportExcel(list, "代理商清单", SaAgentMainExp.class, response); + } + + + @GetMapping("one/{id}") + public R getOne(@PathVariable String id) { + SaAgentMain main = service.findOne(id); + return R.ok(main); + } + + @PostMapping + public R post(@RequestBody SaAgentMain main) { + main.setSenum(numService.getNum("AGENT")); + return R.ok(service.insert(main)); + } + + @PutMapping + public R put(@RequestBody SaAgentMain main) { + return R.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public R delete(@PathVariable String[] ids) { + return R.ok(service.delete(ids)); + } + + @Autowired + private AssNumMainService numService; + + @Autowired + private SaAgentMainService service; + + @Autowired + private JdbcDao jdbcDao; + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainExp.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainExp.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java index 0a3a598..0005c13 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainExp.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainExp.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.sa.agent.main; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java index 46980ff..c75dc76 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.sa.agent.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java index d8fa6c3..b167115 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/agent/main/SaAgentMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/agent/main/SaAgentMainService.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.agent.main; +package vboot.extend.module.sa.agent.main; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java new file mode 100644 index 0000000..8b51e4b --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCate.java @@ -0,0 +1,18 @@ +package vboot.extend.module.sa.cust.cate; + +import lombok.Getter; +import lombok.Setter; +import vboot.core.common.entity.BaseMainEntity; + +import javax.persistence.Entity; + +@Entity +@Getter +@Setter +public class SaCustCate extends BaseMainEntity { + + private Integer ornum;//排序号 + + private String notes; //备注 + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java similarity index 50% rename from vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java index 1b0ad4c..609a2f3 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateApi.java @@ -1,37 +1,39 @@ -package vboot.app.module.sa.draw.main; +package vboot.extend.module.sa.cust.cate; -import vboot.core.common.api.R; -import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import vboot.core.common.api.R; +import vboot.core.common.dao.Sqler; @RestController -@RequestMapping("sa/draw/main") -public class SaDrawMainApi { +@RequestMapping("sa/cust/cate") +public class SaCustCateApi { + + @GetMapping("list") + public R getList() { + return R.ok(service.findAll()); + } @GetMapping - public R get(String name,String catid) { - Sqler sqler = new Sqler("sa_draw_main"); + public R get(String name) { + Sqler sqler = new Sqler("sa_cust_cate"); sqler.addLike("t.name", name); - sqler.addEqual("t.catid", catid); + sqler.addOrder("t.ornum").addSelect("t.notes"); return R.ok(service.findPageData(sqler)); } - @GetMapping("one/{id}") public R getOne(@PathVariable String id) { - SaDrawMain main = service.findOne(id); + SaCustCate main = service.findOne(id); return R.ok(main); } @PostMapping - public R post(@RequestBody SaDrawMain main) { - return R.ok(service.insert(main).getId()); - } + public R post(@RequestBody SaCustCate main) { return R.ok(service.insert(main)); } @PutMapping - public R put(@RequestBody SaDrawMain main) { - return R.ok(service.update(main).getId()); + public R put(@RequestBody SaCustCate main) { + return R.ok(service.update(main)); } @DeleteMapping("{ids}") @@ -39,7 +41,9 @@ public class SaDrawMainApi { return R.ok(service.delete(ids)); } + @Autowired - private SaDrawMainService service; + private SaCustCateService service; + } diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java new file mode 100644 index 0000000..6a20b57 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateRepo.java @@ -0,0 +1,9 @@ +package vboot.extend.module.sa.cust.cate; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SaCustCateRepo extends JpaRepository { + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java new file mode 100644 index 0000000..621ab25 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/cate/SaCustCateService.java @@ -0,0 +1,20 @@ +package vboot.extend.module.sa.cust.cate; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import vboot.core.common.service.BaseMainService; + +import javax.annotation.PostConstruct; + +@Service +public class SaCustCateService extends BaseMainService { + + @Autowired + private SaCustCateRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java new file mode 100644 index 0000000..bcb54e4 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMain.java @@ -0,0 +1,55 @@ +package vboot.extend.module.sa.cust.main; + +import lombok.Getter; +import lombok.Setter; +import vboot.core.common.entity.BaseMainEntity; +import vboot.core.module.sys.org.root.SysOrg; + +import javax.persistence.*; +import java.util.List; + +@Entity +@Getter +@Setter +public class SaCustMain extends BaseMainEntity { + + //--------地址相关信息------<<< + private String addre;//完整地址 + + @Column(length = 64) + private String adreg;//省市区 + + @Column(length = 128) + private String addet;//省市区以外的详细信息 + + @Column(length = 32) + private String adcoo;//经纬度 + + @Column(length = 32) + private String adpro;//省 + + @Column(length = 32) + private String adcit;//市 + + @Column(length = 32) + private String addis;//区 + //--------地址相关信息------>>> + + @Column(length = 32) + private String catid;//客户分类 + + @Column(length = 32) + private String senum;//流水号 + + private String notes;//备注 + + @ManyToMany + @JoinTable(name = "sa_cust_viewer", joinColumns = {@JoinColumn(name = "mid")}, + inverseJoinColumns = {@JoinColumn(name = "oid")}) + private List viewers;//可查看者 + + @ManyToMany + @JoinTable(name = "sa_cust_editor", joinColumns = {@JoinColumn(name = "mid")}, + inverseJoinColumns = {@JoinColumn(name = "oid")}) + private List editors;//可编辑者 +} \ No newline at end of file diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java new file mode 100644 index 0000000..3d1d9ef --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainApi.java @@ -0,0 +1,60 @@ +package vboot.extend.module.sa.cust.main; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import vboot.core.common.api.R; +import vboot.core.common.dao.Sqler; +import vboot.core.module.ass.num.main.AssNumMainService; +import vboot.core.module.mon.log.oper.Oplog; + +@RestController +@RequestMapping("sa/cust/main") +public class SaCustMainApi { + + + @GetMapping("list") + public R getList() { + return R.ok(service.findAll()); + } + + @Oplog("查询客户") + @GetMapping + public R get(String name) { + Sqler sqler = new Sqler("sa_cust_main"); + sqler.addLike("t.name", name); + sqler.addSelect("t.addre,t.senum"); + return R.ok(service.findPageData(sqler)); + } + + @GetMapping("one/{id}") + public R getOne(@PathVariable String id) { + SaCustMain main = service.findOne(id); + return R.ok(main); + } + + @Oplog("新增客户") + @PostMapping + public R post(@RequestBody SaCustMain main) { + main.setSenum(numService.getNum("CUST")); + return R.ok(service.insert(main)); + } + + @Oplog("修改客户") + @PutMapping + public R put(@RequestBody SaCustMain main) { + return R.ok(service.update(main)); + } + + @DeleteMapping("{ids}") + public R delete(@PathVariable String[] ids) { + return R.ok(service.delete(ids)); + } + + @Autowired + private AssNumMainService numService; + + @Autowired + private SaCustMainService service; + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java new file mode 100644 index 0000000..94a511e --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainRepo.java @@ -0,0 +1,8 @@ +package vboot.extend.module.sa.cust.main; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SaCustMainRepo extends JpaRepository { + + +} diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java new file mode 100644 index 0000000..3e00298 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/cust/main/SaCustMainService.java @@ -0,0 +1,20 @@ +package vboot.extend.module.sa.cust.main; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import vboot.core.common.service.BaseMainService; + +import javax.annotation.PostConstruct; + +@Service +public class SaCustMainService extends BaseMainService { + + @Autowired + private SaCustMainRepo repo; + + @PostConstruct + public void initDao() { + super.setRepo(repo); + } + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java index 46ea9be..7660d29 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/feat/SaProdFeat.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/feat/SaProdFeat.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.feat; +package vboot.extend.module.sa.prod.feat; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java similarity index 84% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java index 4291448..952e0ed 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroup.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroup.java @@ -1,6 +1,6 @@ -package vboot.app.module.sa.prod.group; +package vboot.extend.module.sa.prod.group; -import vboot.app.module.sa.prod.main.SaProdMain; +import vboot.extend.module.sa.prod.main.SaProdMain; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; @@ -14,9 +14,6 @@ import java.util.List; @Setter public class SaProdGroup extends BaseMainEntity { - - - //备注 private String notes; @@ -29,6 +26,4 @@ public class SaProdGroup extends BaseMainEntity { private List prods = new ArrayList<>(); - - } \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java similarity index 90% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java index 66a186b..cad3d43 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.group; +package vboot.extend.module.sa.prod.group; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -36,13 +36,13 @@ public class SaProdGroupApi { //新增项目 @PostMapping public R post(@RequestBody SaProdGroup main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } //修改项目 @PutMapping public R put(@RequestBody SaProdGroup main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } //删除项目 diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java similarity index 83% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java index b49b7f7..4e5ff42 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.group; +package vboot.extend.module.sa.prod.group; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java index d73f7c0..16bb125 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/group/SaProdGroupService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/group/SaProdGroupService.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.group; +package vboot.extend.module.sa.prod.group; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java index 9cbe6c4..2001fd9 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/main/SaProdMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/main/SaProdMain.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.main; +package vboot.extend.module.sa.prod.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java index 3c09501..2a57d67 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTemp.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.tem; +package vboot.extend.module.sa.prod.temp; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; @@ -10,7 +10,7 @@ import javax.persistence.Entity; @Entity @Getter @Setter -public class SaProdTem extends BaseMainEntity { +public class SaProdTemp extends BaseMainEntity { private Integer ornum; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java similarity index 64% rename from vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java index 7ecb8d7..a754986 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/prod/tem/SaProdTemApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.prod.tem; +package vboot.extend.module.sa.prod.temp; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -6,12 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("sa/prod/tem") -public class SaProdTemApi { +@RequestMapping("sa/prod/temp") +public class SaProdTempApi { @GetMapping public R get(String name) { - Sqler sqler = new Sqler("sa_prod_tem"); + Sqler sqler = new Sqler("sa_prod_temp"); sqler.addLike("t.name", name); sqler.addLeftJoin("m.name as modna", "te_prod_model m", "m.id=t.modid"); sqler.addOrder("t.ornum"); @@ -20,18 +20,18 @@ public class SaProdTemApi { @GetMapping("one/{id}") public R getOne(@PathVariable String id) { - SaProdTem main = service.findOne(id); + SaProdTemp main = service.findOne(id); return R.ok(main); } @PostMapping - public R post(@RequestBody SaProdTem main) { - return R.ok(service.insert(main).getId()); + public R post(@RequestBody SaProdTemp main) { + return R.ok(service.insert(main)); } @PutMapping - public R put(@RequestBody SaProdTem main) { - return R.ok(service.update(main).getId()); + public R put(@RequestBody SaProdTemp main) { + return R.ok(service.update(main)); } @DeleteMapping("{ids}") @@ -40,6 +40,6 @@ public class SaProdTemApi { } @Autowired - private SaProdTemService service; + private SaProdTempService service; } diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java new file mode 100644 index 0000000..7a13799 --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempRepo.java @@ -0,0 +1,9 @@ +package vboot.extend.module.sa.prod.temp; + +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface SaProdTempRepo extends JpaRepository { + + +} diff --git a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java similarity index 71% rename from vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java index 5a0a3a7..ab8db91 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/draw/main/SaDrawMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/prod/temp/SaProdTempService.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.draw.main; +package vboot.extend.module.sa.prod.temp; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; @@ -7,13 +7,12 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @Service -public class SaDrawMainService extends BaseMainService { - +public class SaProdTempService extends BaseMainService { //----------bean注入------------ @Autowired - private SaDrawMainRepo repo; + private SaProdTempRepo repo; @PostConstruct public void initDao() { diff --git a/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java new file mode 100644 index 0000000..cd47d0f --- /dev/null +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMain.java @@ -0,0 +1,77 @@ +package vboot.extend.module.sa.proj.main; + +import vboot.extend.module.sa.prod.group.SaProdGroup; +import vboot.core.common.entity.BaseMainEntity; +import lombok.Getter; +import lombok.Setter; +import vboot.core.module.sys.org.root.SysOrg; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Setter +public class SaProjMain extends BaseMainEntity { + + //--------地址相关信息------<<< + private String addre;//完整地址 + + @Column(length = 64) + private String adreg;//省市区 + + @Column(length = 128) + private String addet;//省市区以外的详细信息 + + @Column(length = 32) + private String adcoo;//经纬度 + + @Column(length = 32) + private String adpro;//省 + + @Column(length = 32) + private String adcit;//市 + + @Column(length = 32) + private String addis;//区 + //--------地址相关信息------>>> + + @Column(length = 32) + private String senum;//流水号 + + + private String notes; //备注 + + @ManyToMany + @JoinTable(name = "sa_proj_viewer", joinColumns = {@JoinColumn(name = "mid")}, + inverseJoinColumns = {@JoinColumn(name = "oid")}) + private List viewers;//可查看者 + + @ManyToMany + @JoinTable(name = "sa_proj_editor", joinColumns = {@JoinColumn(name = "mid")}, + inverseJoinColumns = {@JoinColumn(name = "oid")}) + private List editors;//可编辑者 + + @ManyToOne + @JoinColumn(name = "opman") + private SysOrg opman;//创建人 + + private String type; //项目类型 + + @Column(length = 32) + private String ageid; //代理商ID + + @Transient + private String agena; //代理商名称 + + @Column(length = 32) + private String cusid; //客户ID + + @Transient + private String cusna; //客户名称 + + @Transient + private List groups = new ArrayList<>(); //产品组 + +} \ No newline at end of file diff --git a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java similarity index 59% rename from vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java index ff45737..09db5ed 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainApi.java @@ -1,44 +1,26 @@ -package vboot.app.module.sa.proj.main; +package vboot.extend.module.sa.proj.main; -import vboot.app.module.sa.prod.group.SaProdGroup; -import vboot.app.module.sa.prod.group.SaProdGroupService; +import vboot.extend.module.sa.prod.group.SaProdGroup; +import vboot.extend.module.sa.prod.group.SaProdGroupService; import vboot.core.common.api.R; +import vboot.core.common.dao.JdbcDao; import vboot.core.common.dao.Sqler; -import vboot.core.common.pojo.Zinp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import vboot.core.module.ass.num.main.AssNumMainService; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @RestController @RequestMapping("sa/proj/main") public class SaProjMainApi { - @GetMapping("tree") - public R getTree(String name) { - List list = new ArrayList<>(); - Zinp zinp = new Zinp(); - zinp.setId("11"); - zinp.setName("测试1"); - - Zinp zinp2 = new Zinp(); - zinp2.setId("22"); - zinp2.setName("测试2"); - list.add(zinp); - list.add(zinp2); - return R.ok(list); - } - - //分页查询项目清单 @GetMapping public R get(String name) { Sqler sqler = new Sqler("sa_proj_main"); sqler.addLike("t.name", name); - sqler.addSelect("t.addre,t.notes"); - System.out.println(new Date()); + sqler.addSelect("t.addre,t.notes,t.senum"); return R.ok(service.findPageData(sqler)); } @@ -46,6 +28,8 @@ public class SaProjMainApi { @GetMapping("one/{id}") public R getOne(@PathVariable String id) { SaProjMain main = service.findOne(id); + main.setAgena(jdbcDao.findOneName("sa_agent_main",main.getAgeid())); + main.setCusna(jdbcDao.findOneName("sa_cust_main",main.getCusna())); List groups = groupService.findAllByProjid(id); main.setGroups(groups); return R.ok(main); @@ -54,13 +38,14 @@ public class SaProjMainApi { //新增项目 @PostMapping public R post(@RequestBody SaProjMain main) { - return R.ok(service.insert(main).getId()); + main.setSenum(numService.getNum("PROJ")); + return R.ok(service.insertx(main)); } //修改项目 @PutMapping public R put(@RequestBody SaProjMain main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } //删除项目 @@ -69,6 +54,17 @@ public class SaProjMainApi { return R.ok(service.delete(ids)); } + // @Autowired +// private SaAgentMainService agentService; +// +// @Autowired +// private SaCustMainService custService; + @Autowired + private JdbcDao jdbcDao; + + @Autowired + private AssNumMainService numService; + @Autowired private SaProjMainService service; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java index 3ba3ea1..6095f06 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.proj.main; +package vboot.extend.module.sa.proj.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java similarity index 75% rename from vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java index 4d20cb9..f1f63b3 100644 --- a/vboot-application/src/main/java/vboot/app/module/sa/proj/main/SaProjMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/sa/proj/main/SaProjMainService.java @@ -1,4 +1,4 @@ -package vboot.app.module.sa.proj.main; +package vboot.extend.module.sa.proj.main; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; @@ -10,8 +10,17 @@ import javax.annotation.PostConstruct; @Service public class SaProjMainService extends BaseMainService { + public String insertx(SaProjMain main){ + + return super.insert(main); + } + + + + + + - //----------bean注入------------ @Autowired private SaProjMainRepo repo; @@ -20,6 +29,5 @@ public class SaProjMainService extends BaseMainService { super.setRepo(repo); } - } diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java similarity index 94% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java index 9211ba3..08bbc90 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheck.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheck.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java index 241344d..3bc1e80 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -30,12 +30,12 @@ public class TeAllotCheckApi { @PostMapping public R post(@RequestBody TeAllotCheck main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeAllotCheck main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java index 380003f..1f157f8 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java index 85f5772..589fdd3 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java index 4b80876..e395702 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/TeAllotCheckService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/TeAllotCheckService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import vboot.core.common.dao.Sqler; import vboot.core.common.service.BaseMainService; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java similarity index 78% rename from vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java index a7ba111..a6542fb 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/check/Zcheck.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/check/Zcheck.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.check; +package vboot.extend.module.te.allot.check; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java index b698983..8d7647a 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDrive.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDrive.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java index bdd7c99..5cdd129 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -31,12 +31,12 @@ public class TeAllotDriveApi { @PostMapping public R post(@RequestBody TeAllotDrive main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeAllotDrive main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java index de6c992..8b77deb 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java index d548303..c5dcd43 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java index 7b6c29e..1fcda60 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/TeAllotDriveService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/TeAllotDriveService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import vboot.core.common.dao.Sqler; import vboot.core.common.service.BaseMainService; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java similarity index 78% rename from vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java index f51d6c1..9882991 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/drive/Zdrive.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/drive/Zdrive.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.drive; +package vboot.extend.module.te.allot.drive; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java similarity index 94% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java index b8cafdb..0dc7e75 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLink.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLink.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java index 6e2997f..538c349 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -29,12 +29,12 @@ public class TeAllotLinkApi { @PostMapping public R post(@RequestBody TeAllotLink main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeAllotLink main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java index 0e7583e..e6f3051 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java index 8d8d19e..21ac014 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java index 8de729b..76a369c 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/TeAllotLinkService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/TeAllotLinkService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import vboot.core.common.dao.Sqler; import vboot.core.common.service.BaseMainService; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java similarity index 78% rename from vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java index 23a22e5..ba5c7cb 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/link/Zlink.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/link/Zlink.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.link; +package vboot.extend.module.te.allot.link; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java similarity index 94% rename from vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java index 0b0d303..8c19d95 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParam.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParam.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.param; +package vboot.extend.module.te.allot.param; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java index 4362de6..98e9204 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.param; +package vboot.extend.module.te.allot.param; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -29,12 +29,12 @@ public class TeAllotParamApi { @PostMapping public R post(@RequestBody TeAllotParam main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeAllotParam main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java index b070495..c504c74 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.param; +package vboot.extend.module.te.allot.param; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java index c616c8d..e66a2a3 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.allot.param; +package vboot.extend.module.te.allot.param; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java index bd1546e..b4948e4 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/allot/param/TeAllotParamService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/allot/param/TeAllotParamService.java @@ -1,7 +1,7 @@ -package vboot.app.module.te.allot.param; +package vboot.extend.module.te.allot.param; -import vboot.app.module.te.prod.model.Zparam; -import vboot.app.module.te.prod.model.Zscreen; +import vboot.extend.module.te.prod.model.Zparam; +import vboot.extend.module.te.prod.model.Zscreen; import vboot.core.common.dao.Sqler; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java index cddcdde..101961f 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheck.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheck.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.check; +package vboot.extend.module.te.feat.check; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java index 97f2fff..04ad7b9 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.check; +package vboot.extend.module.te.feat.check; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -27,12 +27,12 @@ public class TeFeatCheckApi { @PostMapping public R post(@RequestBody TeFeatCheck main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatCheck main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java index 9351d96..39dd0ef 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.check; +package vboot.extend.module.te.feat.check; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java index 3584426..f9ac2b3 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/check/TeFeatCheckService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/check/TeFeatCheckService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.check; +package vboot.extend.module.te.feat.check; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java similarity index 85% rename from vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java index 6c10972..c4369b9 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatComp.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatComp.java @@ -1,8 +1,8 @@ -package vboot.app.module.te.feat.comp; +package vboot.extend.module.te.feat.comp; -import vboot.app.module.te.allot.check.TeAllotCheck; -import vboot.app.module.te.allot.drive.TeAllotDrive; -import vboot.app.module.te.allot.param.TeAllotParam; +import vboot.extend.module.te.allot.check.TeAllotCheck; +import vboot.extend.module.te.allot.drive.TeAllotDrive; +import vboot.extend.module.te.allot.param.TeAllotParam; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java similarity index 86% rename from vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java index d31faa1..8f30910 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompApi.java @@ -1,6 +1,6 @@ -package vboot.app.module.te.feat.comp; +package vboot.extend.module.te.feat.comp; -import vboot.app.module.te.allot.param.TeAllotParamService; +import vboot.extend.module.te.allot.param.TeAllotParamService; import vboot.core.common.api.R; import vboot.core.common.dao.JdbcDao; import vboot.core.common.dao.Sqler; @@ -30,12 +30,12 @@ public class TeFeatCompApi { @PostMapping public R post(@RequestBody TeFeatComp main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatComp main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java index a2b3f13..3cd43d2 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.comp; +package vboot.extend.module.te.feat.comp; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java similarity index 84% rename from vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java index 652387e..4b40b28 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/comp/TeFeatCompService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/comp/TeFeatCompService.java @@ -1,6 +1,6 @@ -package vboot.app.module.te.feat.comp; +package vboot.extend.module.te.feat.comp; -import vboot.app.module.te.allot.param.TeAllotParamRepo; +import vboot.extend.module.te.allot.param.TeAllotParamRepo; import vboot.core.common.service.BaseMainService; import vboot.core.xutil.lang.XstrUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +11,7 @@ import javax.annotation.PostConstruct; @Service public class TeFeatCompService extends BaseMainService { - public TeFeatComp insert(TeFeatComp main){ + public String insert(TeFeatComp main){ if(main.getPatem()!=null){ String puuid = XstrUtil.getUUID(); main.getPatem().setId(puuid); @@ -23,7 +23,7 @@ public class TeFeatCompService extends BaseMainService { return super.insert(main); } - public TeFeatComp update(TeFeatComp main){ + public String update(TeFeatComp main){ if(main.getPatem()!=null){ apRepo.save(main.getPatem()); } diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java index 792b5db..7f4bbb1 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDrive.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDrive.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.drive; +package vboot.extend.module.te.feat.drive; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java index 9f690e2..6a912d3 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.drive; +package vboot.extend.module.te.feat.drive; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -27,12 +27,12 @@ public class TeFeatDriveApi { @PostMapping public R post(@RequestBody TeFeatDrive main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatDrive main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java index 5e670c2..1caee3f 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.drive; +package vboot.extend.module.te.feat.drive; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java index ce3ed01..0116768 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/drive/TeFeatDriveService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/drive/TeFeatDriveService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.drive; +package vboot.extend.module.te.feat.drive; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java similarity index 97% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java index 9582522..6c79715 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLink.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLink.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java index c6c8736..efd0a33 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -28,12 +28,12 @@ public class TeFeatLinkApi { @PostMapping public R post(@RequestBody TeFeatLink main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatLink main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java index 5ffdd96..94d9267 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java similarity index 92% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java index e70a04e..0c03f9f 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkLeft.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkLeft.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java index 8f64631..619e949 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java index adba933..d2f1aa7 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkRight.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkRight.java @@ -1,6 +1,6 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; -import vboot.app.module.te.feat.param.TeFeatParamOption; +import vboot.extend.module.te.feat.param.TeFeatParamOption; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.GenericGenerator; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java index 721a821..ae0e9de 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/link/TeFeatLinkService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/link/TeFeatLinkService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.link; +package vboot.extend.module.te.feat.link; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java index ea756c7..21c0a07 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParam.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParam.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.param; +package vboot.extend.module.te.feat.param; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java index 0944748..b536247 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.param; +package vboot.extend.module.te.feat.param; import vboot.core.common.api.R; import vboot.core.common.dao.JdbcDao; @@ -54,12 +54,12 @@ public class TeFeatParamApi { @PostMapping public R post(@RequestBody TeFeatParam main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatParam main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java index c6a84cb..7e9f7b5 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamOption.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamOption.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.param; +package vboot.extend.module.te.feat.param; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java index 334ba85..018ed5a 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.param; +package vboot.extend.module.te.feat.param; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java similarity index 96% rename from vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java index fa60384..76040b0 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/param/TeFeatParamService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/param/TeFeatParamService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.param; +package vboot.extend.module.te.feat.param; import vboot.core.common.dao.Sqler; import vboot.core.common.pojo.ZidName; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java index aeecde1..c37b58e 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreen.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreen.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.screen; +package vboot.extend.module.te.feat.screen; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java similarity index 90% rename from vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java index 80c3282..4baa08c 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.screen; +package vboot.extend.module.te.feat.screen; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -35,12 +35,12 @@ public class TeFeatScreenApi { @PostMapping public R post(@RequestBody TeFeatScreen main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeFeatScreen main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java index d68e493..9b22b18 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.screen; +package vboot.extend.module.te.feat.screen; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java similarity index 98% rename from vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java index ff80f02..2c5b09d 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/feat/screen/TeFeatScreenService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/feat/screen/TeFeatScreenService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.feat.screen; +package vboot.extend.module.te.feat.screen; import vboot.core.common.dao.Sqler; import vboot.core.common.pojo.Zinp; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java similarity index 86% rename from vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java index 2f224cf..a5f6b82 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCate.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCate.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.cate; +package vboot.extend.module.te.prod.cate; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java similarity index 96% rename from vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java index d432636..f527760 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.cate; +package vboot.extend.module.te.prod.cate; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java index f9f2355..ceeb7ef 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.cate; +package vboot.extend.module.te.prod.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java index 63be899..df568b5 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/cate/TeProdCateService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/cate/TeProdCateService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.cate; +package vboot.extend.module.te.prod.cate; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java index f57c042..f1b2723 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModel.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModel.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java index a8c14b5..456c6e6 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import vboot.core.common.api.R; import vboot.core.common.dao.JdbcDao; @@ -59,12 +59,12 @@ public class TeProdModelApi { @PostMapping public R post(@RequestBody TeProdModel main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeProdModel main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java index 0dcd603..f711874 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java similarity index 98% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java index be08734..207a623 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/TeProdModelService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/TeProdModelService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import vboot.core.common.dao.Sqler; import vboot.core.common.pojo.Zinp; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java similarity index 84% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java index 3802c1f..370a35f 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zmodel.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zmodel.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java similarity index 83% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java index 19732d3..a4cf8fc 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zparam.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zparam.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java similarity index 84% rename from vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java index 157f68b..9dc93a9 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/model/Zscreen.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/model/Zscreen.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.model; +package vboot.extend.module.te.prod.model; import lombok.Data; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java index f1327f4..1ad2893 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerie.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerie.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.serie; +package vboot.extend.module.te.prod.serie; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java index f1acb88..daac6a5 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.serie; +package vboot.extend.module.te.prod.serie; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; @@ -32,12 +32,12 @@ public class TeProdSerieApi { @PostMapping public R post(@RequestBody TeProdSerie main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeProdSerie main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java similarity index 83% rename from vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java index 554d4a9..e96430c 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.serie; +package vboot.extend.module.te.prod.serie; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java similarity index 93% rename from vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java index fe5dcd4..96c32b3 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/serie/TeProdSerieService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/serie/TeProdSerieService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.serie; +package vboot.extend.module.te.prod.serie; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java similarity index 84% rename from vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java index 2161857..ce572b2 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTest.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTest.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.test; +package vboot.extend.module.te.prod.test; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java similarity index 89% rename from vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java index 42c99f9..9cf6b22 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestApi.java @@ -1,7 +1,7 @@ -package vboot.app.module.te.prod.test; +package vboot.extend.module.te.prod.test; -import vboot.app.module.te.prod.cate.TeProdCate; -import vboot.app.module.te.prod.cate.TeProdCateService; +import vboot.extend.module.te.prod.cate.TeProdCate; +import vboot.extend.module.te.prod.cate.TeProdCateService; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java index 841a145..1a7a88a 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.test; +package vboot.extend.module.te.prod.test; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java index 17c93df..927a603 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/test/TeProdTestService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/test/TeProdTestService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.test; +package vboot.extend.module.te.prod.test; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java index 7c5bf8e..7c790b5 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersion.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersion.java @@ -1,8 +1,8 @@ -package vboot.app.module.te.prod.version; +package vboot.extend.module.te.prod.version; -import vboot.app.module.te.allot.check.TeAllotCheck; -import vboot.app.module.te.allot.drive.TeAllotDrive; -import vboot.app.module.te.allot.param.TeAllotParam; +import vboot.extend.module.te.allot.check.TeAllotCheck; +import vboot.extend.module.te.allot.drive.TeAllotDrive; +import vboot.extend.module.te.allot.param.TeAllotParam; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java similarity index 88% rename from vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java index eb84a98..de3723c 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionApi.java @@ -1,6 +1,6 @@ -package vboot.app.module.te.prod.version; +package vboot.extend.module.te.prod.version; -import vboot.app.module.te.allot.param.TeAllotParamService; +import vboot.extend.module.te.allot.param.TeAllotParamService; import vboot.core.common.api.R; import vboot.core.common.dao.JdbcDao; import vboot.core.common.dao.Sqler; @@ -34,12 +34,12 @@ public class TeProdVersionApi { @PostMapping public R post(@RequestBody TeProdVersion main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main)); } @PutMapping public R put(@RequestBody TeProdVersion main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java similarity index 76% rename from vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java index 6ad4200..0f1684d 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.prod.version; +package vboot.extend.module.te.prod.version; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java similarity index 83% rename from vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java index ec78572..e4760c4 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/prod/version/TeProdVersionService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/prod/version/TeProdVersionService.java @@ -1,6 +1,6 @@ -package vboot.app.module.te.prod.version; +package vboot.extend.module.te.prod.version; -import vboot.app.module.te.allot.param.TeAllotParamRepo; +import vboot.extend.module.te.allot.param.TeAllotParamRepo; import vboot.core.common.service.BaseMainService; import vboot.core.xutil.lang.XstrUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -11,7 +11,7 @@ import javax.annotation.PostConstruct; @Service public class TeProdVersionService extends BaseMainService { - public TeProdVersion insert(TeProdVersion main){ + public String insert(TeProdVersion main){ if(main.getPatem()!=null){ String puuid = XstrUtil.getUUID(); main.getPatem().setId(puuid); @@ -23,7 +23,7 @@ public class TeProdVersionService extends BaseMainService { return super.insert(main); } - public TeProdVersion update(TeProdVersion main){ + public String update(TeProdVersion main){ if(main.getPatem()!=null){ apRepo.save(main.getPatem()); } diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java similarity index 86% rename from vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java index 724b6ba..24bdc61 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCate.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCate.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.cate; +package vboot.extend.module.te.tran.cate; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java similarity index 96% rename from vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java index 357ae30..bbdfc4d 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.cate; +package vboot.extend.module.te.tran.cate; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java index dbae676..d69c376 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.cate; +package vboot.extend.module.te.tran.cate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java index c339e78..66d21a7 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/cate/TeTranCateService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/cate/TeTranCateService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.cate; +package vboot.extend.module.te.tran.cate; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java similarity index 96% rename from vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java index 342fc43..afc0606 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMain.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMain.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.main; +package vboot.extend.module.te.tran.main; import vboot.core.common.entity.BaseMainEntity; import lombok.Getter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java similarity index 96% rename from vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java index f9bb9be..cfacfca 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainApi.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainApi.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.main; +package vboot.extend.module.te.tran.main; import vboot.core.common.api.R; import vboot.core.common.dao.Sqler; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java similarity index 95% rename from vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java index 4c3ee1b..da43259 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainItem.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainItem.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.main; +package vboot.extend.module.te.tran.main; import lombok.Getter; import lombok.Setter; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java similarity index 77% rename from vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java index 770df3d..cf35d3d 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainRepo.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainRepo.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.main; +package vboot.extend.module.te.tran.main; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java similarity index 91% rename from vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java rename to vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java index e94d75d..7dd00d5 100644 --- a/vboot-application/src/main/java/vboot/app/module/te/tran/main/TeTranMainService.java +++ b/vboot-extend/src/main/java/vboot/extend/module/te/tran/main/TeTranMainService.java @@ -1,4 +1,4 @@ -package vboot.app.module.te.tran.main; +package vboot.extend.module.te.tran.main; import vboot.core.common.service.BaseMainService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/vboot-web/src/main/resources/vms/main/api.java.vm b/vboot-web/src/main/resources/vms/main/api.java.vm index b989f5b..251e7e7 100644 --- a/vboot-web/src/main/resources/vms/main/api.java.vm +++ b/vboot-web/src/main/resources/vms/main/api.java.vm @@ -25,12 +25,12 @@ public class ${table.bunam}Api { @PostMapping public R post(@RequestBody ${table.bunam} main) { - return R.ok(service.insert(main).getId()); + return R.ok(service.insert(main); } @PutMapping public R put(@RequestBody ${table.bunam} main) { - return R.ok(service.update(main).getId()); + return R.ok(service.update(main)); } @DeleteMapping("{ids}") diff --git a/vboot-web/src/test/java/vboot/test/WcTest.java b/vboot-web/src/test/java/vboot/test/WcTest.java deleted file mode 100644 index cbe85b4..0000000 --- a/vboot-web/src/test/java/vboot/test/WcTest.java +++ /dev/null @@ -1,117 +0,0 @@ -package vboot.test; - -import vboot.app.module.wc.palyer.main.WcPlayer; -import vboot.app.module.wc.palyer.main.WcPlayerRepo; -import vboot.app.module.wc.palyer.main.WcPlayerService; -import vboot.core.xutil.lang.XnumberUtil; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.math.BigDecimal; -import java.util.List; - - -@SpringBootTest -public class WcTest { - - @Test - public void parse(){ - service.crawlData("958022");//A组 俄罗斯 VS 沙特阿拉伯 - service.crawlData("958023");//A组 埃及 VS 乌拉圭 - service.crawlData("958024");//A组 俄罗斯 VS 埃及 - service.crawlData("958025");//A组 乌拉圭 VS 沙特阿拉伯 - service.crawlData("958027");//A组 沙特阿拉伯 VS 埃及 - service.crawlData("958026");//A组 乌拉圭 VS 俄罗斯 - - service.crawlData("958028");//B组 摩洛哥 VS 伊朗 - service.crawlData("958029");//B组 葡萄牙 VS 西班牙 - service.crawlData("958030");//B组 伊朗 VS 西班牙 - service.crawlData("958031");//B组 葡萄牙 VS 摩洛哥 - service.crawlData("958033");//B组 伊朗 VS 葡萄牙 - service.crawlData("958032");//B组 西班牙 VS 摩洛哥 - - service.crawlData("958034");//C组 法国 VS 澳大利亚 - service.crawlData("958035");//C组 秘鲁 VS 丹麦 - service.crawlData("958037");//C组 丹麦 VS 澳大利亚 - service.crawlData("958036");//C组 法国 VS 秘鲁 - service.crawlData("958039");//C组 澳大利亚 VS 秘鲁 - service.crawlData("958038");//C组 丹麦 VS 法国 - - service.crawlData("958041");//D组 阿根廷 VS 冰岛 - service.crawlData("958040");//D组 克罗地亚 VS 尼日利亚 - service.crawlData("958042");//D组 阿根廷 VS 克罗地亚 - service.crawlData("958043");//D组 尼日利亚 VS 冰岛 - service.crawlData("958044");//D组 冰岛 VS 克罗地亚 - service.crawlData("958045");//D组 尼日利亚 VS 阿根廷 - - service.crawlData("958046");//E组 巴西 VS 瑞士 - service.crawlData("958047");//E组 哥斯达黎加 VS 塞尔维亚 - service.crawlData("958049");//E组 巴西 VS 哥斯达黎加 - service.crawlData("958048");//E组 塞尔维亚 VS 瑞士 - service.crawlData("958050");//E组 塞尔维亚 VS 巴西 - service.crawlData("958051");//E组 瑞士 VS 哥斯达黎加 - - service.crawlData("958057");//F组 德国 VS 墨西哥 - service.crawlData("958056");//F组 瑞典 VS 韩国 - service.crawlData("958055");//F组 德国 VS 瑞典 - service.crawlData("958054");//F组 韩国 VS 墨西哥 - service.crawlData("958053");//F组 韩国 VS 德国 - service.crawlData("958052");//F组 墨西哥 VS 瑞典 - - service.crawlData("958058");//G组 比利时 VS 巴拿马 - service.crawlData("958059");//G组 突尼斯 VS 英格兰 - service.crawlData("958060");//G组 比利时 VS 突尼斯 - service.crawlData("958061");//G组 英格兰 VS 巴拿马 - service.crawlData("958062");//G组 英格兰 VS 比利时 - service.crawlData("958063");//G组 巴拿马 VS 突尼斯 - - service.crawlData("958069");//G组 哥伦比亚 VS 日本 - service.crawlData("958068");//G组 波兰 VS 塞内加尔 - service.crawlData("958066");//G组 日本 VS 塞内加尔 - service.crawlData("958067");//G组 波兰 VS 哥伦比亚 - service.crawlData("958065");//G组 日本 VS 波兰 - service.crawlData("958064");//G组 塞内加尔 VS 哥伦比亚 - - service.crawlData("958070");//16强 法国 VS 阿根廷 - service.crawlData("958071");//16强 乌拉圭 VS 葡萄牙 - service.crawlData("958072");//16强 西班牙 VS 俄罗斯 - service.crawlData("958073");//16强 克罗地亚 VS 丹麦 - service.crawlData("958075");//16强 巴西 VS 墨西哥 - service.crawlData("958074");//16强 比利时 VS 日本 - service.crawlData("958077");//16强 瑞典 VS 瑞士 - service.crawlData("958076");//16强 哥伦比亚 VS 英格兰 - - - service.crawlData("958078");//1/4决赛 乌拉圭 VS 法国 - service.crawlData("958079");//1/4决赛 巴西 VS 比利时 - service.crawlData("958081");//1/4决赛 瑞典 VS 英格兰 - service.crawlData("958080");//1/4决赛 俄罗斯 VS 克罗地亚 - - service.crawlData("958082");//半决赛 法国 VS 比利时 - service.crawlData("958083");//半决赛 克罗地亚 VS 英格兰 - - service.crawlData("958084");//半决赛 比利时 VS 英格兰 - service.crawlData("958085");//决赛 法国 VS 克罗地亚 - - } - - @Test - public void addWeekly(){ - List players = repo.findAll(); - for (WcPlayer player : players) { - player.setWeekly(XnumberUtil.getRandomBigDecimal(new BigDecimal(30),new BigDecimal(100))); - } - repo.saveAll(players); - - } - - @Autowired - private WcPlayerService service; - - @Autowired - private WcPlayerRepo repo; - - - -} \ No newline at end of file