#
luxiaotao1123
2023-12-19 7cda77435f479b7dcb837c2341a5ff8a87c36a00
#
17个文件已修改
10 文件已重命名
195 ■■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/Controller.txt 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/Dao.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/Entity.txt 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/Service.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-framework/src/main/resources/templates/Xml.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Config;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/HostMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Host;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/OperateLogMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.OperateLog;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ResourceMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Resource;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Role;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/RoleResourceMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.Resource;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserLoginMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.UserLogin;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/UserMapper.java
File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.sys.dao;
package com.zy.asrs.common.sys.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.sys.entity.User;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Config;
import com.zy.asrs.common.sys.dao.ConfigMapper;
import com.zy.asrs.common.sys.mapper.ConfigMapper;
import com.zy.asrs.common.sys.service.ConfigService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Host;
import com.zy.asrs.common.sys.dao.HostMapper;
import com.zy.asrs.common.sys.mapper.HostMapper;
import com.zy.asrs.common.sys.service.HostService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.OperateLog;
import com.zy.asrs.common.sys.dao.OperateLogMapper;
import com.zy.asrs.common.sys.mapper.OperateLogMapper;
import com.zy.asrs.common.sys.service.OperateLogService;
import com.zy.asrs.framework.common.Cools;
import org.springframework.beans.factory.annotation.Autowired;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Resource;
import com.zy.asrs.common.sys.dao.ResourceMapper;
import com.zy.asrs.common.sys.mapper.ResourceMapper;
import com.zy.asrs.common.sys.service.ResourceService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Resource;
import com.zy.asrs.common.sys.entity.RoleResource;
import com.zy.asrs.common.sys.dao.RoleResourceMapper;
import com.zy.asrs.common.sys.mapper.RoleResourceMapper;
import com.zy.asrs.common.sys.service.RoleResourceService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Role;
import com.zy.asrs.common.sys.dao.RoleMapper;
import com.zy.asrs.common.sys.mapper.RoleMapper;
import com.zy.asrs.common.sys.service.RoleService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.UserLogin;
import com.zy.asrs.common.sys.dao.UserLoginMapper;
import com.zy.asrs.common.sys.mapper.UserLoginMapper;
import com.zy.asrs.common.sys.service.UserLoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.dao.UserMapper;
import com.zy.asrs.common.sys.mapper.UserMapper;
import com.zy.asrs.common.sys.service.UserService;
import org.springframework.stereotype.Service;
zy-asrs-common/src/main/resources/mapper/sys/HostMapper.xml
File was renamed from zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml
@@ -1,5 +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.common.sys.dao.HostMapper">
<mapper namespace="com.zy.asrs.common.sys.mapper.HostMapper">
</mapper>
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java
@@ -71,6 +71,7 @@
    private String majorColumn;
    private String systemPackagePath;
    private String systemPackage;
    private String itemName;
    public void build() throws Exception {
        init();
@@ -108,7 +109,7 @@
                    break;
                case "Xml":
                    pass = xml;
                    directory = backendPrefixPath + XML_DIR;
                    directory = backendPrefixPath + XML_DIR + itemName + "/";
                    fileName = fullEntityName+"Mapper.xml";
                    break;
                case "Sql":
@@ -140,7 +141,6 @@
        fullEntityName = GeneratorUtils.getNameSpace(table);
        simpleEntityName = fullEntityName.substring(0, 1).toLowerCase()+fullEntityName.substring(1);
        entityContent = createEntityMsg();
        xmlContent = createXmlMsg();
        htmlContent = createHtmlMsg();
        htmlDialogContent = createHtmlDialogMsg();
        jsTableContent = createJsTableMsg();
@@ -161,8 +161,8 @@
                    systemPackage = systemPackage + split[i-1] + ".";
                }
            }
        }
        itemName = packagePathSplit[packagePathSplit.length - 1];
    }
    private String readFile(String template){
@@ -185,6 +185,7 @@
        if(!codeDirectory.exists()){
            codeDirectory.mkdirs();
        }
        File writerFile=new File(directory+fileName);
        if(!writerFile.exists()){
            content=content.
@@ -195,7 +196,8 @@
                    .replaceAll("@\\{SIMPLEENTITYNAME}", simpleEntityName)
                    .replaceAll("@\\{UENTITYNAME}", simpleEntityName)
                    .replaceAll("@\\{COMPANYNAME}",packagePath)
                    .replaceAll("@\\{XMLCONTENT}", xmlContent)
                    .replaceAll("@\\{ITEMNAME}",itemName)
//                    .replaceAll("@\\{XMLCONTENT}", xmlContent)
                    .replaceAll("@\\{HTMLCONTENT}", htmlContent)
                    .replaceAll("@\\{HTMLDIALOGCONTENT}", htmlDialogContent)
                    .replaceAll("@\\{JSTABLECONTENT}", jsTableContent)
@@ -203,6 +205,7 @@
                    .replaceAll("@\\{JSDATECONTENT}", jsDateContent)
                    .replaceAll("@\\{JSPRIMARYKEYDOMS}", jsPrimaryKeyDoms)
                    .replaceAll("@\\{MAJORCOLUMN}", GeneratorUtils.humpToLine(majorColumn))
                    .replaceAll("@\\{MAJORCOLUMN0}", GeneratorUtils.firstCharConvert(majorColumn, false))
                    .replaceAll("@\\{MAJORCOLUMN_UP}", GeneratorUtils.firstCharConvert(GeneratorUtils.humpToLine(majorColumn), false))
                    .replaceAll("@\\{PRIMARYKEYCOLUMN}", GeneratorUtils.firstCharConvert(primaryKeyColumn, false))
                    .replaceAll("@\\{PRIMARYKEYCOLUMN0}", GeneratorUtils.firstCharConvert(primaryKeyColumn, true))
@@ -359,7 +362,7 @@
            return null;
        }
        StringBuilder sb = new StringBuilder();
        StringBuilder entityIm = new StringBuilder("import com.core.common.Cools;");
        StringBuilder entityIm = new StringBuilder();
        boolean setTableField = true;
        boolean setTableId = true;
        boolean setDateTimeFormat = true;
@@ -387,11 +390,6 @@
            // 主键修饰
            if (column.isMainKey()){
                if (setTableId){
                    entityIm.append("import com.baomidou.mybatisplus.annotations.TableId;").append("\n")
                            .append("import com.baomidou.mybatisplus.enums.IdType;").append("\n");
                    setTableId = false;
                }
                if (column.isOnly()){
                    sb.append("    ")
                            .append("@TableId(value = \"")
@@ -406,13 +404,6 @@
                            .append("\n");
                }
            }
            // 外键修饰
            if (!Cools.isEmpty(column.getForeignKeyMajor())){
                entityIm.append("import com.core.common.SpringUtils;\n")
                        .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".service.").append(column.getForeignKey()).append("Service;\n")
                        .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".entity.").append(column.getForeignKey()).append(";\n");
            }
            if ("Date".equals(column.getType())){
@@ -480,7 +471,7 @@
                        .append(column.getHumpName())
                        .append(");\n")
                        .append("    }\n\n");
            // 枚举字段增加$格式化
                // 枚举字段增加$格式化
            } else if (!Cools.isEmpty(column.getEnums())){
                sb.append("    public String get")
                        .append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1))
@@ -505,7 +496,7 @@
                sb.append("    public String get").append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)).append("\\$").append("(){\n")
                        .append("        ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(").append(column.getForeignKey()).append("Service.class);\n")
                        .append("        ").append(column.getForeignKey()).append(" ").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
                        .append(" = service.selectById(this.").append(column.getHumpName()).append(");\n")
                        .append(" = service.getById(this.").append(column.getHumpName()).append(");\n")
                        .append("        if (!Cools.isEmpty(").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(")){\n")
                        .append("            return String.valueOf(").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append(".get").append(column.getForeignKeyMajor()).append("());\n")
                        .append("        }\n")
@@ -552,25 +543,6 @@
            }
        }
        return defaultMajor;
    }
    /**********************************************************************************************/
    /*************************************** Xml动态字段 ********************************************/
    /**********************************************************************************************/
    private String createXmlMsg(){
        StringBuilder sb = new StringBuilder();
        for (Column column : columns){
            sb.append("        ")
                    .append("<")
                    .append(column.isOnly()?"id":"result")
                    .append(" column=\"")
                    .append(column.getName())
                    .append("\" property=\"")
                    .append(column.getHumpName())
                    .append("\" />\n");
        }
        return sb.toString();
    }
    /**********************************************************************************************/
@@ -751,7 +723,7 @@
                sb.append("            layDate.render({\n")
                        .append("                elem: '#").append(column.getHumpName()).append("\\\\\\\\\\$',\n")
                        .append("                type: 'datetime',\n")
                        .append("                value: data!==undefined?data['").append(column.getHumpName()).append("$'").append("]:null\n")
                        .append("                value: data!==undefined?data['").append(column.getHumpName()).append("\\\\\\\\\\$'").append("]:null\n")
                        .append("            });\n");
            }
        }
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/utils/GeneratorUtils.java
@@ -2,6 +2,8 @@
import com.zy.asrs.framework.common.Cools;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -12,6 +14,15 @@
 */
public class GeneratorUtils {
    public static final List<String> FILTER_FIELD = new ArrayList<String>(){{
        add("deleted");
        add("tenantId");
        add("createBy");
        add("createTime");
        add("updateBy");
        add("updateTime");
    }};
    /**
     * 下划线 ===>> 驼峰命名
     * @param smallHump 小驼峰命名
zy-asrs-framework/src/main/resources/templates/Controller.txt
@@ -2,18 +2,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.domain.KeyValueVo;
import @{SYSTEMPACKAGE}.common.web.BaseController;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.domain.KeyValueVo;
import com.zy.asrs.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,7 +25,7 @@
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(@{SIMPLEENTITYNAME}Service.selectById(String.valueOf(id)));
        return R.ok(@{SIMPLEENTITYNAME}Service.getById(String.valueOf(id)));
    }
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}/page/auth")
@@ -39,31 +36,15 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(@{ENTITYNAME}.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(@{SIMPLEENTITYNAME}Service.selectPage(new Page<>(curr, limit), wrapper));
        LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
        return R.ok(@{SIMPLEENTITYNAME}Service.page(new Page<>(curr, limit), wrapper));
    }
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
            }
        }
    }
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}/add/auth")
    @ManagerAuth
    public R add(@{ENTITYNAME} @{SIMPLEENTITYNAME}) {
        @{SIMPLEENTITYNAME}Service.insert(@{SIMPLEENTITYNAME});
        @{SIMPLEENTITYNAME}Service.save(@{SIMPLEENTITYNAME});
        return R.ok();
    }
@@ -81,28 +62,17 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            @{SIMPLEENTITYNAME}Service.deleteById(id);
            @{SIMPLEENTITYNAME}Service.removeById(id);
        }
        return R.ok();
    }
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("@{SIMPLEENTITYNAME}"));
        convert(map, wrapper);
        List<@{ENTITYNAME}> list = @{SIMPLEENTITYNAME}Service.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}Query/auth")
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<>();
        wrapper.like("@{MAJORCOLUMN}", condition);
        Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(0, 10), wrapper);
        LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
        wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
        Page<@{ENTITYNAME}> page = @{SIMPLEENTITYNAME}Service.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (@{ENTITYNAME} @{SIMPLEENTITYNAME} : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
@@ -113,22 +83,13 @@
        return R.ok(result);
    }
    @RequestMapping(value = "/@{SIMPLEENTITYNAME}/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != @{SIMPLEENTITYNAME}Service.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(@{ENTITYNAME}.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }
    @RequestMapping("/@{SIMPLEENTITYNAME}/all/get/kv")
    @ManagerAuth
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();
        Wrapper<@{ENTITYNAME}> wrapper = new EntityWrapper<@{ENTITYNAME}>().andNew().like("@{MAJORCOLUMN}", condition).orderBy("create_time", false);
        @{SIMPLEENTITYNAME}Service.selectPage(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{MAJORCOLUMN_UP}()), item.get@{PRIMARYKEYCOLUMN}())));
        LambdaQueryWrapper<@{ENTITYNAME}> wrapper = new LambdaQueryWrapper<>();
        wrapper.like(@{ENTITYNAME}::get@{MAJORCOLUMN0}, condition);
        @{SIMPLEENTITYNAME}Service.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.get@{MAJORCOLUMN0}()), item.get@{PRIMARYKEYCOLUMN}())));
        return R.ok().add(vos);
    }
zy-asrs-framework/src/main/resources/templates/Dao.txt
File was renamed from zy-asrs-framework/src/main/resources/templates/Mapper.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
zy-asrs-framework/src/main/resources/templates/Entity.txt
@@ -1,10 +1,18 @@
package @{COMPANYNAME}.entity;
@{ENTITYIMPORT}
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.baomidou.mybatisplus.annotations.TableName;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("@{TABLENAME}")
zy-asrs-framework/src/main/resources/templates/Service.txt
@@ -1,7 +1,7 @@
package @{COMPANYNAME}.service;
import com.baomidou.mybatisplus.extension.service.IService;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import com.baomidou.mybatisplus.service.IService;
public interface @{ENTITYNAME}Service extends IService<@{ENTITYNAME}> {
zy-asrs-framework/src/main/resources/templates/ServiceImpl.txt
@@ -3,7 +3,7 @@
import @{COMPANYNAME}.mapper.@{ENTITYNAME}Mapper;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@Service("@{SIMPLEENTITYNAME}Service")
zy-asrs-framework/src/main/resources/templates/Xml.txt
@@ -2,9 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="@{COMPANYNAME}.mapper.@{ENTITYNAME}Mapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="@{COMPANYNAME}.entity.@{ENTITYNAME}">
@{XMLCONTENT}
    </resultMap>
</mapper>
zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
@@ -5,7 +5,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
@MapperScan("com.zy.**.dao")
@MapperScan("com.zy.**.mapper")
@EnableScheduling
@SpringBootApplication
public class WmsBoot {
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -24,7 +24,7 @@
        generator.url="localhost:1433;databasename=jmasrs";
        generator.username="sa";
        generator.password="sa@123";
        generator.table="man_pack";
        generator.table="rcs_motion_sts";
        generator.packagePath="com.zy.asrs.common.wms";
        generator.build();
    }