diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/SpSysDictController.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/SpSysDictController.java new file mode 100644 index 0000000..487b4e9 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/controller/SpSysDictController.java @@ -0,0 +1,52 @@ +package com.wangziyang.mes.basedata.common.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.wangziyang.mes.basedata.common.entity.SpSysDict; +import com.wangziyang.mes.basedata.common.service.ISpSysDictService; +import com.wangziyang.mes.common.BaseController; +import com.wangziyang.mes.common.Result; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + *

+ * 系统字典表 前端控制器 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +@Controller +@RequestMapping("/basedata/dict") +public class SpSysDictController extends BaseController { + /** + * 字典表服务 + */ + @Autowired + public ISpSysDictService iSpSysDictService; + + /** + * 查询字典表数据 + * + * @param type 字典表 数据类型 + * @return 字典数据结果集合 + */ + @GetMapping("/list/{type}") + @ApiOperation("根据表类型,字典表集合查询") + @ResponseBody + public Result queryDictList(@PathVariable String type) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("type", type); + List list = iSpSysDictService.list(queryWrapper); + return Result.success(list); + } + +} diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/SpSysDictDto.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/SpSysDictDto.java new file mode 100644 index 0000000..0093318 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/dto/SpSysDictDto.java @@ -0,0 +1,16 @@ +package com.wangziyang.mes.basedata.common.dto; + +import com.wangziyang.mes.basedata.common.entity.SpSysDict; + +/** + *

+ * 系统字典表 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +public class SpSysDictDto extends SpSysDict { + + +} diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/entity/SpSysDict.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/entity/SpSysDict.java new file mode 100644 index 0000000..414e11d --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/entity/SpSysDict.java @@ -0,0 +1,114 @@ +package com.wangziyang.mes.basedata.common.entity; + +import com.wangziyang.mes.common.BaseEntity; + +/** + *

+ * 系统字典表 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +public class SpSysDict extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 标签名 + */ + private String name; + + /** + * 数据值 + */ + private String value; + + /** + * 类型 + */ + private String type; + + /** + * 描述 + */ + private String descr; + + /** + * 排序(升序) + */ + private Integer sortNum; + + /** + * 父级id + */ + private String parentId; + + /** + * 逻辑删除:1 表示删除,0 表示未删除,2 表示禁用 + */ + private String isDeleted; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + public String getDescr() { + return descr; + } + + public void setDescr(String descr) { + this.descr = descr; + } + public Integer getSortNum() { + return sortNum; + } + + public void setSortNum(Integer sortNum) { + this.sortNum = sortNum; + } + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + public String getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(String isDeleted) { + this.isDeleted = isDeleted; + } + + @Override + public String toString() { + return "SpSysDict{" + + "name=" + name + + ", value=" + value + + ", type=" + type + + ", descr=" + descr + + ", sortNum=" + sortNum + + ", parentId=" + parentId + + ", isDeleted=" + isDeleted + + "}"; + } +} diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/SpSysDictMapper.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/SpSysDictMapper.java new file mode 100644 index 0000000..313ab06 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/mapper/SpSysDictMapper.java @@ -0,0 +1,16 @@ +package com.wangziyang.mes.basedata.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wangziyang.mes.basedata.common.entity.SpSysDict; + +/** + *

+ * 系统字典表 Mapper 接口 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +public interface SpSysDictMapper extends BaseMapper { + +} diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/service/ISpSysDictService.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/ISpSysDictService.java new file mode 100644 index 0000000..ac27f1e --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/ISpSysDictService.java @@ -0,0 +1,16 @@ +package com.wangziyang.mes.basedata.common.service; + +import com.wangziyang.mes.basedata.common.entity.SpSysDict; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 系统字典表 服务类 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +public interface ISpSysDictService extends IService { + +} diff --git a/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/SpSysDictServiceImpl.java b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/SpSysDictServiceImpl.java new file mode 100644 index 0000000..6262dc5 --- /dev/null +++ b/mes/src/main/java/com/wangziyang/mes/basedata/common/service/impl/SpSysDictServiceImpl.java @@ -0,0 +1,20 @@ +package com.wangziyang.mes.basedata.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wangziyang.mes.basedata.common.entity.SpSysDict; +import com.wangziyang.mes.basedata.common.mapper.SpSysDictMapper; +import com.wangziyang.mes.basedata.common.service.ISpSysDictService; +import org.springframework.stereotype.Service; + +/** + *

+ * 系统字典表 服务实现类 + *

+ * + * @author WangZiYang + * @since 2020-03-23 + */ +@Service +public class SpSysDictServiceImpl extends ServiceImpl implements ISpSysDictService { + +} diff --git a/mes/src/main/resources/mapper/basedata/common/SpSysDictMapper.xml b/mes/src/main/resources/mapper/basedata/common/SpSysDictMapper.xml new file mode 100644 index 0000000..6190cf2 --- /dev/null +++ b/mes/src/main/resources/mapper/basedata/common/SpSysDictMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mes/src/main/resources/static/css/effect.css b/mes/src/main/resources/static/css/effect.css new file mode 100644 index 0000000..047eb8d --- /dev/null +++ b/mes/src/main/resources/static/css/effect.css @@ -0,0 +1,41 @@ +.paoma{background: #111111;} +.text-effect{ + color: #fff; + font-family: 'Monoton', cursive; + text-transform: uppercase; + display: block; +} +.text-effect span{ animation: animate linear 1000ms infinite; } +.text-effect span:nth-child(1n){ animation-delay: 0s; } +.text-effect span:nth-child(2n){ animation-delay: 100ms; } +.text-effect span:nth-child(3n){ animation-delay: 200ms; } +.text-effect span:nth-child(4n){ animation-delay: 300ms; } +.text-effect span:nth-child(5n){ animation-delay: 400ms; } +.text-effect span:nth-child(6n){ animation-delay: 500ms; } +.text-effect span:nth-child(7n){ animation-delay: 600ms; } +.text-effect span:nth-child(8n){ animation-delay: 700ms; } +.text-effect span:nth-child(9n){ animation-delay: 800ms; } +.text-effect span:nth-child(10n){ animation-delay: 900ms; } +.text-effect span:nth-child(11n){ animation-delay: 1000ms; } +.text-effect span:nth-child(12n){ animation-delay: 1100ms; } +.text-effect span:nth-child(13n){ animation-delay: 1200ms; } +.text-effect span:nth-child(14n){ animation-delay: 1300ms; } +@keyframes animate{ + 0%{ opacity: 0.3; } + 100%{ + opacity:1; + text-shadow:0 0 6px DarkRed ,0 0 30px red,0 0 80px black; + } +} +@media only screen and (max-width: 990px){ + .text-effect{ font-size: 65px; } +} +@media only screen and (max-width: 767px){ + .text-effect{ font-size: 50px; } +} +@media only screen and (max-width: 479px){ + .text-effect{ font-size: 36px; } +} +@media only screen and (max-width: 359px){ + .text-effect{ font-size: 27px; } +} \ No newline at end of file diff --git a/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl index 3d90bc1..dfa8e99 100644 --- a/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl +++ b/mes/src/main/resources/templates/basedata/materile/addOrUpdate.ftl @@ -8,13 +8,14 @@ <#include "${request.contextPath}/common/common.ftl"> +
-
+
@@ -61,27 +62,30 @@
- +
-
-
-