From 8cd297821d8931dd9972c768396b1ad0a96ae2e0 Mon Sep 17 00:00:00 2001 From: limian Date: Fri, 3 Jul 2020 13:16:45 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=86=E8=87=AA=E5=8A=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96=EF=BC=8C?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=9A=84=E4=B8=AD=E6=96=87=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fc/test/model/custom/autocode/AutoCodeConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java index 5f1a9de..4ff7be1 100644 --- a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java +++ b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java @@ -41,7 +41,11 @@ public class AutoCodeConfig { */ public static Configuration getConfig() { try { - return new PropertiesConfiguration("auto_code/auto_code_config.properties" ); + final PropertiesConfiguration proCfing = new PropertiesConfiguration(); + proCfing.setEncoding("UTF-8"); + proCfing.load("auto_code/auto_code_config.properties"); + return proCfing; +// return new PropertiesConfiguration("auto_code/auto_code_config.properties" ); } catch (ConfigurationException e) { System.out.println("获取配置文件失败"); e.printStackTrace(); -- Gitee From a9c3d1f5099328d08729bec8871a2fe2eb033e01 Mon Sep 17 00:00:00 2001 From: limian Date: Fri, 3 Jul 2020 17:53:39 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 +- src/main/java/com/fc/SpringbootStart.java | 32 +- .../fc/test/controller/IndexController.java | 9 +- .../test/controller/gen/TestController.java | 167 +++++ .../com/fc/test/mapper/auto/TestMapper.java | 38 ++ .../java/com/fc/test/model/auto/Test.java | 105 +++ .../com/fc/test/model/auto/TestExample.java | 615 ++++++++++++++++++ .../java/com/fc/test/service/TestService.java | 138 ++++ src/main/resources/application-dev.yml | 120 ++-- src/main/resources/application-prod.yml | 4 +- src/main/resources/application.yml | 2 +- .../auto_code/auto_code_config.properties | 7 +- src/main/resources/banner.txt | 32 +- .../resources/mybatis/auto/TestMapper.xml | 256 ++++++++ .../static/admin/assets/css/signin.css | 3 +- .../static/admin/assets/css/style.css | 2 +- .../resources/templates/gen/test/add.html | 162 +++++ .../resources/templates/gen/test/edit.html | 134 ++++ .../resources/templates/gen/test/list.html | 249 +++++++ src/main/resources/templates/login.html | 31 +- 20 files changed, 1968 insertions(+), 146 deletions(-) create mode 100644 src/main/java/com/fc/test/controller/gen/TestController.java create mode 100644 src/main/java/com/fc/test/mapper/auto/TestMapper.java create mode 100644 src/main/java/com/fc/test/model/auto/Test.java create mode 100644 src/main/java/com/fc/test/model/auto/TestExample.java create mode 100644 src/main/java/com/fc/test/service/TestService.java create mode 100644 src/main/resources/mybatis/auto/TestMapper.xml create mode 100644 src/main/resources/templates/gen/test/add.html create mode 100644 src/main/resources/templates/gen/test/edit.html create mode 100644 src/main/resources/templates/gen/test/list.html diff --git a/pom.xml b/pom.xml index ad9bc56..b3cb804 100644 --- a/pom.xml +++ b/pom.xml @@ -66,20 +66,20 @@ pagehelper-spring-boot-starter 1.2.5 - + + mysql mysql-connector-java 8.0.11 - --> + diff --git a/src/main/java/com/fc/SpringbootStart.java b/src/main/java/com/fc/SpringbootStart.java index 492ed75..150ba38 100644 --- a/src/main/java/com/fc/SpringbootStart.java +++ b/src/main/java/com/fc/SpringbootStart.java @@ -16,36 +16,6 @@ public class SpringbootStart { public static void main(String[] args) { SpringApplication.run(SpringbootStart.class, args); - System.out.println("*******************************************\n" + - "* 码云地址 *\n" + - "* https://gitee.com/bdj/SpringBoot_v2 *\n" + - "* *\n" + - "*******************************************\n" + - " _.._ ,-------------------.\n" + - " ,' `. ( 启动成功！开启学习之旅！ )\n" + - " / __) __` \\ `-,-----------------'\n" + - " ( (`-`(-') ) _.-'\n" + - " /) \\ = / (\n" + - " /' |--' . \\\n" + - " ( ,---| `-.)__`\n" + - " )( `-.,--' _`-.\n" + - " '/,' ( Uu\",\n" + - " (_ , `/,-' )\n" + - " `.__, : `-'/ /`--'\n" + - " | `--' |\n" + - " ` `-._ /\n" + - " \\ (\n" + - " /\\ . \\. \n" + - " / |` \\ ,-\\\n" + - " / \\| .) / \\\n" + - " ( ,'|\\ ,' :\n" + - " | \\,`.`--\"/ }\n" + - " `,' \\ |,' /\n" + - " / \"-._ `-/ |\n" + - " \"-. \"-.,'| ;\n" + - " / _/[\"---'\"\"]\n" + - " : / |\"- '\n" + - " ' | /\n" + - " ` |"); + System.out.println(" ( 启动成功！开启学习之旅！ )\n"); } } diff --git a/src/main/java/com/fc/test/controller/IndexController.java b/src/main/java/com/fc/test/controller/IndexController.java index 895aff0..6d587fd 100644 --- a/src/main/java/com/fc/test/controller/IndexController.java +++ b/src/main/java/com/fc/test/controller/IndexController.java @@ -1,6 +1,7 @@ package com.fc.test.controller; import com.fc.test.common.base.BaseController; +import com.fc.test.common.conf.V2Config; import com.fc.test.model.custom.TitleVo; import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Controller; @@ -28,7 +29,10 @@ public class IndexController extends BaseController{ public String index(ModelMap map) { String str="前台"; setTitle(map, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); - return "index"; +// return "index"; + map.put("RollVerification", V2Config.getRollVerification()); + System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification()); + return "login"; } /** * 前台访问/index的get请求 @@ -42,6 +46,7 @@ public class IndexController extends BaseController{ public String index2(ModelMap map) { String str="前台"; setTitle(map, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); - return "index"; +// return "index"; + return "login"; } } diff --git a/src/main/java/com/fc/test/controller/gen/TestController.java b/src/main/java/com/fc/test/controller/gen/TestController.java new file mode 100644 index 0000000..7378cb9 --- /dev/null +++ b/src/main/java/com/fc/test/controller/gen/TestController.java @@ -0,0 +1,167 @@ +package com.fc.test.controller.gen; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.github.pagehelper.PageInfo; +import com.fc.test.common.base.BaseController; +import com.fc.test.common.domain.AjaxResult; +import com.fc.test.model.auto.Test; +import com.fc.test.model.custom.TableSplitResult; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.model.custom.TitleVo; +import com.fc.test.service.TestService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@Api(value = "测试表") +@Controller +@RequestMapping("/TestController") +public class TestController extends BaseController{ + + private String prefix = "gen/test"; + @Autowired + private TestService testService; + + /** + * 分页跳转 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") + @RequiresPermissions("gen:test:view") + public String view(ModelMap model) + { + String str="测试表"; + setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); + return prefix + "/list"; + } + + /** + * 分页查询 + */ + //@Log(title = "测试表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @PostMapping("/list") + @RequiresPermissions("gen:test:list") + @ResponseBody + public Object list(Tablepar tablepar,Test record){ + PageInfo page=testService.list(tablepar,record) ; + TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList()); + return result; + } + + /** + * 新增跳转 + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") + @GetMapping("/add") + public String add(ModelMap modelMap) + { + return prefix + "/add"; + } + + /** + * 新增 + */ + //@Log(title = "测试表新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:test:add") + @ResponseBody + public AjaxResult add(Test test){ + int b=testService.insertSelective(test); + if(b>0){ + return success(); + }else{ + return error(); + } + } + + /** + * 删除 + * @param ids + * @return + */ + //@Log(title = "测试表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @PostMapping("/remove") + @RequiresPermissions("gen:test:remove") + @ResponseBody + public AjaxResult remove(String ids){ + int b=testService.deleteByPrimaryKey(ids); + if(b>0){ + return success(); + }else{ + return error(); + } + } + + /** + * 检查Name + * @param tsysUser + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(Test test){ + int b=testService.checkNameUnique(test); + if(b>0){ + return 1; + }else{ + return 0; + } + } + + + /** + * 修改跳转 + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + mmap.put("Test", testService.selectByPrimaryKey(id)); + + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + //@Log(title = "测试表修改", action = "111") + @ApiOperation(value = "修改保存", notes = "修改保存") + @RequiresPermissions("gen:test:edit") + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(Test record) + { + return toAjax(testService.updateByPrimaryKeySelective(record)); + } + + + /** + * 根据主键查询 + * + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") + @PostMapping("/get/{id}") + public Test edit(@PathVariable("id") String id) { + return testService.selectByPrimaryKey(id); + } + + + +} diff --git a/src/main/java/com/fc/test/mapper/auto/TestMapper.java b/src/main/java/com/fc/test/mapper/auto/TestMapper.java new file mode 100644 index 0000000..f011385 --- /dev/null +++ b/src/main/java/com/fc/test/mapper/auto/TestMapper.java @@ -0,0 +1,38 @@ +package com.fc.test.mapper.auto; + +import com.fc.test.model.auto.Test; +import com.fc.test.model.auto.TestExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + * 测试表 TestMapper + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-03 13:09:35 + */ +public interface TestMapper { + + long countByExample(TestExample example); + + int deleteByExample(TestExample example); + + int deleteByPrimaryKey(String id); + + int insert(Test record); + + int insertSelective(Test record); + + List selectByExample(TestExample example); + + Test selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") Test record, @Param("example") TestExample example); + + int updateByExample(@Param("record") Test record, @Param("example") TestExample example); + + int updateByPrimaryKeySelective(Test record); + + int updateByPrimaryKey(Test record); + +} \ No newline at end of file diff --git a/src/main/java/com/fc/test/model/auto/Test.java b/src/main/java/com/fc/test/model/auto/Test.java new file mode 100644 index 0000000..f6118d2 --- /dev/null +++ b/src/main/java/com/fc/test/model/auto/Test.java @@ -0,0 +1,105 @@ +package com.fc.test.model.auto; + +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.lang.Integer; + +/** + * 测试表 Test + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-03 13:09:35 + */ + @ApiModel(value="Test", description="测试表") +public class Test implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** 主键 **/ + @ApiModelProperty(value = "主键") + private String id; + + /** 名称 **/ + @ApiModelProperty(value = "名称") + private String name; + + /** 年龄 **/ + @ApiModelProperty(value = "年龄") + private Integer age; + + /** 创建时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "创建时间") + private Date crateTime; + + /** 别名 **/ + @ApiModelProperty(value = "别名") + private String tesName; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + + public Date getCrateTime() { + return crateTime; + } + + public void setCrateTime(Date crateTime) { + this.crateTime = crateTime; + } + + + public String getTesName() { + return tesName; + } + + public void setTesName(String tesName) { + this.tesName = tesName; + } + + + public Test() { + super(); + } + + + public Test(String id,String name,Integer age,Date crateTime,String tesName) { + + this.id = id; + this.name = name; + this.age = age; + this.crateTime = crateTime; + this.tesName = tesName; + + } + +} \ No newline at end of file diff --git a/src/main/java/com/fc/test/model/auto/TestExample.java b/src/main/java/com/fc/test/model/auto/TestExample.java new file mode 100644 index 0000000..882a285 --- /dev/null +++ b/src/main/java/com/fc/test/model/auto/TestExample.java @@ -0,0 +1,615 @@ +package com.fc.test.model.auto; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import cn.hutool.core.util.StrUtil; +/** + * 测试表 TestExample + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-03 13:09:35 + */ +public class TestExample { + + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TestExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + + public Criteria andAgeIsNull() { + addCriterion("age is null"); + return (Criteria) this; + } + + public Criteria andAgeIsNotNull() { + addCriterion("age is not null"); + return (Criteria) this; + } + + public Criteria andAgeEqualTo(Integer value) { + addCriterion("age =", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotEqualTo(Integer value) { + addCriterion("age <>", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThan(Integer value) { + addCriterion("age >", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThanOrEqualTo(Integer value) { + addCriterion("age >=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThan(Integer value) { + addCriterion("age <", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThanOrEqualTo(Integer value) { + addCriterion("age <=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLike(Integer value) { + addCriterion("age like", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotLike(Integer value) { + addCriterion("age not like", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeIn(List values) { + addCriterion("age in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotIn(List values) { + addCriterion("age not in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeBetween(Integer value1, Integer value2) { + addCriterion("age between", value1, value2, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotBetween(Integer value1, Integer value2) { + addCriterion("age not between", value1, value2, "age"); + return (Criteria) this; + } + + + public Criteria andCrateTimeIsNull() { + addCriterion("crate_time is null"); + return (Criteria) this; + } + + public Criteria andCrateTimeIsNotNull() { + addCriterion("crate_time is not null"); + return (Criteria) this; + } + + public Criteria andCrateTimeEqualTo(Date value) { + addCriterion("crate_time =", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeNotEqualTo(Date value) { + addCriterion("crate_time <>", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeGreaterThan(Date value) { + addCriterion("crate_time >", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("crate_time >=", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeLessThan(Date value) { + addCriterion("crate_time <", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeLessThanOrEqualTo(Date value) { + addCriterion("crate_time <=", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeLike(Date value) { + addCriterion("crate_time like", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeNotLike(Date value) { + addCriterion("crate_time not like", value, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeIn(List values) { + addCriterion("crate_time in", values, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeNotIn(List values) { + addCriterion("crate_time not in", values, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeBetween(Date value1, Date value2) { + addCriterion("crate_time between", value1, value2, "crateTime"); + return (Criteria) this; + } + + public Criteria andCrateTimeNotBetween(Date value1, Date value2) { + addCriterion("crate_time not between", value1, value2, "crateTime"); + return (Criteria) this; + } + + + public Criteria andTesNameIsNull() { + addCriterion("tes_name is null"); + return (Criteria) this; + } + + public Criteria andTesNameIsNotNull() { + addCriterion("tes_name is not null"); + return (Criteria) this; + } + + public Criteria andTesNameEqualTo(String value) { + addCriterion("tes_name =", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameNotEqualTo(String value) { + addCriterion("tes_name <>", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameGreaterThan(String value) { + addCriterion("tes_name >", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameGreaterThanOrEqualTo(String value) { + addCriterion("tes_name >=", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameLessThan(String value) { + addCriterion("tes_name <", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameLessThanOrEqualTo(String value) { + addCriterion("tes_name <=", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameLike(String value) { + addCriterion("tes_name like", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameNotLike(String value) { + addCriterion("tes_name not like", value, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameIn(List values) { + addCriterion("tes_name in", values, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameNotIn(List values) { + addCriterion("tes_name not in", values, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameBetween(String value1, String value2) { + addCriterion("tes_name between", value1, value2, "tesName"); + return (Criteria) this; + } + + public Criteria andTesNameNotBetween(String value1, String value2) { + addCriterion("tes_name not between", value1, value2, "tesName"); + return (Criteria) this; + } + + + public Criteria andLikeQuery(Test record) { + List list= new ArrayList(); + List list2= new ArrayList(); + StringBuffer buffer=new StringBuffer(); + + if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) { + list.add("ifnull(id,'')"); + } + if(record.getName()!=null&&StrUtil.isNotEmpty(record.getName().toString())) { + list.add("ifnull(name,'')"); + } + if(record.getAge()!=null&&StrUtil.isNotEmpty(record.getAge().toString())) { + list.add("ifnull(age,'')"); + } + if(record.getCrateTime()!=null&&StrUtil.isNotEmpty(record.getCrateTime().toString())) { + list.add("ifnull(crate_time,'')"); + } + if(record.getTesName()!=null&&StrUtil.isNotEmpty(record.getTesName().toString())) { + list.add("ifnull(tes_name,'')"); + } + if(record.getId()!=null&&StrUtil.isNotEmpty(record.getId().toString())) { + list2.add("'%"+record.getId()+"%'"); + } + if(record.getName()!=null&&StrUtil.isNotEmpty(record.getName().toString())) { + list2.add("'%"+record.getName()+"%'"); + } + if(record.getAge()!=null&&StrUtil.isNotEmpty(record.getAge().toString())) { + list2.add("'%"+record.getAge()+"%'"); + } + if(record.getCrateTime()!=null&&StrUtil.isNotEmpty(record.getCrateTime().toString())) { + list2.add("'%"+record.getCrateTime()+"%'"); + } + if(record.getTesName()!=null&&StrUtil.isNotEmpty(record.getTesName().toString())) { + list2.add("'%"+record.getTesName()+"%'"); + } + + buffer.append(" CONCAT("); + buffer.append(StrUtil.join("",list)); + buffer.append(")"); + buffer.append("like CONCAT("); + + + buffer.append(StrUtil.join("",list2)); + + buffer.append(")"); + if(!" CONCAT()like CONCAT()".equals(buffer.toString())) { + addCriterion(buffer.toString()); + } + return (Criteria) this; + } + +} + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/fc/test/service/TestService.java b/src/main/java/com/fc/test/service/TestService.java new file mode 100644 index 0000000..dc93cfd --- /dev/null +++ b/src/main/java/com/fc/test/service/TestService.java @@ -0,0 +1,138 @@ +package com.fc.test.service; + +import java.util.List; +import java.util.Arrays; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import cn.hutool.core.util.StrUtil; +import com.fc.test.common.base.BaseService; +import com.fc.test.common.support.ConvertUtil; +import com.fc.test.mapper.auto.TestMapper; +import com.fc.test.model.auto.Test; +import com.fc.test.model.auto.TestExample; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.util.SnowflakeIdWorker; +import com.fc.test.util.StringUtils; + +/** + * 测试表 TestService + * @Title: TestService.java  + * @Package com.fc.test.service  + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-03 13:09:35   + **/ +@Service +public class TestService implements BaseService{ + @Autowired + private TestMapper testMapper; + + + /** + * 分页查询 + * @param pageNum + * @param pageSize + * @return + */ + public PageInfo list(Tablepar tablepar,Test record){ + TestExample testExample=new TestExample(); + testExample.createCriteria().andLikeQuery(record); + testExample.setOrderByClause("id ASC"); + if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { + testExample.setOrderByClause(StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) +" "+tablepar.getIsAsc()); + } + PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize()); + List list= testMapper.selectByExample(testExample); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + @Override + public int deleteByPrimaryKey(String ids) { + + List lista=ConvertUtil.toListStrArray(ids); + TestExample example=new TestExample(); + example.createCriteria().andIdIn(lista); + return testMapper.deleteByExample(example); + + + } + + + @Override + public Test selectByPrimaryKey(String id) { + + return testMapper.selectByPrimaryKey(id); + + } + + + @Override + public int updateByPrimaryKeySelective(Test record) { + return testMapper.updateByPrimaryKeySelective(record); + } + + + /** + * 添加 + */ + @Override + public int insertSelective(Test record) { + + //添加雪花主键id + record.setId(SnowflakeIdWorker.getUUID()); + + + return testMapper.insertSelective(record); + } + + + @Override + public int updateByExampleSelective(Test record, TestExample example) { + + return testMapper.updateByExampleSelective(record, example); + } + + + @Override + public int updateByExample(Test record, TestExample example) { + + return testMapper.updateByExample(record, example); + } + + @Override + public List selectByExample(TestExample example) { + + return testMapper.selectByExample(example); + } + + + @Override + public long countByExample(TestExample example) { + + return testMapper.countByExample(example); + } + + + @Override + public int deleteByExample(TestExample example) { + + return testMapper.deleteByExample(example); + } + + /** + * 检查name + * @param test + * @return + */ + public int checkNameUnique(Test test){ + TestExample example=new TestExample(); + example.createCriteria().andNameEqualTo(test.getName()); + List list=testMapper.selectByExample(example); + return list.size(); + } + + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c640b2f..149b58f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,71 +1,19 @@ #dev环境 mysql7.0 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver - #druid连接池配置 - druid: - #主库数据源 - master: - url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false - username: root - password: root - #备数据源 #关闭 - slave: - enabled: false - url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false - username: root - password: root - #配置初始化连接数大小 - initial-size: 10 - # 最大连接数 - max-active: 50 - #最小连接数 - min-idle: 10 - #获取连接等待超时时间 - max-wait: 5000 - pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。 - max-pool-prepared-statement-per-connection-size: 20 - validation-query: SELECT 1 FROM DUAL - validation-query-timeout: 20000 - test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 - test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 - test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 - time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - min-evictable-idle-time-millis: 300000 #一个连接在池中最小生存的时间，单位是毫秒 - #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定） - stat-view-servlet: - enabled: true - url-pattern: /druid/* - #可以增加访问账号密码【去掉注释就可以】 - #login-username: admin - #login-password: admin - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true - -#mysql 8.0 - #spring: # datasource: # type: com.alibaba.druid.pool.DruidDataSource -# driverClassName: com.mysql.cj.jdbc.Driver +# driverClassName: com.mysql.jdbc.Driver # #druid连接池配置 # druid: -# # 主库数据源 +# #主库数据源 # master: -# url: jdbc:mysql://localhost:3306/test?useSSL=false&serverTimezone=UTC +# url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false # username: root -# password: root -# #树熊数据源 +# password: 123456 +# #备数据源 #关闭 # slave: -# enabled : false -# url: jdbc:mysql://localhost:3306/test2?useSSL=false&serverTimezone=UTC +# enabled: false +# url: jdbc:mysql://localhost:3306/springbootv3?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false # username: root # password: root # #配置初始化连接数大小 @@ -99,4 +47,56 @@ spring: # merge-sql: true # wall: # config: -# multi-statement-allow: true \ No newline at end of file +# multi-statement-allow: true + +#mysql 8.0 + +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + #druid连接池配置 + druid: + # 主库数据源 + master: + url: jdbc:mysql://127.0.0.1:3306/springbootv2?useSSL=false&serverTimezone=GMT&characterEncoding=utf8 + username: root + password: 123456 + #树熊数据源 + slave: + enabled : false + url: jdbc:mysql://localhost:3306/springbootv2?useSSL=false&serverTimezone=UTC + username: root + password: root + #配置初始化连接数大小 + initial-size: 10 + # 最大连接数 + max-active: 50 + #最小连接数 + min-idle: 10 + #获取连接等待超时时间 + max-wait: 5000 + pool-prepared-statements: true #是否缓存preparedStatement，也就是PSCache。PSCache对支持游标的数据库性能提升巨大，比如说oracle。在mysql下建议关闭。 + max-pool-prepared-statement-per-connection-size: 20 + validation-query: SELECT 1 FROM DUAL + validation-query-timeout: 20000 + test-on-borrow: false #申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + test-on-return: false #归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 + test-while-idle: true #建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 + time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + min-evictable-idle-time-millis: 300000 #一个连接在池中最小生存的时间，单位是毫秒 + #StatViewServlet配置。（因为暴露的监控信息比较敏感，支持密码加密和访问ip限定） + stat-view-servlet: + enabled: true + url-pattern: /druid/* + #可以增加访问账号密码【去掉注释就可以】 + #login-username: admin + #login-password: admin + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 6c49eb6..b46c890 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -8,9 +8,9 @@ spring: druid: #主库数据源 master: - url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://47.115.58.27:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false username: root - password: root + password: 123456@mian #备数据源 #关闭 slave: enabled: false diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index aa5ea91..555d0c5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -27,7 +27,7 @@ fuce: rollVerification: true #tomcat config server : - port : 8080 + port : 8089 ##项目名字配置 #servlet : # context-path : /demo diff --git a/src/main/resources/auto_code/auto_code_config.properties b/src/main/resources/auto_code/auto_code_config.properties index e63c085..1a57b1f 100644 --- a/src/main/resources/auto_code/auto_code_config.properties +++ b/src/main/resources/auto_code/auto_code_config.properties @@ -11,7 +11,8 @@ globalConfig: # - dataName: test_code2 # aliasName: DDDDDDD #生成代码的项目路径 - parentPath: D:\\Users\\Administrator\\git\\SpringBoot_v3 +# parentPath: D:\\Users\\Administrator\\git\\SpringBoot_v3 + parentPath: F:\\学习项目代码\\SpringBoot_v2 #生成代码的父包 如父包是com.fc.test.test controller将在com.fc.test.test.controller下 bean 将在com.fc.test.test.bean下 ,service,dao同理 parentPack: com.fc.test #是否覆盖生成文件 如果为true将会把以前的文件覆盖掉 @@ -21,9 +22,9 @@ globalConfig: #是否生成swagger文档 默认true swagger: false #作者 - author: fuce + author: mian #电子邮箱 - email: 115889198@qq.com + email: mianli85@163.com #java在项目中的classpath位置 javaSource: src/main/java #resource位置 diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index 1e7f343..42994e6 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,35 +1,5 @@ ${AnsiColor.BRIGHT_BLUE} Application Version: ${fuce.version} Spring Boot Version: ${spring-boot.version} -*************************************** -* 码云地址 * -* https://gitee.com/bdj/SpringBoot_v2 * -* * -*************************************** - _.._ ,------------------------. - ,' `. ( SpringBoot_v2谁用谁知道! ) - / __) __` \ `-,----------------------` - ( (`-`(-') ) _.-' - /) \ = / ( - /' |--' . \ - ( ,---| `-.)__` - )( `-.,--' _`-. - '/,' ( Uu", - (_ , `/,-' ) - `.__, : `-'/ /`--' - | `--' | - ` `-._ / - \ ( - /\ . \. - / |` \ ,-\ - / \| .) / \ - ( ,'|\ ,' : - | \,`.`--"/ } - `,' \ |,' / - / "-._ `-/ | - "-. "-.,'| ; - / _/["---'""] - : / |"- ' - ' | / - ` | + ${AnsiColor.BLACK} \ No newline at end of file diff --git a/src/main/resources/mybatis/auto/TestMapper.xml b/src/main/resources/mybatis/auto/TestMapper.xml new file mode 100644 index 0000000..7c773c0 --- /dev/null +++ b/src/main/resources/mybatis/auto/TestMapper.xml @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, + name, + age, + crate_time, + tes_name + + + + + + delete from t_test + where id = #{id,jdbcType=VARCHAR} + + + delete from t_test + + + + + + + insert into t_test ( + id, + name, + age, + crate_time, + tes_name + ) + values ( + #{id,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{age,jdbcType=INTEGER}, + #{crateTime,jdbcType=TIMESTAMP}, + #{tesName,jdbcType=VARCHAR} + ) + + + + insert into t_test + + + + id, + + + + + name, + + + + + age, + + + + + crate_time, + + + + + tes_name, + + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{age,jdbcType=INTEGER}, + + + #{crateTime,jdbcType=TIMESTAMP}, + + + #{tesName,jdbcType=VARCHAR}, + + + + + + + + update t_test + + + id = #{record.id,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + age = #{record.age,jdbcType=INTEGER}, + + + crate_time = #{record.crateTime,jdbcType=TIMESTAMP}, + + + tes_name = #{record.tesName,jdbcType=VARCHAR}, + + + + + + + + + + + update t_test + set + id = #{record.id,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, + age = #{record.age,jdbcType=INTEGER}, + crate_time = #{record.crateTime,jdbcType=TIMESTAMP}, + tes_name = #{record.tesName,jdbcType=VARCHAR} + + + + + + + + update t_test + + + name = #{name,jdbcType=VARCHAR}, + + + age = #{age,jdbcType=INTEGER}, + + + crate_time = #{crateTime,jdbcType=TIMESTAMP}, + + + tes_name = #{tesName,jdbcType=VARCHAR}, + + + where + id = #{id,jdbcType=VARCHAR} + + + + + + + update t_test + set + name = #{name,jdbcType=VARCHAR}, + age = #{age,jdbcType=INTEGER}, + crate_time = #{crateTime,jdbcType=TIMESTAMP}, + tes_name = #{tesName,jdbcType=VARCHAR} + where + id = #{id,jdbcType=VARCHAR} + + + + + \ No newline at end of file diff --git a/src/main/resources/static/admin/assets/css/signin.css b/src/main/resources/static/admin/assets/css/signin.css index fd1a01d..eef3e7a 100644 --- a/src/main/resources/static/admin/assets/css/signin.css +++ b/src/main/resources/static/admin/assets/css/signin.css @@ -25,8 +25,9 @@ body { -o-background-size: cover; background-size: cover; } + #login-wrapper { - margin: 50px auto 0; + margin: 200px auto 0; position: relative; z-index: 5; } diff --git a/src/main/resources/static/admin/assets/css/style.css b/src/main/resources/static/admin/assets/css/style.css index e4b37d1..5bc6afb 100644 --- a/src/main/resources/static/admin/assets/css/style.css +++ b/src/main/resources/static/admin/assets/css/style.css @@ -11,7 +11,7 @@ font-family:'FontAwesome', sans-serif; } body { - color: #9ea7b3!important; + color: #000000!important; font-family:"Open Sans", Arial, sans-serif!important; font-size: 13px!important; line-height: 20px; diff --git a/src/main/resources/templates/gen/test/add.html b/src/main/resources/templates/gen/test/add.html new file mode 100644 index 0000000..3d3d5fd --- /dev/null +++ b/src/main/resources/templates/gen/test/add.html @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/gen/test/edit.html b/src/main/resources/templates/gen/test/edit.html new file mode 100644 index 0000000..ada050c --- /dev/null +++ b/src/main/resources/templates/gen/test/edit.html @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/gen/test/list.html b/src/main/resources/templates/gen/test/list.html new file mode 100644 index 0000000..639ad70 --- /dev/null +++ b/src/main/resources/templates/gen/test/list.html @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ +
+ +
+
+ + +
+
+
搜索条件
+
+ + + +
+
+ + + +
+
+ + +
+ + +
+
+
表单
+
+ + + +
+
+ + + +
+
+ +
+ + + + + +
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 908bebd..8409b96 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -5,7 +5,7 @@ SpringBoot_v2 - + @@ -55,13 +55,18 @@ .refreshIcon { top: -50px; font-size: 1.8rem; +} +.login-wrapper { + margin: 200px auto 0; + position: relative; + z-index: 5; }
- Fork me on Gitee +
@@ -70,12 +75,12 @@
-
+
-

SpringBoot - v2 +

工作任务管理 + v1

@@ -86,16 +91,16 @@
忘记账号? - +
忘记密码? - +
- +
@@ -113,6 +118,8 @@
+
+
+
@@ -232,12 +242,13 @@ $(document).ready(function(){ // 百度地图API功能 try { var map = new BMap.Map("test1"); - var point = new BMap.Point(106.475851,29.542392); + // var point = new BMap.Point(106.475851,29.542392); + var point = new BMap.Point(113.382393,22.521112); map.centerAndZoom(point, 10); var marker = new BMap.Marker(point); // 创建标注 map.addOverlay(marker); // 将标注添加到地图中 marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画 - map.setCurrentCity("重庆"); // 设置地图显示的城市 此项是必须设置的 + map.setCurrentCity("中山"); // 设置地图显示的城市 此项是必须设置的 map.enableScrollWheelZoom(true); //开启鼠标滚轮缩放 } catch (e) { -- Gitee From 76a412dba1d10fd74793d4202c6a14dbb0d1edbe Mon Sep 17 00:00:00 2001 From: limian Date: Mon, 6 Jul 2020 15:38:41 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/custom/autocode/AutoCodeConfig.java | 27 ++++++++++++++----- .../auto_code/auto_code_config.properties | 2 +- .../static/admin/assets/css/style.css | 20 +++++++++++--- .../templates/admin/common/html/footer.html | 15 ++++++----- 4 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java index 4ff7be1..511e6e1 100644 --- a/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java +++ b/src/main/java/com/fc/test/model/custom/autocode/AutoCodeConfig.java @@ -24,11 +24,27 @@ public class AutoCodeConfig { static { configuration=getConfig(); - - - - globalConfig =new GlobalConfig(null, configuration.getString("parentPack"), configuration.getString("parentPath"),configuration.getBoolean("cover"), - configuration.getBoolean("swagger"),configuration.getString("javaSource"),configuration.getString("resources"),configuration.getString("xmlPath"),configuration.getString("packageBean"),configuration.getString("packageDao"),configuration.getString("packageController"), configuration.getString("packageService"), configuration.getString("tablePrefix"),configuration.getBoolean("autoCode"), configuration.getBoolean("watchMobel"),configuration.getString("author"),configuration.getString("email")); + final String parentPack = configuration.getString("parentPack"); + final String parentPath = configuration.getString("parentPath"); + final Boolean cover = configuration.getBoolean("cover"); + final Boolean swagger = configuration.getBoolean("swagger"); + final String javaSource = configuration.getString("javaSource"); + final String resources = configuration.getString("resources"); + final String xmlPath = configuration.getString("xmlPath"); + final String packageBean = configuration.getString("packageBean"); + final String packageDao = configuration.getString("packageDao"); + final String packageController = configuration.getString("packageController"); + final String packageService = configuration.getString("packageService"); + final String tablePrefix = configuration.getString("tablePrefix"); + final Boolean autoCode = configuration.getBoolean("autoCode"); + final Boolean watchMobel = configuration.getBoolean("watchMobel"); + final String author = configuration.getString("author"); + final String email = configuration.getString("email"); + globalConfig =new GlobalConfig(null, parentPack, parentPath,cover, + swagger,javaSource,resources,xmlPath, + packageBean,packageDao,packageController, + packageService,tablePrefix,autoCode, + watchMobel,author,email); } public AutoCodeConfig() { super(); @@ -45,7 +61,6 @@ public class AutoCodeConfig { proCfing.setEncoding("UTF-8"); proCfing.load("auto_code/auto_code_config.properties"); return proCfing; -// return new PropertiesConfiguration("auto_code/auto_code_config.properties" ); } catch (ConfigurationException e) { System.out.println("获取配置文件失败"); e.printStackTrace(); diff --git a/src/main/resources/auto_code/auto_code_config.properties b/src/main/resources/auto_code/auto_code_config.properties index 1a57b1f..36855df 100644 --- a/src/main/resources/auto_code/auto_code_config.properties +++ b/src/main/resources/auto_code/auto_code_config.properties @@ -14,7 +14,7 @@ globalConfig: # parentPath: D:\\Users\\Administrator\\git\\SpringBoot_v3 parentPath: F:\\学习项目代码\\SpringBoot_v2 #生成代码的父包 如父包是com.fc.test.test controller将在com.fc.test.test.controller下 bean 将在com.fc.test.test.bean下 ,service,dao同理 - parentPack: com.fc.test + parentPack: com.zsess.taskmanage #是否覆盖生成文件 如果为true将会把以前的文件覆盖掉 cover: false #xml存放的文件夹默认 mybatisMapper diff --git a/src/main/resources/static/admin/assets/css/style.css b/src/main/resources/static/admin/assets/css/style.css index 5bc6afb..d4f62fe 100644 --- a/src/main/resources/static/admin/assets/css/style.css +++ b/src/main/resources/static/admin/assets/css/style.css @@ -453,10 +453,19 @@ input:-webkit-autofill, textarea:-webkit-autofill { border: 1px solid !important; border-radius: 4px; box-shadow: none !important; - color: #C7D5E0 !important; + color: #000000 !important; font-size: 13px !important; /* height: 31px !important; */ } +.form-control2 { + background-color: #FFFFFF; + background-image: none; + border: 1px solid !important; + border-radius: 4px; + box-shadow: none !important; + color: #C7D5E0 !important; + font-size: 13px !important; +} .form-update { background-color: #FFFFFF; background-image: none; @@ -784,7 +793,8 @@ img.ikon { #search input[type="text"] { background: url("../img/search-dark.png") no-repeat scroll 14px 10px #FFFFFF; border: 0 none; - color: #9EA7B3 !important; + /*color: #9EA7B3 !important;*/ + color: #000000 !important; width: 150px; padding: 6px 15px 6px 35px; -webkit-border-radius: 4px; @@ -1750,7 +1760,8 @@ ul.topnav h4 { padding: 15px 0 0; } .tittle-content-header { - color: #9EA7B3 !important; + /*color: #9EA7B3 !important;*/ + color: #000000 !important; font-family:"Open Sans"; font-size: 16px; font-weight: normal; @@ -1891,7 +1902,8 @@ img.sidebar-icon { border-bottom: 1px dotted #DDDDDD; } .nest .title-alt h6 { - color: #9EA7B3; + /*color: #9EA7B3;*/ + color: #000000; float: left; font-family:'Open Sans', serif; font-size: 14px; diff --git a/src/main/resources/templates/admin/common/html/footer.html b/src/main/resources/templates/admin/common/html/footer.html index b214b91..0929520 100644 --- a/src/main/resources/templates/admin/common/html/footer.html +++ b/src/main/resources/templates/admin/common/html/footer.html @@ -7,13 +7,14 @@

-
开发者:简 - 2018 - SrpringBoot-v2 进群备注springbootv2 - - star - -
+ + + + + + + +
-- Gitee From 84ef591d92d5e02c0f51942b4ec9a906cf50075a Mon Sep 17 00:00:00 2001 From: limian Date: Mon, 6 Jul 2020 16:56:05 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=85=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=90=8E=EF=BC=8C=E8=A6=81=E5=A2=9E=E5=8A=A0=E5=8C=85?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=89=AB=E6=8F=8F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fc/SpringbootStart.java | 6 ++++-- src/main/java/com/fc/test/common/conf/MybatisConfig.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fc/SpringbootStart.java b/src/main/java/com/fc/SpringbootStart.java index 150ba38..a256055 100644 --- a/src/main/java/com/fc/SpringbootStart.java +++ b/src/main/java/com/fc/SpringbootStart.java @@ -10,12 +10,14 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author fuce * */ -@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class, + scanBasePackages = {"com.fc.test","com.zsess.taskmanage"}) +// public class SpringbootStart { public static void main(String[] args) { SpringApplication.run(SpringbootStart.class, args); - System.out.println(" ( 启动成功！开启学习之旅！ )\n"); + System.out.println(" ( 启动成功！)\n"); } } diff --git a/src/main/java/com/fc/test/common/conf/MybatisConfig.java b/src/main/java/com/fc/test/common/conf/MybatisConfig.java index a26d616..eaf73f4 100644 --- a/src/main/java/com/fc/test/common/conf/MybatisConfig.java +++ b/src/main/java/com/fc/test/common/conf/MybatisConfig.java @@ -27,7 +27,7 @@ import com.fc.test.common.dataSources.DynamicDataSource; * @date 2019-12-06 21:11 */ @Configuration -@MapperScan(basePackages = "com.fc.test.mapper") +@MapperScan(basePackages = {"com.fc.test.mapper","com.zsess.taskmanage.mapper"}) public class MybatisConfig { @Bean -- Gitee From f7161efd931fecd4ee33029f1b1456a52cad46d1 Mon Sep 17 00:00:00 2001 From: limian Date: Mon, 6 Jul 2020 17:10:05 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=9E=E4=BD=93=E8=A1=A8t=5Ftaskinfo?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/gen/TaskinfoController.java | 166 +++ .../mapper/auto/TaskinfoMapper.java | 39 + .../zsess/taskmanage/model/auto/Taskinfo.java | 207 +++ .../model/auto/TaskinfoExample.java | 1154 +++++++++++++++++ .../taskmanage/service/TaskinfoService.java | 139 ++ src/main/resources/application.yml | 2 +- .../resources/mybatis/auto/TaskinfoMapper.xml | 396 ++++++ .../resources/templates/gen/taskinfo/add.html | 215 +++ .../templates/gen/taskinfo/edit.html | 190 +++ .../templates/gen/taskinfo/list.html | 319 +++++ 10 files changed, 2826 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zsess/taskmanage/controller/gen/TaskinfoController.java create mode 100644 src/main/java/com/zsess/taskmanage/mapper/auto/TaskinfoMapper.java create mode 100644 src/main/java/com/zsess/taskmanage/model/auto/Taskinfo.java create mode 100644 src/main/java/com/zsess/taskmanage/model/auto/TaskinfoExample.java create mode 100644 src/main/java/com/zsess/taskmanage/service/TaskinfoService.java create mode 100644 src/main/resources/mybatis/auto/TaskinfoMapper.xml create mode 100644 src/main/resources/templates/gen/taskinfo/add.html create mode 100644 src/main/resources/templates/gen/taskinfo/edit.html create mode 100644 src/main/resources/templates/gen/taskinfo/list.html diff --git a/src/main/java/com/zsess/taskmanage/controller/gen/TaskinfoController.java b/src/main/java/com/zsess/taskmanage/controller/gen/TaskinfoController.java new file mode 100644 index 0000000..3dee982 --- /dev/null +++ b/src/main/java/com/zsess/taskmanage/controller/gen/TaskinfoController.java @@ -0,0 +1,166 @@ +package com.zsess.taskmanage.controller.gen; + +import com.fc.test.common.base.BaseController; +import com.fc.test.common.domain.AjaxResult; +import com.fc.test.model.custom.TableSplitResult; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.model.custom.TitleVo; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.github.pagehelper.PageInfo; +import com.zsess.taskmanage.model.auto.Taskinfo; +import com.zsess.taskmanage.service.TaskinfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + +@Api(value = "任务信息主表") +@Controller +@RequestMapping("/TaskinfoController") +public class TaskinfoController extends BaseController { + + private String prefix = "gen/taskinfo"; + @Autowired + private TaskinfoService taskinfoService; + + /** + * 分页跳转 + */ + @ApiOperation(value = "分页跳转", notes = "分页跳转") + @GetMapping("/view") +// @RequiresPermissions("gen:taskinfo:view") + public String view(ModelMap model) + { + String str="任务信息主表"; + setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); + return prefix + "/list"; + } + + /** + * 分页查询 + */ + //@Log(title = "任务信息主表集合查询", action = "111") + @ApiOperation(value = "分页查询", notes = "分页查询") + @PostMapping("/list") + @RequiresPermissions("gen:taskinfo:list") + @ResponseBody + public Object list(Tablepar tablepar, Taskinfo record){ + PageInfo page=taskinfoService.list(tablepar,record) ; + TableSplitResult result=new TableSplitResult(page.getPageNum(), page.getTotal(), page.getList()); + return result; + } + + /** + * 新增跳转 + */ + @ApiOperation(value = "新增跳转", notes = "新增跳转") + @GetMapping("/add") + public String add(ModelMap modelMap) + { + return prefix + "/add"; + } + + /** + * 新增 + */ + //@Log(title = "任务信息主表新增", action = "111") + @ApiOperation(value = "新增", notes = "新增") + @PostMapping("/add") + @RequiresPermissions("gen:taskinfo:add") + @ResponseBody + public AjaxResult add(Taskinfo taskinfo){ + int b=taskinfoService.insertSelective(taskinfo); + if(b>0){ + return success(); + }else{ + return error(); + } + } + + /** + * 删除 + * @param ids + * @return + */ + //@Log(title = "任务信息主表删除", action = "111") + @ApiOperation(value = "删除", notes = "删除") + @PostMapping("/remove") + @RequiresPermissions("gen:taskinfo:remove") + @ResponseBody + public AjaxResult remove(String ids){ + int b=taskinfoService.deleteByPrimaryKey(ids); + if(b>0){ + return success(); + }else{ + return error(); + } + } + + /** + * 检查Name + * @param taskinfo + * @return + */ + @ApiOperation(value = "检查Name唯一", notes = "检查Name唯一") + @PostMapping("/checkNameUnique") + @ResponseBody + public int checkNameUnique(Taskinfo taskinfo){ + int b=taskinfoService.checkNameUnique(taskinfo); + if(b>0){ + return 1; + }else{ + return 0; + } + } + + + /** + * 修改跳转 + * @param id + * @param mmap + * @return + */ + @ApiOperation(value = "修改跳转", notes = "修改跳转") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + mmap.put("Taskinfo", taskinfoService.selectByPrimaryKey(id)); + + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + //@Log(title = "任务信息主表修改", action = "111") + @ApiOperation(value = "修改保存", notes = "修改保存") + @RequiresPermissions("gen:taskinfo:edit") + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(Taskinfo record) + { + return toAjax(taskinfoService.updateByPrimaryKeySelective(record)); + } + + + /** + * 根据主键查询 + * + * @param id + * @return + */ + @ApiOperation(value = "根据id查询唯一", notes = "根据id查询唯一") + @PostMapping("/get/{id}") + public Taskinfo edit(@PathVariable("id") String id) { + return taskinfoService.selectByPrimaryKey(id); + } + + + +} diff --git a/src/main/java/com/zsess/taskmanage/mapper/auto/TaskinfoMapper.java b/src/main/java/com/zsess/taskmanage/mapper/auto/TaskinfoMapper.java new file mode 100644 index 0000000..168875d --- /dev/null +++ b/src/main/java/com/zsess/taskmanage/mapper/auto/TaskinfoMapper.java @@ -0,0 +1,39 @@ +package com.zsess.taskmanage.mapper.auto; +// com.zsess.taskmanage.mapper.auto.TaskinfoMapper + +import com.zsess.taskmanage.model.auto.Taskinfo; +import com.zsess.taskmanage.model.auto.TaskinfoExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +/** + * 任务信息主表 TaskinfoMapper + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-06 15:25:56 + */ +public interface TaskinfoMapper { + + long countByExample(TaskinfoExample example); + + int deleteByExample(TaskinfoExample example); + + int deleteByPrimaryKey(String id); + + int insert(Taskinfo record); + + int insertSelective(Taskinfo record); + + List selectByExample(TaskinfoExample example); + + Taskinfo selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") Taskinfo record, @Param("example") TaskinfoExample example); + + int updateByExample(@Param("record") Taskinfo record, @Param("example") TaskinfoExample example); + + int updateByPrimaryKeySelective(Taskinfo record); + + int updateByPrimaryKey(Taskinfo record); + +} \ No newline at end of file diff --git a/src/main/java/com/zsess/taskmanage/model/auto/Taskinfo.java b/src/main/java/com/zsess/taskmanage/model/auto/Taskinfo.java new file mode 100644 index 0000000..ff5501f --- /dev/null +++ b/src/main/java/com/zsess/taskmanage/model/auto/Taskinfo.java @@ -0,0 +1,207 @@ +package com.zsess.taskmanage.model.auto; + +import java.io.Serializable; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.lang.Long; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.lang.Integer; + +/** + * 任务信息主表 Taskinfo + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-06 15:25:56 + */ + @ApiModel(value="Taskinfo", description="任务信息主表") +public class Taskinfo implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** 任务ID **/ + @ApiModelProperty(value = "任务ID") + private String taskid; + + /** 任务名称 **/ + @ApiModelProperty(value = "任务名称") + private String taskname; + + /** 任务描述 **/ + @ApiModelProperty(value = "任务描述") + private String taskdesc; + + /** 任务开始日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "任务开始日期") + private Date begindate; + + /** 任务完成日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "任务完成日期") + private Date enddate; + + /** 汇报频率 **/ + @ApiModelProperty(value = "汇报频率") + private Long freqid; + + /** 新增时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "新增时间") + private Date createtime; + + /** 更新时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @ApiModelProperty(value = "更新时间") + private Date updatetime; + + /** 任务发布人 **/ + @ApiModelProperty(value = "任务发布人") + private Long userid; + + /** 任务接收部门 **/ + @ApiModelProperty(value = "任务接收部门") + private Long reciveDeptid; + + /** 任务执行人 **/ + @ApiModelProperty(value = "任务执行人") + private Long reciveUserid; + + /** 任务状态ID aoa_status_list.status_id **/ + @ApiModelProperty(value = "任务状态ID aoa_status_list.status_id") + private Integer statusid; + + + public String getTaskid() { + return taskid; + } + + public void setTaskid(String taskid) { + this.taskid = taskid; + } + + + public String getTaskname() { + return taskname; + } + + public void setTaskname(String taskname) { + this.taskname = taskname; + } + + + public String getTaskdesc() { + return taskdesc; + } + + public void setTaskdesc(String taskdesc) { + this.taskdesc = taskdesc; + } + + + public Date getBegindate() { + return begindate; + } + + public void setBegindate(Date begindate) { + this.begindate = begindate; + } + + + public Date getEnddate() { + return enddate; + } + + public void setEnddate(Date enddate) { + this.enddate = enddate; + } + + + public Long getFreqid() { + return freqid; + } + + public void setFreqid(Long freqid) { + this.freqid = freqid; + } + + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + + public Date getUpdatetime() { + return updatetime; + } + + public void setUpdatetime(Date updatetime) { + this.updatetime = updatetime; + } + + + public Long getUserid() { + return userid; + } + + public void setUserid(Long userid) { + this.userid = userid; + } + + + public Long getReciveDeptid() { + return reciveDeptid; + } + + public void setReciveDeptid(Long reciveDeptid) { + this.reciveDeptid = reciveDeptid; + } + + + public Long getReciveUserid() { + return reciveUserid; + } + + public void setReciveUserid(Long reciveUserid) { + this.reciveUserid = reciveUserid; + } + + + public Integer getStatusid() { + return statusid; + } + + public void setStatusid(Integer statusid) { + this.statusid = statusid; + } + + + public Taskinfo() { + super(); + } + + + public Taskinfo(String taskid,String taskname,String taskdesc,Date begindate,Date enddate,Long freqid,Date createtime,Date updatetime,Long userid,Long reciveDeptid,Long reciveUserid,Integer statusid) { + + this.taskid = taskid; + this.taskname = taskname; + this.taskdesc = taskdesc; + this.begindate = begindate; + this.enddate = enddate; + this.freqid = freqid; + this.createtime = createtime; + this.updatetime = updatetime; + this.userid = userid; + this.reciveDeptid = reciveDeptid; + this.reciveUserid = reciveUserid; + this.statusid = statusid; + + } + +} \ No newline at end of file diff --git a/src/main/java/com/zsess/taskmanage/model/auto/TaskinfoExample.java b/src/main/java/com/zsess/taskmanage/model/auto/TaskinfoExample.java new file mode 100644 index 0000000..9715d86 --- /dev/null +++ b/src/main/java/com/zsess/taskmanage/model/auto/TaskinfoExample.java @@ -0,0 +1,1154 @@ +package com.zsess.taskmanage.model.auto; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import cn.hutool.core.util.StrUtil; +/** + * 任务信息主表 TaskinfoExample + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-06 15:25:56 + */ +public class TaskinfoExample { + + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TaskinfoExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andTaskidIsNull() { + addCriterion("taskid is null"); + return (Criteria) this; + } + + public Criteria andTaskidIsNotNull() { + addCriterion("taskid is not null"); + return (Criteria) this; + } + + public Criteria andTaskidEqualTo(String value) { + addCriterion("taskid =", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidNotEqualTo(String value) { + addCriterion("taskid <>", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidGreaterThan(String value) { + addCriterion("taskid >", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidGreaterThanOrEqualTo(String value) { + addCriterion("taskid >=", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidLessThan(String value) { + addCriterion("taskid <", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidLessThanOrEqualTo(String value) { + addCriterion("taskid <=", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidLike(String value) { + addCriterion("taskid like", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidNotLike(String value) { + addCriterion("taskid not like", value, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidIn(List values) { + addCriterion("taskid in", values, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidNotIn(List values) { + addCriterion("taskid not in", values, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidBetween(String value1, String value2) { + addCriterion("taskid between", value1, value2, "taskid"); + return (Criteria) this; + } + + public Criteria andTaskidNotBetween(String value1, String value2) { + addCriterion("taskid not between", value1, value2, "taskid"); + return (Criteria) this; + } + + + public Criteria andTasknameIsNull() { + addCriterion("taskname is null"); + return (Criteria) this; + } + + public Criteria andTasknameIsNotNull() { + addCriterion("taskname is not null"); + return (Criteria) this; + } + + public Criteria andTasknameEqualTo(String value) { + addCriterion("taskname =", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameNotEqualTo(String value) { + addCriterion("taskname <>", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameGreaterThan(String value) { + addCriterion("taskname >", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameGreaterThanOrEqualTo(String value) { + addCriterion("taskname >=", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameLessThan(String value) { + addCriterion("taskname <", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameLessThanOrEqualTo(String value) { + addCriterion("taskname <=", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameLike(String value) { + addCriterion("taskname like", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameNotLike(String value) { + addCriterion("taskname not like", value, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameIn(List values) { + addCriterion("taskname in", values, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameNotIn(List values) { + addCriterion("taskname not in", values, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameBetween(String value1, String value2) { + addCriterion("taskname between", value1, value2, "taskname"); + return (Criteria) this; + } + + public Criteria andTasknameNotBetween(String value1, String value2) { + addCriterion("taskname not between", value1, value2, "taskname"); + return (Criteria) this; + } + + + public Criteria andTaskdescIsNull() { + addCriterion("taskdesc is null"); + return (Criteria) this; + } + + public Criteria andTaskdescIsNotNull() { + addCriterion("taskdesc is not null"); + return (Criteria) this; + } + + public Criteria andTaskdescEqualTo(String value) { + addCriterion("taskdesc =", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescNotEqualTo(String value) { + addCriterion("taskdesc <>", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescGreaterThan(String value) { + addCriterion("taskdesc >", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescGreaterThanOrEqualTo(String value) { + addCriterion("taskdesc >=", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescLessThan(String value) { + addCriterion("taskdesc <", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescLessThanOrEqualTo(String value) { + addCriterion("taskdesc <=", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescLike(String value) { + addCriterion("taskdesc like", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescNotLike(String value) { + addCriterion("taskdesc not like", value, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescIn(List values) { + addCriterion("taskdesc in", values, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescNotIn(List values) { + addCriterion("taskdesc not in", values, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescBetween(String value1, String value2) { + addCriterion("taskdesc between", value1, value2, "taskdesc"); + return (Criteria) this; + } + + public Criteria andTaskdescNotBetween(String value1, String value2) { + addCriterion("taskdesc not between", value1, value2, "taskdesc"); + return (Criteria) this; + } + + + public Criteria andBegindateIsNull() { + addCriterion("begindate is null"); + return (Criteria) this; + } + + public Criteria andBegindateIsNotNull() { + addCriterion("begindate is not null"); + return (Criteria) this; + } + + public Criteria andBegindateEqualTo(Date value) { + addCriterion("begindate =", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateNotEqualTo(Date value) { + addCriterion("begindate <>", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateGreaterThan(Date value) { + addCriterion("begindate >", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateGreaterThanOrEqualTo(Date value) { + addCriterion("begindate >=", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateLessThan(Date value) { + addCriterion("begindate <", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateLessThanOrEqualTo(Date value) { + addCriterion("begindate <=", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateLike(Date value) { + addCriterion("begindate like", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateNotLike(Date value) { + addCriterion("begindate not like", value, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateIn(List values) { + addCriterion("begindate in", values, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateNotIn(List values) { + addCriterion("begindate not in", values, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateBetween(Date value1, Date value2) { + addCriterion("begindate between", value1, value2, "begindate"); + return (Criteria) this; + } + + public Criteria andBegindateNotBetween(Date value1, Date value2) { + addCriterion("begindate not between", value1, value2, "begindate"); + return (Criteria) this; + } + + + public Criteria andEnddateIsNull() { + addCriterion("enddate is null"); + return (Criteria) this; + } + + public Criteria andEnddateIsNotNull() { + addCriterion("enddate is not null"); + return (Criteria) this; + } + + public Criteria andEnddateEqualTo(Date value) { + addCriterion("enddate =", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateNotEqualTo(Date value) { + addCriterion("enddate <>", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateGreaterThan(Date value) { + addCriterion("enddate >", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateGreaterThanOrEqualTo(Date value) { + addCriterion("enddate >=", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateLessThan(Date value) { + addCriterion("enddate <", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateLessThanOrEqualTo(Date value) { + addCriterion("enddate <=", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateLike(Date value) { + addCriterion("enddate like", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateNotLike(Date value) { + addCriterion("enddate not like", value, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateIn(List values) { + addCriterion("enddate in", values, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateNotIn(List values) { + addCriterion("enddate not in", values, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateBetween(Date value1, Date value2) { + addCriterion("enddate between", value1, value2, "enddate"); + return (Criteria) this; + } + + public Criteria andEnddateNotBetween(Date value1, Date value2) { + addCriterion("enddate not between", value1, value2, "enddate"); + return (Criteria) this; + } + + + public Criteria andFreqidIsNull() { + addCriterion("freqid is null"); + return (Criteria) this; + } + + public Criteria andFreqidIsNotNull() { + addCriterion("freqid is not null"); + return (Criteria) this; + } + + public Criteria andFreqidEqualTo(Long value) { + addCriterion("freqid =", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidNotEqualTo(Long value) { + addCriterion("freqid <>", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidGreaterThan(Long value) { + addCriterion("freqid >", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidGreaterThanOrEqualTo(Long value) { + addCriterion("freqid >=", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidLessThan(Long value) { + addCriterion("freqid <", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidLessThanOrEqualTo(Long value) { + addCriterion("freqid <=", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidLike(Long value) { + addCriterion("freqid like", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidNotLike(Long value) { + addCriterion("freqid not like", value, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidIn(List values) { + addCriterion("freqid in", values, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidNotIn(List values) { + addCriterion("freqid not in", values, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidBetween(Long value1, Long value2) { + addCriterion("freqid between", value1, value2, "freqid"); + return (Criteria) this; + } + + public Criteria andFreqidNotBetween(Long value1, Long value2) { + addCriterion("freqid not between", value1, value2, "freqid"); + return (Criteria) this; + } + + + public Criteria andCreatetimeIsNull() { + addCriterion("createtime is null"); + return (Criteria) this; + } + + public Criteria andCreatetimeIsNotNull() { + addCriterion("createtime is not null"); + return (Criteria) this; + } + + public Criteria andCreatetimeEqualTo(Date value) { + addCriterion("createtime =", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeNotEqualTo(Date value) { + addCriterion("createtime <>", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeGreaterThan(Date value) { + addCriterion("createtime >", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) { + addCriterion("createtime >=", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeLessThan(Date value) { + addCriterion("createtime <", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeLessThanOrEqualTo(Date value) { + addCriterion("createtime <=", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeLike(Date value) { + addCriterion("createtime like", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeNotLike(Date value) { + addCriterion("createtime not like", value, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeIn(List values) { + addCriterion("createtime in", values, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeNotIn(List values) { + addCriterion("createtime not in", values, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeBetween(Date value1, Date value2) { + addCriterion("createtime between", value1, value2, "createtime"); + return (Criteria) this; + } + + public Criteria andCreatetimeNotBetween(Date value1, Date value2) { + addCriterion("createtime not between", value1, value2, "createtime"); + return (Criteria) this; + } + + + public Criteria andUpdatetimeIsNull() { + addCriterion("updatetime is null"); + return (Criteria) this; + } + + public Criteria andUpdatetimeIsNotNull() { + addCriterion("updatetime is not null"); + return (Criteria) this; + } + + public Criteria andUpdatetimeEqualTo(Date value) { + addCriterion("updatetime =", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeNotEqualTo(Date value) { + addCriterion("updatetime <>", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeGreaterThan(Date value) { + addCriterion("updatetime >", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) { + addCriterion("updatetime >=", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeLessThan(Date value) { + addCriterion("updatetime <", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeLessThanOrEqualTo(Date value) { + addCriterion("updatetime <=", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeLike(Date value) { + addCriterion("updatetime like", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeNotLike(Date value) { + addCriterion("updatetime not like", value, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeIn(List values) { + addCriterion("updatetime in", values, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeNotIn(List values) { + addCriterion("updatetime not in", values, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeBetween(Date value1, Date value2) { + addCriterion("updatetime between", value1, value2, "updatetime"); + return (Criteria) this; + } + + public Criteria andUpdatetimeNotBetween(Date value1, Date value2) { + addCriterion("updatetime not between", value1, value2, "updatetime"); + return (Criteria) this; + } + + + public Criteria andUseridIsNull() { + addCriterion("userid is null"); + return (Criteria) this; + } + + public Criteria andUseridIsNotNull() { + addCriterion("userid is not null"); + return (Criteria) this; + } + + public Criteria andUseridEqualTo(Long value) { + addCriterion("userid =", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridNotEqualTo(Long value) { + addCriterion("userid <>", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridGreaterThan(Long value) { + addCriterion("userid >", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridGreaterThanOrEqualTo(Long value) { + addCriterion("userid >=", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridLessThan(Long value) { + addCriterion("userid <", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridLessThanOrEqualTo(Long value) { + addCriterion("userid <=", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridLike(Long value) { + addCriterion("userid like", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridNotLike(Long value) { + addCriterion("userid not like", value, "userid"); + return (Criteria) this; + } + + public Criteria andUseridIn(List values) { + addCriterion("userid in", values, "userid"); + return (Criteria) this; + } + + public Criteria andUseridNotIn(List values) { + addCriterion("userid not in", values, "userid"); + return (Criteria) this; + } + + public Criteria andUseridBetween(Long value1, Long value2) { + addCriterion("userid between", value1, value2, "userid"); + return (Criteria) this; + } + + public Criteria andUseridNotBetween(Long value1, Long value2) { + addCriterion("userid not between", value1, value2, "userid"); + return (Criteria) this; + } + + + public Criteria andReciveDeptidIsNull() { + addCriterion("recive_deptid is null"); + return (Criteria) this; + } + + public Criteria andReciveDeptidIsNotNull() { + addCriterion("recive_deptid is not null"); + return (Criteria) this; + } + + public Criteria andReciveDeptidEqualTo(Long value) { + addCriterion("recive_deptid =", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidNotEqualTo(Long value) { + addCriterion("recive_deptid <>", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidGreaterThan(Long value) { + addCriterion("recive_deptid >", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidGreaterThanOrEqualTo(Long value) { + addCriterion("recive_deptid >=", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidLessThan(Long value) { + addCriterion("recive_deptid <", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidLessThanOrEqualTo(Long value) { + addCriterion("recive_deptid <=", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidLike(Long value) { + addCriterion("recive_deptid like", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidNotLike(Long value) { + addCriterion("recive_deptid not like", value, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidIn(List values) { + addCriterion("recive_deptid in", values, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidNotIn(List values) { + addCriterion("recive_deptid not in", values, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidBetween(Long value1, Long value2) { + addCriterion("recive_deptid between", value1, value2, "reciveDeptid"); + return (Criteria) this; + } + + public Criteria andReciveDeptidNotBetween(Long value1, Long value2) { + addCriterion("recive_deptid not between", value1, value2, "reciveDeptid"); + return (Criteria) this; + } + + + public Criteria andReciveUseridIsNull() { + addCriterion("recive_userid is null"); + return (Criteria) this; + } + + public Criteria andReciveUseridIsNotNull() { + addCriterion("recive_userid is not null"); + return (Criteria) this; + } + + public Criteria andReciveUseridEqualTo(Long value) { + addCriterion("recive_userid =", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridNotEqualTo(Long value) { + addCriterion("recive_userid <>", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridGreaterThan(Long value) { + addCriterion("recive_userid >", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridGreaterThanOrEqualTo(Long value) { + addCriterion("recive_userid >=", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridLessThan(Long value) { + addCriterion("recive_userid <", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridLessThanOrEqualTo(Long value) { + addCriterion("recive_userid <=", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridLike(Long value) { + addCriterion("recive_userid like", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridNotLike(Long value) { + addCriterion("recive_userid not like", value, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridIn(List values) { + addCriterion("recive_userid in", values, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridNotIn(List values) { + addCriterion("recive_userid not in", values, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridBetween(Long value1, Long value2) { + addCriterion("recive_userid between", value1, value2, "reciveUserid"); + return (Criteria) this; + } + + public Criteria andReciveUseridNotBetween(Long value1, Long value2) { + addCriterion("recive_userid not between", value1, value2, "reciveUserid"); + return (Criteria) this; + } + + + public Criteria andStatusidIsNull() { + addCriterion("statusid is null"); + return (Criteria) this; + } + + public Criteria andStatusidIsNotNull() { + addCriterion("statusid is not null"); + return (Criteria) this; + } + + public Criteria andStatusidEqualTo(Integer value) { + addCriterion("statusid =", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidNotEqualTo(Integer value) { + addCriterion("statusid <>", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidGreaterThan(Integer value) { + addCriterion("statusid >", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidGreaterThanOrEqualTo(Integer value) { + addCriterion("statusid >=", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidLessThan(Integer value) { + addCriterion("statusid <", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidLessThanOrEqualTo(Integer value) { + addCriterion("statusid <=", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidLike(Integer value) { + addCriterion("statusid like", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidNotLike(Integer value) { + addCriterion("statusid not like", value, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidIn(List values) { + addCriterion("statusid in", values, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidNotIn(List values) { + addCriterion("statusid not in", values, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidBetween(Integer value1, Integer value2) { + addCriterion("statusid between", value1, value2, "statusid"); + return (Criteria) this; + } + + public Criteria andStatusidNotBetween(Integer value1, Integer value2) { + addCriterion("statusid not between", value1, value2, "statusid"); + return (Criteria) this; + } + + + public Criteria andLikeQuery(Taskinfo record) { + List list= new ArrayList(); + List list2= new ArrayList(); + StringBuffer buffer=new StringBuffer(); + + if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) { + list.add("ifnull(taskid,'')"); + } + if(record.getTaskname()!=null&&StrUtil.isNotEmpty(record.getTaskname().toString())) { + list.add("ifnull(taskname,'')"); + } + if(record.getTaskdesc()!=null&&StrUtil.isNotEmpty(record.getTaskdesc().toString())) { + list.add("ifnull(taskdesc,'')"); + } + if(record.getBegindate()!=null&&StrUtil.isNotEmpty(record.getBegindate().toString())) { + list.add("ifnull(begindate,'')"); + } + if(record.getEnddate()!=null&&StrUtil.isNotEmpty(record.getEnddate().toString())) { + list.add("ifnull(enddate,'')"); + } + if(record.getFreqid()!=null&&StrUtil.isNotEmpty(record.getFreqid().toString())) { + list.add("ifnull(freqid,'')"); + } + if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) { + list.add("ifnull(createtime,'')"); + } + if(record.getUpdatetime()!=null&&StrUtil.isNotEmpty(record.getUpdatetime().toString())) { + list.add("ifnull(updatetime,'')"); + } + if(record.getUserid()!=null&&StrUtil.isNotEmpty(record.getUserid().toString())) { + list.add("ifnull(userid,'')"); + } + if(record.getReciveDeptid()!=null&&StrUtil.isNotEmpty(record.getReciveDeptid().toString())) { + list.add("ifnull(recive_deptid,'')"); + } + if(record.getReciveUserid()!=null&&StrUtil.isNotEmpty(record.getReciveUserid().toString())) { + list.add("ifnull(recive_userid,'')"); + } + if(record.getStatusid()!=null&&StrUtil.isNotEmpty(record.getStatusid().toString())) { + list.add("ifnull(statusid,'')"); + } + if(record.getTaskid()!=null&&StrUtil.isNotEmpty(record.getTaskid().toString())) { + list2.add("'%"+record.getTaskid()+"%'"); + } + if(record.getTaskname()!=null&&StrUtil.isNotEmpty(record.getTaskname().toString())) { + list2.add("'%"+record.getTaskname()+"%'"); + } + if(record.getTaskdesc()!=null&&StrUtil.isNotEmpty(record.getTaskdesc().toString())) { + list2.add("'%"+record.getTaskdesc()+"%'"); + } + if(record.getBegindate()!=null&&StrUtil.isNotEmpty(record.getBegindate().toString())) { + list2.add("'%"+record.getBegindate()+"%'"); + } + if(record.getEnddate()!=null&&StrUtil.isNotEmpty(record.getEnddate().toString())) { + list2.add("'%"+record.getEnddate()+"%'"); + } + if(record.getFreqid()!=null&&StrUtil.isNotEmpty(record.getFreqid().toString())) { + list2.add("'%"+record.getFreqid()+"%'"); + } + if(record.getCreatetime()!=null&&StrUtil.isNotEmpty(record.getCreatetime().toString())) { + list2.add("'%"+record.getCreatetime()+"%'"); + } + if(record.getUpdatetime()!=null&&StrUtil.isNotEmpty(record.getUpdatetime().toString())) { + list2.add("'%"+record.getUpdatetime()+"%'"); + } + if(record.getUserid()!=null&&StrUtil.isNotEmpty(record.getUserid().toString())) { + list2.add("'%"+record.getUserid()+"%'"); + } + if(record.getReciveDeptid()!=null&&StrUtil.isNotEmpty(record.getReciveDeptid().toString())) { + list2.add("'%"+record.getReciveDeptid()+"%'"); + } + if(record.getReciveUserid()!=null&&StrUtil.isNotEmpty(record.getReciveUserid().toString())) { + list2.add("'%"+record.getReciveUserid()+"%'"); + } + if(record.getStatusid()!=null&&StrUtil.isNotEmpty(record.getStatusid().toString())) { + list2.add("'%"+record.getStatusid()+"%'"); + } + + buffer.append(" CONCAT("); + buffer.append(StrUtil.join("",list)); + buffer.append(")"); + buffer.append("like CONCAT("); + + + buffer.append(StrUtil.join("",list2)); + + buffer.append(")"); + if(!" CONCAT()like CONCAT()".equals(buffer.toString())) { + addCriterion(buffer.toString()); + } + return (Criteria) this; + } + +} + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/zsess/taskmanage/service/TaskinfoService.java b/src/main/java/com/zsess/taskmanage/service/TaskinfoService.java new file mode 100644 index 0000000..1ae72ca --- /dev/null +++ b/src/main/java/com/zsess/taskmanage/service/TaskinfoService.java @@ -0,0 +1,139 @@ +package com.zsess.taskmanage.service; + +import java.util.List; +import java.util.Arrays; + +import com.fc.test.common.base.BaseService; +import com.fc.test.common.support.ConvertUtil; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.util.SnowflakeIdWorker; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import cn.hutool.core.util.StrUtil; +import com.zsess.taskmanage.mapper.auto.TaskinfoMapper; +import com.zsess.taskmanage.model.auto.Taskinfo; +import com.zsess.taskmanage.model.auto.TaskinfoExample; +import com.fc.test.util.StringUtils; + +/** + * 任务信息主表 TaskinfoService + * @Title: TaskinfoService.java  + * @Package com.zsess.taskmanage.service  + * @author mian_自动生成 + * @email mianli85@163.com + * @date 2020-07-06 15:25:56   + **/ +@Service +public class TaskinfoService implements BaseService { + @Autowired + private TaskinfoMapper taskinfoMapper; + + + /** + * 分页查询 + * @param tablepar + * @param record + * @return + */ + public PageInfo list(Tablepar tablepar, Taskinfo record){ + TaskinfoExample testExample=new TaskinfoExample(); + testExample.createCriteria().andLikeQuery(record); + testExample.setOrderByClause("taskid ASC"); + if(StrUtil.isNotEmpty(tablepar.getOrderByColumn())) { + testExample.setOrderByClause(StringUtils.toUnderScoreCase(tablepar.getOrderByColumn()) +" "+tablepar.getIsAsc()); + } + PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize()); + List list= taskinfoMapper.selectByExample(testExample); + PageInfo pageInfo = new PageInfo(list); + return pageInfo; + } + + @Override + public int deleteByPrimaryKey(String ids) { + + List lista= ConvertUtil.toListStrArray(ids); + TaskinfoExample example=new TaskinfoExample(); + example.createCriteria().andTaskidIn(lista); + return taskinfoMapper.deleteByExample(example); + + + } + + + @Override + public Taskinfo selectByPrimaryKey(String id) { + + return taskinfoMapper.selectByPrimaryKey(id); + + } + + + @Override + public int updateByPrimaryKeySelective(Taskinfo record) { + return taskinfoMapper.updateByPrimaryKeySelective(record); + } + + + /** + * 添加 + */ + @Override + public int insertSelective(Taskinfo record) { + + //添加雪花主键id + record.setTaskid(SnowflakeIdWorker.getUUID()); + + + return taskinfoMapper.insertSelective(record); + } + + + @Override + public int updateByExampleSelective(Taskinfo record, TaskinfoExample example) { + + return taskinfoMapper.updateByExampleSelective(record, example); + } + + + @Override + public int updateByExample(Taskinfo record, TaskinfoExample example) { + + return taskinfoMapper.updateByExample(record, example); + } + + @Override + public List selectByExample(TaskinfoExample example) { + + return taskinfoMapper.selectByExample(example); + } + + + @Override + public long countByExample(TaskinfoExample example) { + + return taskinfoMapper.countByExample(example); + } + + + @Override + public int deleteByExample(TaskinfoExample example) { + + return taskinfoMapper.deleteByExample(example); + } + + /** + * 检查name + * @param taskinfo + * @return + */ + public int checkNameUnique(Taskinfo taskinfo){ + TaskinfoExample example=new TaskinfoExample(); + example.createCriteria().andTasknameEqualTo(taskinfo.getTaskname()); + List list=taskinfoMapper.selectByExample(example); + return list.size(); + } + + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 555d0c5..1e54cd5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,7 +7,7 @@ fuce: #版权年份 copyrightYear: 2018 #文件上传路径 - defaultBaseDir: D:/v2file/ + defaultBaseDir: ./v2file/ #地址是否放入项目static目录，如果未Y 放入项目得static。 profile配置失效。 为N存放在D:/v2file/ 前端读取相同，不受影响 isstatic: Y #开启存放静态文件夹后目录 diff --git a/src/main/resources/mybatis/auto/TaskinfoMapper.xml b/src/main/resources/mybatis/auto/TaskinfoMapper.xml new file mode 100644 index 0000000..79ef10e --- /dev/null +++ b/src/main/resources/mybatis/auto/TaskinfoMapper.xml @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + taskid, + taskname, + taskdesc, + begindate, + enddate, + freqid, + createtime, + updatetime, + userid, + recive_deptid, + recive_userid, + statusid + + + + + + delete from t_taskinfo + where taskid = #{taskid,jdbcType=VARCHAR} + + + delete from t_taskinfo + + + + + + + insert into t_taskinfo ( + taskid, + taskname, + taskdesc, + begindate, + enddate, + freqid, + createtime, + updatetime, + userid, + recive_deptid, + recive_userid, + statusid + ) + values ( + #{taskid,jdbcType=VARCHAR}, + #{taskname,jdbcType=VARCHAR}, + #{taskdesc,jdbcType=VARCHAR}, + #{begindate,jdbcType=TIMESTAMP}, + #{enddate,jdbcType=TIMESTAMP}, + #{freqid,jdbcType=BIGINT}, + #{createtime,jdbcType=TIMESTAMP}, + #{updatetime,jdbcType=TIMESTAMP}, + #{userid,jdbcType=BIGINT}, + #{reciveDeptid,jdbcType=BIGINT}, + #{reciveUserid,jdbcType=BIGINT}, + #{statusid,jdbcType=INTEGER} + ) + + + + insert into t_taskinfo + + + + taskid, + + + + + taskname, + + + + + taskdesc, + + + + + begindate, + + + + + enddate, + + + + + freqid, + + + + + createtime, + + + + + updatetime, + + + + + userid, + + + + + recive_deptid, + + + + + recive_userid, + + + + + statusid, + + + + + + #{taskid,jdbcType=VARCHAR}, + + + #{taskname,jdbcType=VARCHAR}, + + + #{taskdesc,jdbcType=VARCHAR}, + + + #{begindate,jdbcType=TIMESTAMP}, + + + #{enddate,jdbcType=TIMESTAMP}, + + + #{freqid,jdbcType=BIGINT}, + + + #{createtime,jdbcType=TIMESTAMP}, + + + #{updatetime,jdbcType=TIMESTAMP}, + + + #{userid,jdbcType=BIGINT}, + + + #{reciveDeptid,jdbcType=BIGINT}, + + + #{reciveUserid,jdbcType=BIGINT}, + + + #{statusid,jdbcType=INTEGER}, + + + + + + + + update t_taskinfo + + + taskid = #{record.taskid,jdbcType=VARCHAR}, + + + taskname = #{record.taskname,jdbcType=VARCHAR}, + + + taskdesc = #{record.taskdesc,jdbcType=VARCHAR}, + + + begindate = #{record.begindate,jdbcType=TIMESTAMP}, + + + enddate = #{record.enddate,jdbcType=TIMESTAMP}, + + + freqid = #{record.freqid,jdbcType=BIGINT}, + + + createtime = #{record.createtime,jdbcType=TIMESTAMP}, + + + updatetime = #{record.updatetime,jdbcType=TIMESTAMP}, + + + userid = #{record.userid,jdbcType=BIGINT}, + + + recive_deptid = #{record.reciveDeptid,jdbcType=BIGINT}, + + + recive_userid = #{record.reciveUserid,jdbcType=BIGINT}, + + + statusid = #{record.statusid,jdbcType=INTEGER}, + + + + + + + + + + + update t_taskinfo + set + taskid = #{record.taskid,jdbcType=VARCHAR}, + taskname = #{record.taskname,jdbcType=VARCHAR}, + taskdesc = #{record.taskdesc,jdbcType=VARCHAR}, + begindate = #{record.begindate,jdbcType=TIMESTAMP}, + enddate = #{record.enddate,jdbcType=TIMESTAMP}, + freqid = #{record.freqid,jdbcType=BIGINT}, + createtime = #{record.createtime,jdbcType=TIMESTAMP}, + updatetime = #{record.updatetime,jdbcType=TIMESTAMP}, + userid = #{record.userid,jdbcType=BIGINT}, + recive_deptid = #{record.reciveDeptid,jdbcType=BIGINT}, + recive_userid = #{record.reciveUserid,jdbcType=BIGINT}, + statusid = #{record.statusid,jdbcType=INTEGER} + + + + + + + + update t_taskinfo + + + taskname = #{taskname,jdbcType=VARCHAR}, + + + taskdesc = #{taskdesc,jdbcType=VARCHAR}, + + + begindate = #{begindate,jdbcType=TIMESTAMP}, + + + enddate = #{enddate,jdbcType=TIMESTAMP}, + + + freqid = #{freqid,jdbcType=BIGINT}, + + + createtime = #{createtime,jdbcType=TIMESTAMP}, + + + updatetime = #{updatetime,jdbcType=TIMESTAMP}, + + + userid = #{userid,jdbcType=BIGINT}, + + + recive_deptid = #{reciveDeptid,jdbcType=BIGINT}, + + + recive_userid = #{reciveUserid,jdbcType=BIGINT}, + + + statusid = #{statusid,jdbcType=INTEGER}, + + + where + taskid = #{taskid,jdbcType=VARCHAR} + + + + + + + update t_taskinfo + set + taskname = #{taskname,jdbcType=VARCHAR}, + taskdesc = #{taskdesc,jdbcType=VARCHAR}, + begindate = #{begindate,jdbcType=TIMESTAMP}, + enddate = #{enddate,jdbcType=TIMESTAMP}, + freqid = #{freqid,jdbcType=BIGINT}, + createtime = #{createtime,jdbcType=TIMESTAMP}, + updatetime = #{updatetime,jdbcType=TIMESTAMP}, + userid = #{userid,jdbcType=BIGINT}, + recive_deptid = #{reciveDeptid,jdbcType=BIGINT}, + recive_userid = #{reciveUserid,jdbcType=BIGINT}, + statusid = #{statusid,jdbcType=INTEGER} + where + taskid = #{taskid,jdbcType=VARCHAR} + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/gen/taskinfo/add.html b/src/main/resources/templates/gen/taskinfo/add.html new file mode 100644 index 0000000..76f7519 --- /dev/null +++ b/src/main/resources/templates/gen/taskinfo/add.html @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/gen/taskinfo/edit.html b/src/main/resources/templates/gen/taskinfo/edit.html new file mode 100644 index 0000000..23d4a66 --- /dev/null +++ b/src/main/resources/templates/gen/taskinfo/edit.html @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + diff --git a/src/main/resources/templates/gen/taskinfo/list.html b/src/main/resources/templates/gen/taskinfo/list.html new file mode 100644 index 0000000..2b72d20 --- /dev/null +++ b/src/main/resources/templates/gen/taskinfo/list.html @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ +
+ +
+
+ + +
+
+
搜索条件
+
+ + + +
+
+ + + +
+
+ + +
+ + +
+
+
表单
+
+ + + +
+
+ + + +
+
+ +
+ + + + + +
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + -- Gitee From b37804428fe51c2d96809509c28788e86b82a908 Mon Sep 17 00:00:00 2001 From: limian Date: Wed, 8 Jul 2020 17:48:28 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BE=E5=BA=A6?= =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=ACjar=E5=8C=85=E4=BE=9D=E8=B5=96pom?= =?UTF-8?q?=E4=B8=AD=E8=AE=BE=E7=BD=AE=EF=BC=8C=E8=BE=BE=E5=88=B0maven?= =?UTF-8?q?=E6=89=93=E5=8C=85=E4=B8=8D=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b3cb804..c786c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -198,11 +198,11 @@ 1.9 - ueditor - 1.4.3 - 1.8 - system - ${basedir}/lib/ueditor-1.1.2.jar + baidu + ueditor + 1.1.2 + + @@ -225,6 +225,31 @@ + + + org.apache.maven.plugins + maven-install-plugin + + + + install-ueditor + clean + + ${basedir}/lib/ueditor-1.1.2.jar + default + baidu + ueditor + 1.1.2 + jar + true + + + install-file + + + + + org.apache.maven.plugins -- Gitee From e54149368bd98bde54713f042357fe21f20bbd0d Mon Sep 17 00:00:00 2001 From: limian Date: Wed, 8 Jul 2020 17:52:12 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E4=B8=AA=E6=80=A7?= =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9=E4=B9=8B=E4=B8=BB=E9=A1=B5=E3=80=81?= =?UTF-8?q?=E7=99=BB=E9=99=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fc/test/controller/IndexController.java | 7 +- .../templates/admin/common/html/topMenu.html | 138 +++++++++--------- src/main/resources/templates/admin/index.html | 7 +- src/main/resources/templates/login.html | 27 ++-- 4 files changed, 95 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/fc/test/controller/IndexController.java b/src/main/java/com/fc/test/controller/IndexController.java index 6d587fd..b233f47 100644 --- a/src/main/java/com/fc/test/controller/IndexController.java +++ b/src/main/java/com/fc/test/controller/IndexController.java @@ -29,10 +29,11 @@ public class IndexController extends BaseController{ public String index(ModelMap map) { String str="前台"; setTitle(map, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); -// return "index"; +// return "index"; // 进入前台空白页面 + //通过参数 RollVerification, 控制登陆页面使用验证码方式，数字还是滑动效果 map.put("RollVerification", V2Config.getRollVerification()); - System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification()); - return "login"; +// System.out.println("V2Config.getRollVerification()>>>"+V2Config.getRollVerification()); + return "login"; // 进入登陆页面 } /** * 前台访问/index的get请求 diff --git a/src/main/resources/templates/admin/common/html/topMenu.html b/src/main/resources/templates/admin/common/html/topMenu.html index 90407f6..f993182 100644 --- a/src/main/resources/templates/admin/common/html/topMenu.html +++ b/src/main/resources/templates/admin/common/html/topMenu.html @@ -35,54 +35,58 @@
  • -
    23
     + + +
    0
    +
  • - -
    5
     + +
    5
     @@ -120,24 +127,24 @@
      -
    •   Berlin  - 85 ; 15km/h -
      • -
    •   Yogyakarta  - 85 ; Tonight- 72 °F (22.2 °C) -
      • - -
    •   Sttugart  - 85 ; 15km/h -
      • - -
    •   Muchen  - 85 ; 15km/h -
      • - -
    •   Frankurt  - 85 ; 15km/h -
      • + + + + + + + + + + + + + + + + + +
    @@ -149,21 +156,22 @@
  • - + +