From f547e6200ad888ed47dd32ed566c5e2b319507ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 13:09:59 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 6
zy-asrs-wcs/src/main/resources/mapper/system/DictMapper.xml | 5
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DictController.java | 101 ++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dict.java | 245 +++++++++++++++++++++++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DictServiceImpl.java | 12 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DictService.java | 8 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DictMapper.java | 12 +
zy-asrs-framework/src/main/resources/templates/react/Sql.txt | 2
8 files changed, 387 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-framework/src/main/resources/templates/react/Sql.txt b/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
index b36a16e..9905504 100644
--- a/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
+++ b/zy-asrs-framework/src/main/resources/templates/react/Sql.txt
@@ -1,6 +1,6 @@
-- save @{SIMPLEENTITYNAME} record
-- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '@{TABLEDESC}绠＄悊', '0', '/@{ITEMNAME}/@{SIMPLEENTITYNAME}', /@{ITEMNAME}/@{SIMPLEENTITYNAME}', '0' , '0', '1' , '1');
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '@{TABLEDESC}绠＄悊', '0', '/@{ITEMNAME}/@{SIMPLEENTITYNAME}', '/@{ITEMNAME}/@{SIMPLEENTITYNAME}', '0' , '0', '1' , '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:list', '0', '1', '1');
insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞@{TABLEDESC}', '', '1', '@{ITEMNAME}:@{SIMPLEENTITYNAME}:save', '1', '1', '1');
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DictController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DictController.java
new file mode 100644
index 0000000..6487a7f
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DictController.java
@@ -0,0 +1,101 @@
+package com.zy.asrs.wcs.system.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wcs.common.annotation.OperationLog;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.KeyValVo;
+import com.zy.asrs.wcs.common.domain.PageParam;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
+import com.zy.asrs.wcs.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class DictController extends BaseController {
+
+ @Autowired
+ private DictService dictService;
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Dict, BaseParam> pageParam = new PageParam<>(baseParam, Dict.class);
+ return R.ok().add(dictService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(dictService.list());
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @GetMapping("/dict/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(dictService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:save')")
+ @OperationLog("娣诲姞瀛楀吀")
+ @PostMapping("/dict/save")
+ public R save(@RequestBody Dict dict) {
+ if (!dictService.save(dict)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:update')")
+ @OperationLog("淇敼瀛楀吀")
+ @PostMapping("/dict/update")
+ public R update(@RequestBody Dict dict) {
+ if (!dictService.updateById(dict)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:remove')")
+ @OperationLog("鍒犻櫎瀛楀吀")
+ @PostMapping("/dict/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!dictService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Dict::getName, condition);
+ }
+ dictService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('system:dict:list')")
+ @PostMapping("/dict/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(dictService.list(), Dict.class), response);
+ }
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dict.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dict.java
new file mode 100644
index 0000000..e342ff6
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Dict.java
@@ -0,0 +1,245 @@
+package com.zy.asrs.wcs.system.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wcs.system.service.UserService;
+import com.zy.asrs.wcs.system.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("sys_dict")
+public class Dict implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "缂栧彿")
+ private String uuid;
+
+ /**
+ * 瀛楀吀鍚嶇О
+ */
+ @ApiModelProperty(value= "瀛楀吀鍚嶇О")
+ private String name;
+
+ /**
+ * 绫诲瀷 1: 甯冨皵鍊� 2: 鏁板瓧 3: 鏂囨湰 4: JSON 5: 鍥剧墖
+ */
+ @ApiModelProperty(value= "绫诲瀷 1: 甯冨皵鍊� 2: 鏁板瓧 3: 鏂囨湰 4: JSON 5: 鍥剧墖 ")
+ private Integer type;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 瀛楀吀鍊�
+ */
+ @ApiModelProperty(value= "瀛楀吀鍊�")
+ private String value;
+
+ /**
+ * 鎺掑簭
+ */
+ @ApiModelProperty(value= "鎺掑簭")
+ private Integer sort;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public Dict() {}
+
+ public Dict(String uuid,String name,Integer type,String flag,String value,Integer sort,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.uuid = uuid;
+ this.name = name;
+ this.type = type;
+ this.flag = flag;
+ this.value = value;
+ this.sort = sort;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// Dict dict = new Dict(
+// null, // 缂栧彿
+// null, // 瀛楀吀鍚嶇О
+// null, // 绫诲瀷
+// null, // 鏍囪瘑
+// null, // 瀛楀吀鍊�
+// null, // 鎺掑簭
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case 1:
+ return "甯冨皵鍊�";
+ case 2:
+ return "鏁板瓧";
+ case 3:
+ return "鏂囨湰";
+ case 4:
+ return "JSON";
+ case 5:
+ return "鍥剧墖";
+ default:
+ return String.valueOf(this.type);
+ }
+ }
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DictMapper.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DictMapper.java
new file mode 100644
index 0000000..7d3c0f3
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/mapper/DictMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.mapper;
+
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DictMapper extends BaseMapper<Dict> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DictService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DictService.java
new file mode 100644
index 0000000..815bf4c
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/DictService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wcs.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wcs.system.entity.Dict;
+
+public interface DictService extends IService<Dict> {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DictServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DictServiceImpl.java
new file mode 100644
index 0000000..e8e1b71
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/service/impl/DictServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wcs.system.service.impl;
+
+import com.zy.asrs.wcs.system.mapper.DictMapper;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("dictService")
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index e21f2f8..bdfe754 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -22,9 +22,9 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="wcs_device_plc";
- generator.tableName="device_plc";
- generator.packagePath="com.zy.asrs.wcs.rcs";
+ generator.table="sys_dict";
+ generator.tableName="瀛楀吀";
+ generator.packagePath="com.zy.asrs.wcs.system";
generator.build();
}
diff --git a/zy-asrs-wcs/src/main/resources/mapper/system/DictMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/DictMapper.xml
new file mode 100644
index 0000000..cd9cdf1
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/DictMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wcs.system.mapper.DictMapper">
+
+</mapper>
--
Gitblit v1.9.1