-init;

src/main/java/com/warewms/common/aspect/SysLogAspect.java

@@ -1,95 +0,0 @@
-package com.warewms.common.aspect;
-
-import com.alibaba.fastjson.JSON;
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.utils.HttpContextUtils;
-import com.warewms.common.utils.IPUtils;
-import com.warewms.model.SysUser;
-import com.warewms.service.SysLogService;
-import org.apache.shiro.SecurityUtils;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
-import java.util.Date;
-
-
-/**
- * 系统日志，切面处理类
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017年3月8日 上午11:07:35
- */
-@Aspect
-@Component
-public class SysLogAspect {
-	@Autowired
-	private SysLogService sysLogService;
-	
-	@Pointcut("@annotation(com.warewms.common.annotation.SysLog)")
-	public void logPointCut() { 
-		
-	}
-
-	@Around("logPointCut()")
-	public Object around(ProceedingJoinPoint point) throws Throwable {
-		long beginTime = System.currentTimeMillis();
-		//执行方法
-		Object result = point.proceed();
-		//执行时长(毫秒)
-		long time = System.currentTimeMillis() - beginTime;
-
-		//保存日志
-		saveSysLog(point, time);
-
-		return result;
-	}
-
-	private void saveSysLog(ProceedingJoinPoint joinPoint, long time) {
-		MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-		Method method = signature.getMethod();
-
-		com.warewms.model.SysLog sysLog = new com.warewms.model.SysLog();
-		SysLog syslog = method.getAnnotation(SysLog.class);
-		if(syslog != null){
-			//注解上的描述
-			sysLog.setOperation(syslog.value());
-		}
-
-		//请求的方法名
-		String className = joinPoint.getTarget().getClass().getName();
-		String methodName = signature.getName();
-		sysLog.setMethod(className + "." + methodName + "()");
-
-		//请求的参数
-		Object[] args = joinPoint.getArgs();
-		try{
-
-			String params = JSON.toJSONString(args[0]);
-			sysLog.setParams(params);
-		}catch (Exception e){
-
-		}
-
-		//获取request
-		HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
-		//设置IP地址
-		sysLog.setIp(IPUtils.getIpAddr(request));
-
-		//用户名
-		String username = ((SysUser) SecurityUtils.getSubject().getPrincipal()).getUsername();
-		sysLog.setUsername(username);
-
-		sysLog.setTime(time);
-		sysLog.setCreateDate(new Date());
-		//保存系统日志
-		sysLog.save();
-	}
-}

src/main/java/com/warewms/common/entity/AreaNode.java

@@ -1,20 +0,0 @@
-package com.warewms.common.entity;
-
-import com.warewms.model.Area;
-import lombok.Data;
-
-@Data
-public class AreaNode extends Node<Area> {
-    String name;
-    String fullName;
-    Integer grade;
-    String treePath;
-
-    public AreaNode(Area area) {
-        super(area.getId(), area.getParentId());
-        this.name = area.getName();
-        this.fullName = area.getFullName();
-        this.grade = area.getGrade();
-        this.treePath = area.getTreePath();
-    }
-}

src/main/java/com/warewms/common/utils/ShiroUtils.java

@@ -1,55 +0,0 @@
-package com.warewms.common.utils;
-
-import com.warewms.common.exception.RRException;
-import com.warewms.model.SysUser;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-
-/**
- * Shiro工具类
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年11月12日 上午9:49:19
- */
-public class ShiroUtils {
-
-	public static Session getSession() {
-		return SecurityUtils.getSubject().getSession();
-	}
-
-	public static Subject getSubject() {
-		return SecurityUtils.getSubject();
-	}
-
-	public static SysUser getUserEntity() {
-		return (SysUser)SecurityUtils.getSubject().getPrincipal();
-	}
-
-	public static Long getUserId() {
-		return getUserEntity().getUserId();
-	}
-	
-	public static void setSessionAttribute(Object key, Object value) {
-		getSession().setAttribute(key, value);
-	}
-
-	public static Object getSessionAttribute(Object key) {
-		return getSession().getAttribute(key);
-	}
-
-	public static boolean isLogin() {
-		return SecurityUtils.getSubject().getPrincipal() != null;
-	}
-
-	public static String getKaptcha(String key) {
-		Object kaptcha = getSessionAttribute(key);
-		if(kaptcha == null){
-			throw new RRException("验证码已失效");
-		}
-		getSession().removeAttribute(key);
-		return kaptcha.toString();
-	}
-
-}

src/main/java/com/warewms/config/ActiveRecordConfig.java

@@ -1,53 +0,0 @@
-package com.warewms.config;
-
-import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
-import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
-import com.jfinal.plugin.druid.DruidPlugin;
-import com.jfinal.template.source.ClassPathSourceFactory;
-import com.warewms.datasources.DynamicDataSource;
-import com.warewms.model.TShkdCustomer;
-import com.warewms.model.TShkdMaterial;
-import com.warewms.model._MappingKit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-@Component
-public class ActiveRecordConfig {
-
-    // 由于spring中已经注入了DruidDataSource这里直接拿
-    @Autowired
-    private DataSource ds;
-
-    @Resource(name = "secondDataSource")
-    private DataSource dsSecond;
-
-    @Bean(initMethod="start", destroyMethod="stop",name = "activeRecordPlugin")
-    public ActiveRecordPlugin init() {
-        ActiveRecordPlugin arp = new ActiveRecordPlugin(ds);
-        arp.addSqlTemplate("sql/all.sql");
-        arp.getEngine().setSourceFactory(new ClassPathSourceFactory());
-        arp.setShowSql(false);
-        _MappingKit.mapping(arp);
-        return arp;
-    }
-
-    @Bean(initMethod="start", destroyMethod="stop",name = "msSqlRecord")
-    public ActiveRecordPlugin initMsSql() {
-       /* String jdbcUrl = "jdbc:sqlserver://101.132.41.69:1433;DatabaseName=middle";
-        String user = "test";
-        String password = "jsgr321";
-        DruidPlugin druidPlugin = new DruidPlugin(jdbcUrl, user, password);
-        druidPlugin.start();*/
-        ActiveRecordPlugin arp = new ActiveRecordPlugin("sqlServer",dsSecond);
-        arp.getEngine().setSourceFactory(new ClassPathSourceFactory());
-        arp.setShowSql(false);
-        arp.setDialect(new SqlServerDialect());
-        arp.addMapping("T_SHKD_CUSTOMER", TShkdCustomer.class);
-        arp.addMapping("T_SHKD_MATERIAL", TShkdMaterial.class);
-        return arp;
-    }
-}

src/main/java/com/warewms/config/ShiroConfig.java

@@ -1,103 +0,0 @@
-package com.warewms.config;
-
-import com.warewms.sys.oauth2.OAuth2Filter;
-import com.warewms.sys.oauth2.OAuth2Realm;
-import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.spring.LifecycleBeanPostProcessor;
-import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
-import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
-import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
-import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.Filter;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Shiro配置
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-04-20 18:33
- */
-@Configuration
-public class ShiroConfig {
-
-    @Bean("sessionManager")
-    public SessionManager sessionManager(){
-        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
-        sessionManager.setSessionValidationSchedulerEnabled(true);
-        sessionManager.setSessionIdCookieEnabled(true);
-        return sessionManager;
-    }
-
-    @Bean("securityManager")
-    public SecurityManager securityManager(OAuth2Realm oAuth2Realm, SessionManager sessionManager) {
-        DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
-        securityManager.setRealm(oAuth2Realm);
-        securityManager.setSessionManager(sessionManager);
-
-        return securityManager;
-    }
-
-    @Bean("shiroFilter")
-    public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
-        ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
-        shiroFilter.setSecurityManager(securityManager);
-
-        //oauth过滤
-        Map<String, Filter> filters = new HashMap<>();
-        filters.put("oauth2", new OAuth2Filter());
-        shiroFilter.setFilters(filters);
-
-        Map<String, String> filterMap = new LinkedHashMap<>();
-        filterMap.put("/test/**", "anon");
-        filterMap.put("/actuator/**", "anon");
-        filterMap.put("/pay/**", "anon");
-        filterMap.put("/webjars/**", "anon");
-        filterMap.put("/druid/**", "anon");
-        filterMap.put("/app/**", "anon");
-        filterMap.put("/file/**", "anon");
-        filterMap.put("/wechat/**", "anon");
-        filterMap.put("/UEditor/**", "anon");
-        filterMap.put("/sys/login", "anon");
-        filterMap.put("/sys/logistics/**", "anon");
-        filterMap.put("/swagger/**", "anon");
-        filterMap.put("/wx/**", "anon");
-        filterMap.put("/v2/api-docs", "anon");
-        filterMap.put("/swagger-ui.html", "anon");
-        filterMap.put("/swagger-resources/**", "anon");
-        filterMap.put("/captcha.jpg", "anon");
-        filterMap.put("/kingdee/**","anon");
-        filterMap.put("/k3cloud_postback/**","anon");
-        filterMap.put("/**", "oauth2");
-        shiroFilter.setFilterChainDefinitionMap(filterMap);
-
-        return shiroFilter;
-    }
-
-    @Bean("lifecycleBeanPostProcessor")
-    public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
-        return new LifecycleBeanPostProcessor();
-    }
-
-    @Bean
-    public DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
-        DefaultAdvisorAutoProxyCreator proxyCreator = new DefaultAdvisorAutoProxyCreator();
-        proxyCreator.setProxyTargetClass(true);
-        return proxyCreator;
-    }
-
-    @Bean
-    public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
-        AuthorizationAttributeSourceAdvisor advisor = new AuthorizationAttributeSourceAdvisor();
-        advisor.setSecurityManager(securityManager);
-        return advisor;
-    }
-
-}

src/main/java/com/warewms/config/WebMvcConfig.java

@@ -1,37 +0,0 @@
-package com.warewms.config;
-
-import com.warewms.interceptor.AuthorizationInterceptor;
-import com.warewms.resolver.LoginUserHandlerMethodArgumentResolver;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.method.support.HandlerMethodArgumentResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.util.List;
-
-/**
- * MVC配置
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-04-20 22:30
- */
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-    @Autowired
-    private AuthorizationInterceptor authorizationInterceptor;
-    @Autowired
-    private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(authorizationInterceptor).addPathPatterns("/app/**");
-        registry.addInterceptor(authorizationInterceptor).addPathPatterns("/wechat/**");
-    }
-
-    @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
-        argumentResolvers.add(loginUserHandlerMethodArgumentResolver);
-    }
-}

src/main/java/com/warewms/controller/AbstractController.java

@@ -1,25 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.model.SysUser;
-import org.apache.shiro.SecurityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Controller公共组件
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年11月9日 下午9:42:26
- */
-public abstract class AbstractController {
-	protected Logger logger = LoggerFactory.getLogger(getClass());
-	
-	protected SysUser getUser() {
-		return (SysUser) SecurityUtils.getSubject().getPrincipal();
-	}
-
-	protected Long getUserId() {
-		return getUser().getUserId();
-	}
-}

src/main/java/com/warewms/controller/AppLoginController.java

@@ -1,58 +0,0 @@
-package com.warewms.controller;
-
-
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.form.LoginForm;
-import com.warewms.service.UserService;
-import com.warewms.common.utils.JwtUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * APP登录授权
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-03-23 15:31
- */
-@RestController
-@RequestMapping("/app")
-@Api("APP登录接口")
-public class AppLoginController {
-    @Autowired
-    private UserService userService;
-    @Autowired
-    private JwtUtils jwtUtils;
-
-    /**
-     * 登录
-     */
-    @PostMapping("login")
-    @ApiOperation("登录")
-    public R login(@RequestBody LoginForm form){
-        //表单校验
-        ValidatorUtils.validateEntity(form);
-
-        //用户登录
-        String userId = userService.login(form);
-
-        //生成token
-        String token = jwtUtils.generateToken(userId);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("token", token);
-        map.put("expire", jwtUtils.getExpire());
-
-        return R.ok(map);
-    }
-
-}

src/main/java/com/warewms/controller/AppRegisterController.java

@@ -1,48 +0,0 @@
-package com.warewms.controller;
-
-
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.model.User;
-import com.warewms.form.RegisterForm;
-import com.warewms.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
-
-/**
- * 注册
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-03-26 17:27
- */
-@RestController
-@RequestMapping("/app")
-@Api("APP注册接口")
-public class AppRegisterController {
-    @Autowired
-    private UserService userService;
-
-    @PostMapping("register")
-    @ApiOperation("注册")
-    public R register(@RequestBody RegisterForm form){
-        //表单校验
-        ValidatorUtils.validateEntity(form);
-
-        User user = new User();
-        user.setMobile(form.getMobile());
-        user.setUsername(form.getMobile());
-        user.setPassword(DigestUtils.sha256Hex(form.getPassword()));
-        user.setCreateDate(new Date());
-        user.save();
-
-        return R.ok();
-    }
-}

src/main/java/com/warewms/controller/AppTestController.java

@@ -1,47 +0,0 @@
-package com.warewms.controller;
-
-
-import com.warewms.common.utils.R;
-import com.warewms.model.User;
-import com.warewms.common.annotation.Login;
-import com.warewms.common.annotation.LoginUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * APP测试接口
- *
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-03-23 15:47
- */
-@RestController
-@RequestMapping("/app")
-@Api("APP测试接口")
-public class AppTestController {
-
-    @Login
-    @GetMapping("userInfo")
-    @ApiOperation("获取用户信息")
-    public R userInfo(@LoginUser User user){
-        return R.ok().put("user", user);
-    }
-
-    @Login
-    @GetMapping("userId")
-    @ApiOperation("获取用户ID")
-    public R userInfo(@RequestAttribute("userId") Integer userId){
-        return R.ok().put("userId", userId);
-    }
-
-    @GetMapping("notToken")
-    @ApiOperation("忽略Token验证测试")
-    public R notToken(){
-        return R.ok().put("msg", "无需token也能访问。。。");
-    }
-
-}

src/main/java/com/warewms/controller/FileController.java

@@ -1,50 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.exception.RRException;
-import com.warewms.common.utils.R;
-import com.warewms.enums.ResultEnum;
-import com.warewms.model.SysOss;
-import com.warewms.common.annotation.Login;
-import com.warewms.oss.cloud.OSSFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Date;
-
-/**
- * 微信小程序用户接口
- *
- * @author <a href="https://github.com/binarywang">Binary Wang</a>
- */
-@RestController
-@Slf4j
-@RequestMapping("/file")
-public class FileController {
-
-    @PostMapping("/upload")
-    @Login
-    public R upload(@RequestParam("file") MultipartFile file) throws Exception {
-        if (file.isEmpty()) {
-            throw new RRException("上传文件不能为空");
-        }
-
-        Long fileSize = file.getSize();
-        if (fileSize > 2048 * 1000) {
-            return R.error(ResultEnum.VOLUNTEER_UPLOAD_FILE_BIG);
-        }
-
-        //上传文件
-        String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-        String url = OSSFactory.build().uploadSuffix(file.getBytes(), suffix);
-
-        //保存文件信息
-        SysOss sysOss = new SysOss();
-        sysOss.setUrl(url);
-        sysOss.setCreateDate(new Date());
-        sysOss.save();
-
-        return R.ok().put("url", url);
-    }
-
-}

src/main/java/com/warewms/controller/ScheduleJobController.java

@@ -1,141 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.model.ScheduleJob;
-import com.warewms.service.ScheduleJobService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * 定时任务
- *
- * @author Mark sunlightcs@gmail.com
- * @since 1.2.0 2016-11-28
- */
-@RestController
-@RequestMapping("/sys/schedule")
-public class ScheduleJobController {
-
-	private ScheduleJobService scheduleJobService;
-	
-	/**
-	 * 定时任务列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:schedule:list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = scheduleJobService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-	/**
-	 * 定时任务信息
-	 */
-	@GetMapping("/info/{jobId}")
-	@RequiresPermissions("sys:schedule:info")
-	public R info(@PathVariable("jobId") Long jobId){
-		ScheduleJob schedule = scheduleJobService.findById(jobId);
-		
-		return R.ok().put("schedule", schedule);
-	}
-	
-	/**
-	 * 保存定时任务
-	 */
-	@SysLog("保存定时任务")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:schedule:save")
-	public R save(@RequestBody ScheduleJob scheduleJob){
-		ValidatorUtils.validateEntity(scheduleJob);
-
-		scheduleJobService.save(scheduleJob);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改定时任务
-	 */
-	@SysLog("修改定时任务")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:schedule:update")
-	public R update(@RequestBody ScheduleJob scheduleJob){
-		ValidatorUtils.validateEntity(scheduleJob);
-				
-		scheduleJobService.update(scheduleJob);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除定时任务
-	 */
-	@SysLog("删除定时任务")
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:schedule:delete")
-	public R delete(@RequestBody Long[] jobIds){
-		scheduleJobService.deleteBatch(jobIds);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 立即执行任务
-	 */
-	@SysLog("立即执行任务")
-	@PostMapping("/run")
-	@RequiresPermissions("sys:schedule:run")
-	public R run(@RequestBody Long[] jobIds){
-		scheduleJobService.run(jobIds);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 暂停定时任务
-	 */
-	@SysLog("暂停定时任务")
-	@PostMapping("/pause")
-	@RequiresPermissions("sys:schedule:pause")
-	public R pause(@RequestBody Long[] jobIds){
-		scheduleJobService.pause(jobIds);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 恢复定时任务
-	 */
-	@SysLog("恢复定时任务")
-	@PostMapping("/resume")
-	@RequiresPermissions("sys:schedule:resume")
-	public R resume(@RequestBody Long[] jobIds){
-		scheduleJobService.resume(jobIds);
-		
-		return R.ok();
-	}
-
-}

src/main/java/com/warewms/controller/ScheduleJobLogController.java

@@ -1,61 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.model.ScheduleJobLog;
-import com.warewms.service.ScheduleJobLogService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * 定时任务日志
- *
- * @author Mark sunlightcs@gmail.com
- * @since 1.2.0 2016-11-28
- */
-@RestController
-@RequestMapping("/sys/scheduleLog")
-public class ScheduleJobLogController {
-	@Autowired
-	private ScheduleJobLogService scheduleJobLogService;
-	
-	/**
-	 * 定时任务日志列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:schedule:log")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = scheduleJobLogService.queryPage(params);
-		
-		return R.ok().put("page", page);
-	}
-	
-	/**
-	 * 定时任务日志信息
-	 */
-	@GetMapping("/info/{logId}")
-	public R info(@PathVariable("logId") Long logId){
-		ScheduleJobLog log = scheduleJobLogService.findById(logId);
-		
-		return R.ok().put("log", log);
-	}
-}

src/main/java/com/warewms/controller/SysBasCustomerController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.BasCustomerService;
-import com.warewms.model.BasCustomer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/basCustomer")
-public class SysBasCustomerController {
-
-	@Autowired
-	private BasCustomerService basCustomerService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = basCustomerService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        BasCustomer basCustomer = basCustomerService.findById(id);
-		return R.ok().put("basCustomer", basCustomer);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody BasCustomer basCustomer) {
-		basCustomer.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody BasCustomer basCustomer) {
-		basCustomer.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        basCustomerService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysBasGtnLotattController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.BasGtnLotattService;
-import com.warewms.model.BasGtnLotatt;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/basGtnLotatt")
-public class SysBasGtnLotattController {
-
-	@Autowired
-	private BasGtnLotattService basGtnLotattService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = basGtnLotattService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        BasGtnLotatt basGtnLotatt = basGtnLotattService.findById(id);
-		return R.ok().put("basGtnLotatt", basGtnLotatt);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody BasGtnLotatt basGtnLotatt) {
-		basGtnLotatt.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody BasGtnLotatt basGtnLotatt) {
-		basGtnLotatt.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        basGtnLotattService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysBasPackageController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.BasPackageService;
-import com.warewms.model.BasPackage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/basPackage")
-public class SysBasPackageController {
-
-	@Autowired
-	private BasPackageService basPackageService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = basPackageService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        BasPackage basPackage = basPackageService.findById(id);
-		return R.ok().put("basPackage", basPackage);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody BasPackage basPackage) {
-		basPackage.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody BasPackage basPackage) {
-		basPackage.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        basPackageService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysBasSkuController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.BasSkuService;
-import com.warewms.model.BasSku;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/basSku")
-public class SysBasSkuController {
-
-	@Autowired
-	private BasSkuService basSkuService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = basSkuService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        BasSku basSku = basSkuService.findById(id);
-		return R.ok().put("basSku", basSku);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody BasSku basSku) {
-		basSku.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody BasSku basSku) {
-		basSku.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        basSkuService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysConfigController.java

@@ -1,108 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.model.SysConfig;
-import com.warewms.service.SysConfigService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * 系统配置信息
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年12月4日 下午6:55:53
- */
-@RestController
-@RequestMapping("/sys/config")
-public class SysConfigController extends AbstractController {
-	@Autowired
-	private SysConfigService sysConfigService;
-	
-	/**
-	 * 所有配置列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:config:list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = sysConfigService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-	
-	/**
-	 * 配置信息
-	 */
-	@GetMapping("/info/{id}")
-	@RequiresPermissions("sys:config:info")
-	public R info(@PathVariable("id") Long id){
-		SysConfig config = sysConfigService.findById(id);
-		
-		return R.ok().put("config", config);
-	}
-	
-	/**
-	 * 保存配置
-	 */
-	@SysLog("保存配置")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:config:save")
-	public R save(@RequestBody SysConfig config){
-		ValidatorUtils.validateEntity(config);
-
-		sysConfigService.save(config);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改配置
-	 */
-	@SysLog("修改配置")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:config:update")
-	public R update(@RequestBody SysConfig config){
-		ValidatorUtils.validateEntity(config);
-		
-		sysConfigService.update(config);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除配置
-	 */
-	@SysLog("删除配置")
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:config:delete")
-	public R delete(@RequestBody Long[] ids){
-		sysConfigService.deleteBatch(ids);
-		
-		return R.ok();
-	}
-
-}

src/main/java/com/warewms/controller/SysDocAsnDetailsController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.DocAsnDetailsService;
-import com.warewms.model.DocAsnDetails;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/docAsnDetails")
-public class SysDocAsnDetailsController {
-
-	@Autowired
-	private DocAsnDetailsService docAsnDetailsService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = docAsnDetailsService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        DocAsnDetails docAsnDetails = docAsnDetailsService.findById(id);
-		return R.ok().put("docAsnDetails", docAsnDetails);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody DocAsnDetails docAsnDetails) {
-		docAsnDetails.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody DocAsnDetails docAsnDetails) {
-		docAsnDetails.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        docAsnDetailsService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysDocAsnHeaderController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.DocAsnHeaderService;
-import com.warewms.model.DocAsnHeader;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/docAsnHeader")
-public class SysDocAsnHeaderController {
-
-	@Autowired
-	private DocAsnHeaderService docAsnHeaderService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = docAsnHeaderService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        DocAsnHeader docAsnHeader = docAsnHeaderService.findById(id);
-		return R.ok().put("docAsnHeader", docAsnHeader);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody DocAsnHeader docAsnHeader) {
-		docAsnHeader.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody DocAsnHeader docAsnHeader) {
-		docAsnHeader.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        docAsnHeaderService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysDocOrderDetailsController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.DocOrderDetailsService;
-import com.warewms.model.DocOrderDetails;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/docOrderDetails")
-public class SysDocOrderDetailsController {
-
-	@Autowired
-	private DocOrderDetailsService docOrderDetailsService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = docOrderDetailsService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        DocOrderDetails docOrderDetails = docOrderDetailsService.findById(id);
-		return R.ok().put("docOrderDetails", docOrderDetails);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody DocOrderDetails docOrderDetails) {
-		docOrderDetails.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody DocOrderDetails docOrderDetails) {
-		docOrderDetails.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        docOrderDetailsService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysDocOrderHeaderController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.DocOrderHeaderService;
-import com.warewms.model.DocOrderHeader;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/docOrderHeader")
-public class SysDocOrderHeaderController {
-
-	@Autowired
-	private DocOrderHeaderService docOrderHeaderService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = docOrderHeaderService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        DocOrderHeader docOrderHeader = docOrderHeaderService.findById(id);
-		return R.ok().put("docOrderHeader", docOrderHeader);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody DocOrderHeader docOrderHeader) {
-		docOrderHeader.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody DocOrderHeader docOrderHeader) {
-		docOrderHeader.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        docOrderHeaderService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysInvLotAttController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.InvLotAttService;
-import com.warewms.model.InvLotAtt;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/invLotAtt")
-public class SysInvLotAttController {
-
-	@Autowired
-	private InvLotAttService invLotAttService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = invLotAttService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        InvLotAtt invLotAtt = invLotAttService.findById(id);
-		return R.ok().put("invLotAtt", invLotAtt);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody InvLotAtt invLotAtt) {
-		invLotAtt.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody InvLotAtt invLotAtt) {
-		invLotAtt.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        invLotAttService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysItemCategoryController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.ItemCategoryService;
-import com.warewms.model.ItemCategory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/itemCategory")
-public class SysItemCategoryController {
-
-	@Autowired
-	private ItemCategoryService itemCategoryService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = itemCategoryService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        ItemCategory itemCategory = itemCategoryService.findById(id);
-		return R.ok().put("itemCategory", itemCategory);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody ItemCategory itemCategory) {
-		itemCategory.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody ItemCategory itemCategory) {
-		itemCategory.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        itemCategoryService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysItemController.java

@@ -1,70 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.ItemService;
-import com.warewms.model.Item;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@Controller
-@RequestMapping("/sys/item")
-public class SysItemController {
-
-	@Autowired
-	private ItemService itemService;
-
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = itemService.queryPage(params);
-		return R.ok().put("page", page);
-	}
-
-	/**
-	 * 详情
-	 */
-	@ResponseBody
-	@GetMapping("/info/{id}")
-	public R info(@PathVariable Object id){
-        Item item = itemService.findById(id);
-		return R.ok().put("item", item);
-	}
-
-	/**
-	 * 更新
-	 */
-	@ResponseBody
-	@PostMapping("/update")
-	public R update(@RequestBody Item item) {
-		item.update();
-		return R.ok();
-	}
-
-	/**
-	 * 新增
-	 */
-	@ResponseBody
-	@PostMapping("/save")
-	public R save(@RequestBody Item item) {
-		item.save();
-		return R.ok();
-	}
-
-	/**
-	 * 删除
-	 */
-	@ResponseBody
-	@PostMapping("/delete")
-    public R delete(@RequestBody Object[] ids) {
-        itemService.deleteBatch(ids);
-        return R.ok();
-    }
-
-}

src/main/java/com/warewms/controller/SysLogController.java

@@ -1,58 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.service.SysLogService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.Map;
-
-
-/**
- * 系统日志
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-03-08 10:40:56
- */
-@Controller
-@RequestMapping("/sys/log")
-public class SysLogController {
-	@Autowired
-	private SysLogService sysLogService;
-	
-	/**
-	 * 列表
-	 */
-	@ResponseBody
-	@GetMapping("/list")
-	@RequiresPermissions("sys:log:list")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = sysLogService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-}

src/main/java/com/warewms/controller/SysLoginController.java

@@ -1,113 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.utils.R;
-import com.warewms.enums.OrderStatusEnum;
-import com.warewms.model.SysUser;
-import com.warewms.service.*;
-import com.warewms.form.SysLoginForm;
-import org.apache.commons.io.IOUtils;
-import org.apache.shiro.crypto.hash.Sha256Hash;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.imageio.ImageIO;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 登录相关
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年11月10日 下午1:15:31
- */
-@RestController
-public class SysLoginController extends AbstractController {
-	@Autowired
-	private SysUserService sysUserService;
-	@Autowired
-	private SysUserTokenService sysUserTokenService;
-	@Autowired
-	private SysCaptchaService sysCaptchaService;
-
-	@Autowired
-	private UserService userService;
-
-	/**
-	 * 验证码
-	 */
-	@GetMapping("captcha.jpg")
-	public void captcha(HttpServletResponse response, String uuid)throws ServletException, IOException {
-		response.setHeader("Cache-Control", "no-store, no-cache");
-		response.setContentType("image/jpeg");
-
-		//获取图片验证码
-		BufferedImage image = sysCaptchaService.getCaptcha(uuid);
-
-		ServletOutputStream out = response.getOutputStream();
-		ImageIO.write(image, "jpg", out);
-		IOUtils.closeQuietly(out);
-	}
-
-	/**
-	 * 验证码
-	 */
-	@GetMapping("/home/dash/info")
-	public void dashInfo(){
-		Integer totalUsers = userService.getTotalUsers();
-		Integer newUsers = userService.getYestodayNewUsers();
-		Integer waitingOrder = 0;
-		R.ok()
-			.put("newUsers", newUsers)
-			.put("totalUsers", totalUsers)
-			.put("waitingOrder", waitingOrder);
-	}
-
-	/**
-	 * 登录
-	 */
-	@PostMapping("/sys/login")
-	public Map<String, Object> login(@RequestBody SysLoginForm form)throws IOException {
-		boolean captcha = sysCaptchaService.validate(form.getUuid(), form.getCaptcha());
-		if(!captcha){
-			return R.error("验证码不正确");
-		}
-
-		//用户信息
-		SysUser user = sysUserService.queryByUserName(form.getUsername());
-
-		//账号不存在、密码错误
-		if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
-			return R.error("账号或密码不正确");
-		}
-
-		//账号锁定
-		if(user.getStatus() == 0){
-			return R.error("账号已被锁定,请联系管理员");
-		}
-
-		//生成token，并保存到数据库
-		R r = sysUserTokenService.createToken(user.getUserId());
-		return r;
-	}
-
-
-	/**
-	 * 退出
-	 */
-	@PostMapping("/sys/logout")
-	public R logout() {
-		sysUserTokenService.logout(getUserId());
-		return R.ok();
-	}
-	
-}

src/main/java/com/warewms/controller/SysMenuController.java

@@ -1,243 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.exception.RRException;
-import com.warewms.common.utils.Constant;
-import com.warewms.common.utils.R;
-import com.warewms.model.SysMenu;
-import com.warewms.service.ShiroService;
-import com.warewms.service.SysMenuService;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 系统菜单
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年10月27日 下午9:58:15
- */
-@RestController
-@RequestMapping("/sys/menu")
-public class SysMenuController extends AbstractController {
-	@Autowired
-	private SysMenuService sysMenuService;
-	@Autowired
-	private ShiroService shiroService;
-
-	@RequestMapping(value="/media/", method=RequestMethod.GET)
-	public void getDownload(Long id, HttpServletRequest request, HttpServletResponse response) {
-
-		// Get your file stream from wherever.
-		String fullPath = "E:/" + id +".rmvb";
-
-		ServletContext context = request.getServletContext();
-
-		// get MIME type of the file
-		String mimeType = context.getMimeType(fullPath);
-		if (mimeType == null) {
-			// set to binary type if MIME mapping not found
-			mimeType = "application/octet-stream";
-			System.out.println("context getMimeType is null");
-		}
-		System.out.println("MIME type: " + mimeType);
-
-		// set content attributes for the response
-		response.setContentType(mimeType);
-//		response.setContentLength((int) downloadFile.length());
-
-		// set headers for the response
-		String headerKey = "Content-Disposition";
-		String headerValue = String.format("attachment; filename=\"%s\"",
-				"test");
-		response.setHeader(headerKey, headerValue);
-		// Copy the stream to the response's output stream.
-		try {
-			InputStream myStream = new FileInputStream(fullPath);
-			IOUtils.copy(myStream, response.getOutputStream());
-			response.flushBuffer();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 导航菜单
-	 */
-	@GetMapping("/nav")
-	public R nav(){
-		List<SysMenu> menuList = sysMenuService.getUserMenuList(getUserId());
-		Set<String> permissions = shiroService.getUserPermissions(getUserId());
-		return R.ok().put("menuList", menuList).put("permissions", permissions);
-	}
-	
-	/**
-	 * 所有菜单列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:menu:list")
-	public List<SysMenu> list(){
-		List<SysMenu> menuList = sysMenuService.findAll();
-		for(SysMenu SysMenu : menuList){
-			SysMenu parentMenu = sysMenuService.findById(SysMenu.getParentId());
-			if(parentMenu != null){
-				SysMenu.setParentName(parentMenu.getName());
-			}
-		}
-
-		return menuList;
-	}
-	
-	/**
-	 * 选择菜单(添加、修改菜单)
-	 */
-	@GetMapping("/select")
-	@RequiresPermissions("sys:menu:select")
-	public R select(){
-		//查询列表数据
-		List<SysMenu> menuList = sysMenuService.queryNotButtonList();
-		
-		//添加顶级菜单
-		SysMenu root = new SysMenu();
-		root.setMenuId(0L);
-		root.setName("一级菜单");
-		root.setParentId(-1L);
-		root.setOpen(true);
-		menuList.add(root);
-		
-		return R.ok().put("menuList", menuList);
-	}
-	
-	/**
-	 * 菜单信息
-	 */
-	@GetMapping("/info/{menuId}")
-	@RequiresPermissions("sys:menu:info")
-	public R info(@PathVariable("menuId") Long menuId){
-		SysMenu menu = sysMenuService.findById(menuId);
-		return R.ok().put("menu", menu);
-	}
-	
-	/**
-	 * 保存
-	 */
-	@SysLog("保存菜单")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:menu:save")
-	public R save(@RequestBody SysMenu menu){
-		//数据校验
-		verifyForm(menu);
-
-		menu.save();
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改
-	 */
-	@SysLog("修改菜单")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:menu:update")
-	public R update(@RequestBody SysMenu menu){
-		//数据校验
-		verifyForm(menu);
-		menu.update();
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除
-	 */
-	@SysLog("删除菜单")
-	@PostMapping("/delete/{menuId}")
-	@RequiresPermissions("sys:menu:delete")
-	public R delete(@PathVariable("menuId") long menuId){
-		if(menuId <= 31){
-			return R.error("系统菜单，不能删除");
-		}
-
-		//判断是否有子菜单或按钮
-		List<SysMenu> menuList = sysMenuService.queryListParentId(menuId);
-		if(menuList.size() > 0){
-			return R.error("请先删除子菜单或按钮");
-		}
-
-		sysMenuService.delete(menuId);
-
-		return R.ok();
-	}
-	
-	/**
-	 * 验证参数是否正确
-	 */
-	private void verifyForm(SysMenu menu){
-		if(StringUtils.isBlank(menu.getName())){
-			throw new RRException("菜单名称不能为空");
-		}
-		
-		if(menu.getParentId() == null){
-			throw new RRException("上级菜单不能为空");
-		}
-		
-		//菜单
-		if(menu.getType() == Constant.MenuType.MENU.getValue()){
-			if(StringUtils.isBlank(menu.getUrl())){
-				throw new RRException("菜单URL不能为空");
-			}
-		}
-		
-		//上级菜单类型
-		int parentType = Constant.MenuType.CATALOG.getValue();
-		if(menu.getParentId() != 0){
-			SysMenu parentMenu = sysMenuService.findById(menu.getParentId());
-			parentType = parentMenu.getType();
-		}
-		
-		//目录、菜单
-		if(menu.getType() == Constant.MenuType.CATALOG.getValue() ||
-				menu.getType() == Constant.MenuType.MENU.getValue()){
-			if(parentType != Constant.MenuType.CATALOG.getValue()){
-				throw new RRException("上级菜单只能为目录类型");
-			}
-			return ;
-		}
-		
-		//按钮
-		if(menu.getType() == Constant.MenuType.BUTTON.getValue()){
-			if(parentType != Constant.MenuType.MENU.getValue()){
-				throw new RRException("上级菜单只能为菜单类型");
-			}
-			return ;
-		}
-	}
-}

src/main/java/com/warewms/controller/SysOssController.java

@@ -1,143 +0,0 @@
-/**
- * Copyright 2018
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.warewms.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.warewms.common.exception.RRException;
-import com.warewms.common.utils.ConfigConstant;
-import com.warewms.common.utils.Constant;
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.common.validator.group.AliyunGroup;
-import com.warewms.common.validator.group.QcloudGroup;
-import com.warewms.common.validator.group.QiniuGroup;
-import com.warewms.model.SysOss;
-import com.warewms.oss.cloud.CloudStorageConfig;
-import com.warewms.oss.cloud.OSSFactory;
-import com.warewms.service.SysOssService;
-import com.warewms.service.SysConfigService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 文件上传
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2017-03-25 12:13:26
- */
-@RestController
-@RequestMapping("sys/oss")
-public class SysOssController {
-	@Autowired
-	private SysOssService sysOssService;
-    @Autowired
-    private SysConfigService sysConfigService;
-
-    private final static String KEY = ConfigConstant.CLOUD_STORAGE_CONFIG_KEY;
-	
-	/**
-	 * 列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:oss:all")
-	public R list(@RequestParam Map<String, Object> params){
-		PageUtils page = sysOssService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-
-
-    /**
-     * 云存储配置信息
-     */
-    @GetMapping("/config")
-    @RequiresPermissions("sys:oss:all")
-    public R config(){
-        CloudStorageConfig config = sysConfigService.getConfigObject(KEY, CloudStorageConfig.class);
-
-        return R.ok().put("config", config);
-    }
-
-
-	/**
-	 * 保存云存储配置信息
-	 */
-	@PostMapping("/saveConfig")
-	@RequiresPermissions("sys:oss:all")
-	public R saveConfig(@RequestBody CloudStorageConfig config){
-		//校验类型
-		ValidatorUtils.validateEntity(config);
-
-		if(config.getType() == Constant.CloudService.QINIU.getValue()){
-			//校验七牛数据
-			ValidatorUtils.validateEntity(config, QiniuGroup.class);
-		}else if(config.getType() == Constant.CloudService.ALIYUN.getValue()){
-			//校验阿里云数据
-			ValidatorUtils.validateEntity(config, AliyunGroup.class);
-		}else if(config.getType() == Constant.CloudService.QCLOUD.getValue()){
-			//校验腾讯云数据
-			ValidatorUtils.validateEntity(config, QcloudGroup.class);
-		}
-
-        sysConfigService.updateValueByKey(KEY, JSON.toJSONString(config));
-
-		return R.ok();
-	}
-	
-
-	/**
-	 * 上传文件
-	 */
-	@PostMapping("/upload")
-	@RequiresPermissions("sys:oss:all")
-	public R upload(@RequestParam("file") MultipartFile file) throws Exception {
-		if (file.isEmpty()) {
-			throw new RRException("上传文件不能为空");
-		}
-
-		//上传文件
-		String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-		String url = OSSFactory.build().uploadSuffix(file.getBytes(), suffix);
-
-		//保存文件信息
-		SysOss sysOss = new SysOss();
-		sysOss.setUrl(url);
-		sysOss.setCreateDate(new Date());
-		sysOss.save();
-
-		return R.ok().put("url", url);
-	}
-
-
-	/**
-	 * 删除
-	 */
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:oss:all")
-	public R delete(@RequestBody Long[] ids){
-		sysConfigService.deleteBatch(ids);
-		return R.ok();
-	}
-
-}

src/main/java/com/warewms/controller/SysRoleController.java

@@ -1,121 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.utils.Constant;
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.model.SysRole;
-import com.warewms.service.SysRoleMenuService;
-import com.warewms.service.SysRoleService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 角色管理
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年11月8日 下午2:18:33
- */
-@RestController
-@RequestMapping("/sys/role")
-public class SysRoleController extends AbstractController {
-	@Autowired
-	private SysRoleService sysRoleService;
-	@Autowired
-	private SysRoleMenuService sysRoleMenuService;
-
-	/**
-	 * 角色列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:role:list")
-	public R list(@RequestParam Map<String, Object> params){
-		//如果不是超级管理员，则只查询自己创建的角色列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}
-
-		PageUtils page = sysRoleService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-	/**
-	 * 角色列表
-	 */
-	@GetMapping("/select")
-	@RequiresPermissions("sys:role:select")
-	public R select(){
-		SysRole sysRole = new SysRole();
-		
-		//如果不是超级管理员，则只查询自己所拥有的角色列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			sysRole.setCreateUserId(getUserId());
-		}
-		List<SysRole> list = sysRoleService.findByModel(sysRole);
-		
-		return R.ok().put("list", list);
-	}
-	
-	/**
-	 * 角色信息
-	 */
-	@GetMapping("/info/{roleId}")
-	@RequiresPermissions("sys:role:info")
-	public R info(@PathVariable("roleId") Long roleId){
-		SysRole role = sysRoleService.findById(roleId);
-		
-		//查询角色对应的菜单
-		List<Long> menuIdList = sysRoleMenuService.queryMenuIdList(roleId);
-		role.setMenuIdList(menuIdList);
-		
-		return R.ok().put("role", role);
-	}
-	
-	/**
-	 * 保存角色
-	 */
-	@SysLog("保存角色")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:role:save")
-	public R save(@RequestBody SysRole role){
-		ValidatorUtils.validateEntity(role);
-		
-		role.setCreateUserId(getUserId());
-		sysRoleService.save(role);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改角色
-	 */
-	@SysLog("修改角色")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:role:update")
-	public R update(@RequestBody SysRole role){
-		ValidatorUtils.validateEntity(role);
-		role.setCreateUserId(getUserId());
-		sysRoleService.update(role);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除角色
-	 */
-	@SysLog("删除角色")
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:role:delete")
-	public R delete(@RequestBody Long[] roleIds){
-		sysRoleService.deleteBatch(roleIds);
-		
-		return R.ok();
-	}
-}

src/main/java/com/warewms/controller/SysUserController.java

@@ -1,148 +0,0 @@
-package com.warewms.controller;
-
-import com.warewms.common.annotation.SysLog;
-import com.warewms.common.utils.Constant;
-import com.warewms.common.utils.PageUtils;
-import com.warewms.common.utils.R;
-import com.warewms.common.validator.Assert;
-import com.warewms.common.validator.ValidatorUtils;
-import com.warewms.common.validator.group.AddGroup;
-import com.warewms.common.validator.group.UpdateGroup;
-import com.warewms.model.SysUser;
-import com.warewms.form.PasswordForm;
-import com.warewms.service.SysUserRoleService;
-import com.warewms.service.SysUserService;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.crypto.hash.Sha256Hash;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 系统用户
- * 
- * @author chenshun
- * @email sunlightcs@gmail.com
- * @date 2016年10月31日 上午10:40:10
- */
-@RestController
-@RequestMapping("/sys/user")
-public class SysUserController extends AbstractController {
-	@Autowired
-	private SysUserService sysUserService;
-	@Autowired
-	private SysUserRoleService sysUserRoleService;
-
-	/**
-	 * 所有用户列表
-	 */
-	@GetMapping("/list")
-	@RequiresPermissions("sys:user:list")
-	public R list(@RequestParam Map<String, Object> params){
-		//只有超级管理员，才能查看所有管理员列表
-		if(getUserId() != Constant.SUPER_ADMIN){
-			params.put("createUserId", getUserId());
-		}
-		PageUtils page = sysUserService.queryPage(params);
-
-		return R.ok().put("page", page);
-	}
-	
-	/**
-	 * 获取登录的用户信息
-	 */
-	@GetMapping("/info")
-	public R info(){
-		return R.ok().put("user", getUser());
-	}
-	
-	/**
-	 * 修改登录用户密码
-	 */
-	@SysLog("修改密码")
-	@PostMapping("/password")
-	public R password(@RequestBody PasswordForm form){
-		Assert.isBlank(form.getNewPassword(), "新密码不为能空");
-		
-		//sha256加密
-		String password = new Sha256Hash(form.getPassword(), getUser().getSalt()).toHex();
-		//sha256加密
-		String newPassword = new Sha256Hash(form.getNewPassword(), getUser().getSalt()).toHex();
-				
-		//更新密码
-		boolean flag = sysUserService.updatePassword(getUserId(), password, newPassword);
-		if(!flag){
-			return R.error("原密码不正确");
-		}
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 用户信息
-	 */
-	@GetMapping("/info/{userId}")
-	@RequiresPermissions("sys:user:info")
-	public R info(@PathVariable("userId") Long userId){
-		SysUser user = sysUserService.findById(userId);
-		
-		//获取用户所属的角色列表
-		List<Long> roleIdList = sysUserRoleService.queryRoleIdList(userId);
-		user.setRoleIdList(roleIdList);
-		
-		return R.ok().put("user", user);
-	}
-	
-	/**
-	 * 保存用户
-	 */
-	@SysLog("保存用户")
-	@PostMapping("/save")
-	@RequiresPermissions("sys:user:save")
-	public R save(@RequestBody SysUser user){
-		ValidatorUtils.validateEntity(user, AddGroup.class);
-		
-		user.setCreateUserId(getUserId());
-		sysUserService.save(user);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 修改用户
-	 */
-	@SysLog("修改用户")
-	@PostMapping("/update")
-	@RequiresPermissions("sys:user:update")
-	public R update(@RequestBody SysUser user){
-		ValidatorUtils.validateEntity(user, UpdateGroup.class);
-
-		user.setCreateUserId(getUserId());
-		sysUserService.update(user);
-		
-		return R.ok();
-	}
-	
-	/**
-	 * 删除用户
-	 */
-	@SysLog("删除用户")
-	@PostMapping("/delete")
-	@RequiresPermissions("sys:user:delete")
-	public R delete(@RequestBody Long[] userIds){
-		if(ArrayUtils.contains(userIds, 1L)){
-			return R.error("系统管理员不能删除");
-		}
-		
-		if(ArrayUtils.contains(userIds, getUserId())){
-			return R.error("当前用户不能删除");
-		}
-		
-		sysUserService.deleteBatch(userIds);
-		
-		return R.ok();
-	}
-}

src/main/java/com/warewms/controller/UEditorController.java

@@ -1,39 +0,0 @@
-package com.warewms.controller;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baidu.ueditor.ActionEnter;
-
-@WebServlet(name = "UEditorServlet", urlPatterns = "/UEditor")
-public class UEditorController extends HttpServlet {
-
-    public void doGet(HttpServletRequest request,HttpServletResponse response) throws ServletException,IOException{
-        doPost(request, response);
-    }
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        request.setCharacterEncoding( "utf-8" );
-        response.setHeader("Content-Type" , "text/html");
-        PrintWriter out = response.getWriter();
-        ServletContext application=this.getServletContext();
-        String rootPath = application.getRealPath( "/" );
-
-        String action = request.getParameter("action");
-        String result = new ActionEnter( request, rootPath ).exec();
-        if( action!=null &&
-                (action.equals("listfile") || action.equals("listimage") ) ){
-            rootPath = rootPath.replace("\\", "/");
-            result = result.replaceAll(rootPath, "/");
-        }
-        out.write( result );
-    }
-
-}

src/main/java/com/warewms/controller/api/KingdeeController.java

@@ -1,245 +0,0 @@
-package com.warewms.controller.api;
-
-import cn.hutool.core.date.DateUtil;
-import com.warewms.common.entity.kingdee.form.AsnForm;
-import com.warewms.common.entity.kingdee.form.OrderForm;
-import com.warewms.common.entity.kingdee.form.QcStatusForm;
-import com.warewms.common.utils.GuavaCacheUtil;
-import com.warewms.common.utils.R;
-import com.warewms.model.BasCodes;
-import com.warewms.service.AsnImportService;
-import com.warewms.service.BasCodesService;
-import com.warewms.service.KingdeeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * Created by IntelliJ IDEA.
- * User: andy.qu
- * Date: 2019/9/12
- */
-@RestController
-@RequestMapping("/kingdee")
-@Api("warewms金蝶对接接口")
-@Slf4j
-public class KingdeeController {
-
-    @Autowired
-    private KingdeeService kingdeeService;
-
-    @Autowired
-    private BasCodesService basCodesService;
-
-    @Autowired
-    private AsnImportService asnImportService;
-
-    @GetMapping("catchJsjy")
-    @ApiOperation("抓取嘉事嘉意单据")
-    public R catchJsjy() throws Exception {
-
-        asnImportService.importJsjyData();
-        return R.ok("抓取成功");
-    }
-
-    @PostMapping("addAsn")
-    @ApiOperation("上游系统推送入库通知至WMS")
-    public R addAsn(@RequestBody AsnForm asnForm) throws Exception {
-
-        if(GuavaCacheUtil.getValue(asnForm.getUserdefine1()) != null){
-            log.info("判重码已存在："+asnForm.getUserdefine1());
-            return R.error("判重码已存在："+asnForm.getUserdefine1());
-        }else {
-            GuavaCacheUtil.setValue(asnForm.getUserdefine1(),asnForm.getUserdefine1());
-        }
-
-        if(StringUtils.isEmpty(asnForm.getWarehouseId())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("仓库编号不能为空");
-        }
-
-        if(StringUtils.isEmpty(asnForm.getCustomerId())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("货主编号不能为空");
-        }
-
-        if(StringUtils.isEmpty(asnForm.getAsnNo())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("入库单号不能为空");
-        }
-
-        if(StringUtils.isEmpty(asnForm.getAsnType())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("订单类型不能为空");
-        }else if (!basCodesService.isExist(BasCodes.ASN_TYPE, asnForm.getAsnType())) {
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("订单类型错误");
-        }
-
-        if(StringUtils.isEmpty(asnForm.getExpDate())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("预计到货日期不能为空");
-        }else {
-            try{
-                DateUtil.parse(asnForm.getExpDate(), "yyyy-MM-dd");
-            }catch (Exception e){
-                e.printStackTrace();
-                return R.error("日期格式错误");
-            }finally {
-                GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            }
-        }
-
-        if(StringUtils.isEmpty(asnForm.getUserdefine1())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("金蝶判重码不能为空");
-        }
-
-        if(asnForm.getAsnType().equalsIgnoreCase(BasCodes.ASN_TYPE_DB) ){
-            if (StringUtils.isEmpty(asnForm.getUserdefine2())) {
-                GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-                return R.error("分布式调入单的调出库存组织编码不能为空");
-            }else if (StringUtils.isEmpty(asnForm.getUserdefine3())) {
-                GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-                return R.error("分布式调入单的调出仓库编码不能为空");
-            }
-        }
-
-        if(StringUtils.isEmpty(asnForm.getUserdefine4())){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("金蝶账套ID不能为空");
-        }
-
-        if(asnForm.getItemList() == null || asnForm.getItemList().size() == 0){
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-            return R.error("表体数据为空");
-        }
-
-        try {
-
-            return kingdeeService.addAsn(asnForm);
-        } catch (Exception e) {
-
-            return R.error("接口发生错误，请联系管理员：" + e.getMessage());
-        }finally {
-            GuavaCacheUtil.delValue(asnForm.getUserdefine1());
-        }
-    }
-
-    @PostMapping("addOrder")
-    @ApiOperation("上游系统推送出库通知至WMS")
-    public R addOrder(@RequestBody OrderForm orderForm) throws Exception {
-
-        if(GuavaCacheUtil.getValue(orderForm.getUserdefine1()) != null){
-            log.info("判重码已存在："+orderForm.getUserdefine1());
-            return R.error("判重码已存在："+orderForm.getUserdefine1());
-        }else {
-            GuavaCacheUtil.setValue(orderForm.getUserdefine1(),orderForm.getUserdefine1());
-        }
-
-        if(StringUtils.isEmpty(orderForm.getWarehouseId())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("仓库编号不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getCustomerId())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("货主编号不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getOrderNo())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("出库单号不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getOrderType())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("订单类型不能为空");
-        }else if (!basCodesService.isExist(BasCodes.SO_TYPE, orderForm.getOrderType())) {
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("订单类型错误");
-        }
-
-        if (StringUtils.isNotEmpty(orderForm.getCarrierId()) && !basCodesService.isExist(BasCodes.EXP_TYPE, orderForm.getCarrierId())) {
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("配送方式类型不存在");
-        }
-
-        if (!orderForm.getCarrierId().equals("ZT")) {
-            if (!orderForm.getCarrierId().equals("TH") && !orderForm.getCarrierId().equals("BK")) {
-                return R.error("顺丰速运只有特惠和标快，请选择正确的配送方式");
-            }
-        }
-
-        if(StringUtils.isEmpty(orderForm.getName())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("收件人姓名不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getMobile())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("收件人手机号不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getAddress())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("收件人地址不能为空");
-        }
-
-        if(StringUtils.isEmpty(orderForm.getUserdefine1())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("金蝶判重码不能为空");
-        }
-
-        if (orderForm.getOrderType().equals(BasCodes.SO_TYPE_DX) && StringUtils.isEmpty(orderForm.getUserdefine2())) {
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("定向出库单关联的定向入库的发货凭证不能为空");
-        }
-
-        if(orderForm.getOrderType().equalsIgnoreCase(BasCodes.SO_TYPE_DB) ){
-            if (StringUtils.isEmpty(orderForm.getUserdefine3())) {
-                GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-                return R.error("分布式调出单的调入库存组织编码不能为空");
-            }else if (StringUtils.isEmpty(orderForm.getUserdefine4())) {
-                GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-                return R.error("分布式调出单的调入仓库编码不能为空");
-            }
-        }
-
-        if(StringUtils.isEmpty(orderForm.getUserdefine5())){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("金蝶账套ID不能为空");
-        }
-
-        if(orderForm.getItemList() == null || orderForm.getItemList().size() == 0){
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-            return R.error("表体数据为空");
-        }
-
-        try {
-
-            return kingdeeService.addOrder(orderForm);
-        } catch (Exception e) {
-
-            return R.error("接口发生错误，请联系管理员：" + e.getMessage());
-        }finally {
-            GuavaCacheUtil.delValue(orderForm.getUserdefine1());
-        }
-    }
-
-    @PostMapping("updateQcStatus")
-    @ApiOperation("上游系统推送质量状态变更通知至WMS")
-    public R updateQcStatus(@RequestBody QcStatusForm qcStatusForm){
-        return R.error("接口未启用，请联系管理员");//接收的是件数，要做修改
-//        try{
-//
-//            return kingdeeService.addDocQsm(qcStatusForm);
-//        }catch (Exception e){
-//
-//            return R.error(e.getMessage());
-//        }
-    }
-}

src/main/java/com/warewms/controller/api/WMS4K3CloudController.java

@@ -1,12 +1,6 @@
 package com.warewms.controller.api;
 
-import com.warewms.common.utils.R;
-import com.warewms.service.K3CloudPostBackService;
-import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,62 +16,62 @@ import org.springframework.web.bind.annotation.RestController;
 @Api("warewms回传金蝶单据接口")
 public class WMS4K3CloudController {
 
-    @Autowired
-    private K3CloudPostBackService k3CloudPostBackService;
-
-    @PostMapping("sal_outstock")
-    @ApiOperation("销售出库单回传金蝶")
-    public R postBackSalesOut(@Param("orderno") String orderno) throws Exception {
-
-        return k3CloudPostBackService.postBackSalesOut(orderno);
-    }
-
-    @PostMapping("purchase_back")
-    @ApiOperation("采购退货回传金蝶")
-    public R postBackPurchaseBack(@Param("orderno") String orderno) throws Exception {
-
-        return k3CloudPostBackService.postBackPurchaseBack(orderno);
-    }
-
-    @PostMapping("distributed_outstock")
-    @ApiOperation("分布式调出单回传金蝶")
-    public R postBackFBSDCD(@Param("orderno") String orderno) throws Exception {
-
-        return k3CloudPostBackService.postBackFBSDCD(orderno);
-    }
-
-    @PostMapping("other_outstock")
-    @ApiOperation("其他出库单回传金蝶")
-    public R postBackQTCKD(@Param("orderno") String orderno) throws Exception {
-
-        return k3CloudPostBackService.postBackQTCKD(orderno);
-    }
-
-    @PostMapping("shkd_resendpur")
-    @ApiOperation("采购入库回传金蝶")
-    public R postBackResendPur(@Param("asnno") String asnno) throws Exception {
-
-        return k3CloudPostBackService.postBackPurchase(asnno);
-    }
-
-    @PostMapping("sale_back")
-    @ApiOperation("销售退货回传金蝶")
-    public R postBackSaleBack(@Param("asnno") String asnno) throws Exception {
-
-        return k3CloudPostBackService.postBackSaleBack(asnno);
-    }
-
-    @PostMapping("distributed_instock")
-    @ApiOperation("分布式调入单回传金蝶")
-    public R postBackFBSDRD(@Param("asnno") String asnno) throws Exception {
-
-        return k3CloudPostBackService.postBackFBSDRD(asnno);
-    }
-
-    @PostMapping("other_instock")
-    @ApiOperation("其他入库回传金蝶")
-    public R postBackQTRKD(@Param("asnno") String asnno) throws Exception {
-
-        return k3CloudPostBackService.postBackQTRKD(asnno);
-    }
+//    @Autowired
+//    private K3CloudPostBackService k3CloudPostBackService;
+//
+//    @PostMapping("sal_outstock")
+//    @ApiOperation("销售出库单回传金蝶")
+//    public R postBackSalesOut(@Param("orderno") String orderno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackSalesOut(orderno);
+//    }
+//
+//    @PostMapping("purchase_back")
+//    @ApiOperation("采购退货回传金蝶")
+//    public R postBackPurchaseBack(@Param("orderno") String orderno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackPurchaseBack(orderno);
+//    }
+//
+//    @PostMapping("distributed_outstock")
+//    @ApiOperation("分布式调出单回传金蝶")
+//    public R postBackFBSDCD(@Param("orderno") String orderno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackFBSDCD(orderno);
+//    }
+//
+//    @PostMapping("other_outstock")
+//    @ApiOperation("其他出库单回传金蝶")
+//    public R postBackQTCKD(@Param("orderno") String orderno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackQTCKD(orderno);
+//    }
+//
+//    @PostMapping("shkd_resendpur")
+//    @ApiOperation("采购入库回传金蝶")
+//    public R postBackResendPur(@Param("asnno") String asnno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackPurchase(asnno);
+//    }
+//
+//    @PostMapping("sale_back")
+//    @ApiOperation("销售退货回传金蝶")
+//    public R postBackSaleBack(@Param("asnno") String asnno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackSaleBack(asnno);
+//    }
+//
+//    @PostMapping("distributed_instock")
+//    @ApiOperation("分布式调入单回传金蝶")
+//    public R postBackFBSDRD(@Param("asnno") String asnno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackFBSDRD(asnno);
+//    }
+//
+//    @PostMapping("other_instock")
+//    @ApiOperation("其他入库回传金蝶")
+//    public R postBackQTRKD(@Param("asnno") String asnno) throws Exception {
+//
+//        return k3CloudPostBackService.postBackQTRKD(asnno);
+//    }
 }

src/main/java/com/warewms/dao/ActAllocationDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.ActAllocationDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ActAllocationDetailsDao extends BaseDao<ActAllocationDetails> {
-    public ActAllocationDetailsDao() {
-        super(ActAllocationDetails.class);
-    }
-}

src/main/java/com/warewms/dao/ActCancelAllocationLogDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.ActCancelAllocationLog;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ActCancelAllocationLogDao extends BaseDao<ActCancelAllocationLog> {
-    public ActCancelAllocationLogDao() {
-        super(ActCancelAllocationLog.class);
-    }
-}

src/main/java/com/warewms/dao/ActInventoryholdDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.ActInventoryhold;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ActInventoryholdDao extends BaseDao<ActInventoryhold> {
-    public ActInventoryholdDao() {
-        super(ActInventoryhold.class);
-    }
-}

src/main/java/com/warewms/dao/ActTransactionLogDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.ActTransactionLog;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ActTransactionLogDao extends BaseDao<ActTransactionLog> {
-    public ActTransactionLogDao() {
-        super(ActTransactionLog.class);
-    }
-}

src/main/java/com/warewms/dao/AreaDao.java

@@ -1,11 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.model.Area;
-import org.springframework.stereotype.Component;
-
-@Component
-public class AreaDao extends BaseDao<Area> {
-    public AreaDao() {
-        super(Area.class);
-    }
-}

src/main/java/com/warewms/dao/BasCarrierLicenseDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasCarrierLicense;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasCarrierLicenseDao extends BaseDao<BasCarrierLicense> {
-    public BasCarrierLicenseDao() {
-        super(BasCarrierLicense.class);
-    }
-}

src/main/java/com/warewms/dao/BasCodesDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasCodes;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasCodesDao extends BaseDao<BasCodes> {
-    public BasCodesDao() {
-        super(BasCodes.class);
-    }
-}

src/main/java/com/warewms/dao/BasCustomerDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasCustomer;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasCustomerDao extends BaseDao<BasCustomer> {
-    public BasCustomerDao() {
-        super(BasCustomer.class);
-    }
-}

src/main/java/com/warewms/dao/BasErpCustomerAssDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasErpCustomerAss;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasErpCustomerAssDao extends BaseDao<BasErpCustomerAss> {
-    public BasErpCustomerAssDao() {
-        super(BasErpCustomerAss.class);
-    }
-}

src/main/java/com/warewms/dao/BasGtnDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasGtn;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasGtnDao extends BaseDao<BasGtn> {
-    public BasGtnDao() {
-        super(BasGtn.class);
-    }
-}

src/main/java/com/warewms/dao/BasGtnLotattDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasGtnLotatt;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasGtnLotattDao extends BaseDao<BasGtnLotatt> {
-    public BasGtnLotattDao() {
-        super(BasGtnLotatt.class);
-    }
-}

src/main/java/com/warewms/dao/BasLocationDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasLocation;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasLocationDao extends BaseDao<BasLocation> {
-    public BasLocationDao() {
-        super(BasLocation.class);
-    }
-}

src/main/java/com/warewms/dao/BasPackageDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasPackage;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasPackageDao extends BaseDao<BasPackage> {
-    public BasPackageDao() {
-        super(BasPackage.class);
-    }
-}

src/main/java/com/warewms/dao/BasProvinceCityDistrictDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasProvinceCityDistrict;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasProvinceCityDistrictDao extends BaseDao<BasProvinceCityDistrict> {
-    public BasProvinceCityDistrictDao() {
-        super(BasProvinceCityDistrict.class);
-    }
-}

src/main/java/com/warewms/dao/BasSerialNumDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasSerialNum;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasSerialNumDao extends BaseDao<BasSerialNum> {
-    public BasSerialNumDao() {
-        super(BasSerialNum.class);
-    }
-}

src/main/java/com/warewms/dao/BasSkuDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasSku;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasSkuDao extends BaseDao<BasSku> {
-    public BasSkuDao() {
-        super(BasSku.class);
-    }
-}

src/main/java/com/warewms/dao/BasSkuLeakDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasSkuLeak;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasSkuLeakDao extends BaseDao<BasSkuLeak> {
-    public BasSkuLeakDao() {
-        super(BasSkuLeak.class);
-    }
-}

src/main/java/com/warewms/dao/BasZoneDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasZone;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasZoneDao extends BaseDao<BasZone> {
-    public BasZoneDao() {
-        super(BasZone.class);
-    }
-}

src/main/java/com/warewms/dao/BasZonegroupDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.BasZonegroup;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BasZonegroupDao extends BaseDao<BasZonegroup> {
-    public BasZonegroupDao() {
-        super(BasZonegroup.class);
-    }
-}

src/main/java/com/warewms/dao/BaseDao.java

@@ -1,354 +0,0 @@
-package com.warewms.dao;
-
-import com.jfinal.kit.Kv;
-import com.jfinal.kit.LogKit;
-import com.jfinal.plugin.activerecord.*;
-import com.warewms.common.entity.Filter;
-import com.warewms.common.entity.Order;
-import com.warewms.common.utils.GenericsUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Dao - 基类
- * 
- * 
- */
-public class BaseDao<M extends Model<M>> {
-
-	/** "ID"属性名称 */
-	public static final String ID = "id";
-
-	/** "创建日期"属性名称 */
-	public static final String CREATE_DATE = "create_date";
-
-	/** 实体类类型 */
-	private Class<M> modelClass;
-	
-	protected M modelManager;
-	
-	public Class<M> getModelClass() {
-		return modelClass;
-	}
-
-	public void setModelClass(Class<M> modelClass) {
-		this.modelClass = modelClass;
-	}
-	
-	/**
-	 * 构造方法
-	 */
-	@SuppressWarnings("unchecked")
-	public BaseDao(Class<M> entityClass) {
-		this.setModelClass(GenericsUtils.getSuperClassGenricType(entityClass));
-		try {
-			modelManager = modelClass.newInstance();
-		} catch (InstantiationException e) {
-			LogKit.error("instance model fail!" + e);
-		} catch (IllegalAccessException e) {
-			LogKit.error("instance model fail!" + e);
-		}
-	}
-	
-	public String getTableName() {
-		Table table = TableMapping.me().getTable(getModelClass());
-		return table.getName();
-	}
-
-	public String[] getPrimaryKeys() {
-		Table table = TableMapping.me().getTable(getModelClass());
-		table.getPrimaryKey();
-		return table.getPrimaryKey();
-	}
-	
-	/**
-	 * 查找实体对象
-	 * 
-	 * @param id
-	 *            ID
-	 * @return 实体对象，若不存在则返回null
-	 */
-	public M findById(Object ...id) {
-		if (id == null) {
-			return null;
-		}
-		return modelManager.findById(id);
-	}
-
-	public M findFirstByModel(M model){
-		Record record = model.toRecord();
-		SqlPara sqlPara = Db.getSqlPara("common.findByModel", Kv.by("record", record.getColumns()).set("tableName", this.getTableName()));
-		return this.modelManager.findFirst(sqlPara);
-	}
-
-	public List<M> findByModel(M model){
-		Record record = model.toRecord();
-		SqlPara sqlPara = Db.getSqlPara("common.findByModel", Kv.by("record", record.getColumns()).set("tableName", this.getTableName()));
-		return this.modelManager.find(sqlPara);
-	}
-
-	public List<M> findByFilter(Filter filter){
-		List<Filter> filters = new ArrayList<>();
-		filters.add(filter);
-		return this.findByFilters(filters);
-	}
-
-	public List<M> findByFilters(List<Filter> filters){
-		SqlPara sqlPara = Db.getSqlPara("common.findList", Kv.by("filters", filters).set("tableName", this.getTableName()));
-		List<M> modelList = this.modelManager.find(sqlPara);
-		return modelList;
-	}
-
-	public boolean deleteByModel(M model){
-		Record record = model.toRecord();
-		SqlPara sqlPara = Db.getSqlPara("common.deleteByModel", Kv.by("record", record.getColumns()).set("tableName", this.getTableName()));
-		return Db.update(sqlPara) > 0;
-	}
-
-	public boolean deleteById(Object ...id){
-		return this.modelManager.deleteById(id);
-	}
-
-	public M getDao(){
-		return modelManager;
-	}
-
-	public List<M> findAll() {
-		return findList(null, null, null, null);
-	}
-
-
-	/**
-	 * 查找实体对象集合
-	 *
-	 * @param first
-	 *            起始记录
-	 * @param count
-	 *            数量
-	 * @param filters
-	 *            筛选
-	 * @param orders
-	 *            排序
-	 * @return 实体对象集合
-	 */
-	public List<M> findList(Integer first, Integer count, List<Filter> filters, List<Order> orders) {
-		String sql = "SELECT * FROM `" + getTableName() + "` WHERE 1 = 1 ";
-		return findList(sql, first, count, filters, orders);
-	}
-
-	/**
-	 * 查找实体对象集合
-	 *
-	 * @param sql
-	 *            查询条件
-	 * @param first
-	 *            起始记录
-	 * @param count
-	 *            数量
-	 * @param filters
-	 *            筛选
-	 * @param orders
-	 *            排序
-	 * @return 实体对象集合
-	 */
-	protected List<M> findList(String sql, Integer first, Integer count, List<Filter> filters, List<Order> orders) {
-		Assert.notNull(sql, "baseDao findList sql cannot null");
-
-		String sqlFilters = getFilters(filters);
-		sql += sqlFilters;
-
-		String sqlOrders = getOrders(orders);
-		sql += sqlOrders;
-
-		if (first != null && count != null) {
-			sql += " LIMIT " + first + ", " + count;
-		}
-		return modelManager.find(sql);
-	}
-
-	/**
-	 * 转换为Predicate
-	 *
-	 * @param filters
-	 *            筛选
-	 * @return Predicate
-	 */
-	private String getFilters(List<Filter> filters) {
-		String sql = "";
-		if (CollectionUtils.isEmpty(filters)) {
-			return "";
-		}
-		for (Filter filter : filters) {
-			if (filter == null) {
-				continue;
-			}
-			String property = filter.getProperty();
-			Filter.Operator operator = filter.getOperator();
-			Object value = filter.getValue();
-			Boolean ignoreCase = filter.getIgnoreCase();
-			switch (operator) {
-				case eq:
-					if (value != null) {
-						if (BooleanUtils.isTrue(ignoreCase) && value instanceof String) {
-							sql +=" AND "+  property + " = " + ((String) value).toLowerCase();
-						} else {
-							sql +=" AND "+ property + " = " + value;
-						}
-					} else {
-						sql +=" AND "+ property + " IS NULL ";
-					}
-					break;
-				case ne:
-					if (value != null) {
-						if (BooleanUtils.isTrue(ignoreCase) && value instanceof String) {
-							sql +=" AND "+ property + " != " + ((String) value).toLowerCase();
-						} else {
-							sql +=" AND "+ property + " != " + value;
-						}
-					} else {
-						sql +=" AND "+ property + " IS NOT NULL ";
-					}
-					break;
-				case gt:
-					if (value instanceof Number) {
-						sql +=" AND "+ property + " > " + (Number) value;
-					}
-					break;
-				case lt:
-					if (value instanceof Number) {
-						sql +=" AND "+ property + " < " + (Number) value;
-					}
-					break;
-				case ge:
-					if (value instanceof Number) {
-						sql +=" AND "+ property + " >= " + (Number) value;
-					}
-					break;
-				case le:
-					if (value instanceof Number) {
-						sql +=" AND "+ property + " <= " + (Number) value;
-					}
-					break;
-				case like:
-					if (value instanceof String) {
-						if (BooleanUtils.isTrue(ignoreCase)) {
-							sql += " AND " + property + " LIKE '%" + ((String) value).toLowerCase() + "'";
-						} else {
-							sql += " AND " + property + " LIKE '%" + (String) value + "'";
-						}
-					}
-					break;
-				case in:
-					sql +=" AND "+ property + " IN(" + value + ")";
-					break;
-				case isNull:
-					sql +=" AND "+ property + " IS NULL";
-					break;
-				case isNotNull:
-					sql +=" AND "+ property + " IS NOT NULL";
-					break;
-			}
-		}
-		return sql;
-	}
-
-	/**
-	 * 转换为Order
-	 *
-	 * @param orders
-	 *            排序
-	 * @return Order
-	 */
-	private String getOrders(List<Order> orders) {
-		String orderSql = "";
-		if (!CollectionUtils.isEmpty(orders)) {
-			orderSql = " ORDER BY ";
-			for (Order order : orders) {
-				String property = order.getProperty();
-				Order.Direction direction = order.getDirection();
-				switch (direction) {
-					case asc:
-						orderSql += property + " ASC, ";
-						break;
-					case desc:
-						orderSql += property + " DESC,";
-						break;
-				}
-			}
-			orderSql = StringUtils.substring(orderSql, 0, orderSql.length() - 1);
-		}
-		return orderSql;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize, Filter filter, Order order) {
-		List<Filter> filters = new ArrayList<>();
-		filters.add(filter);
-		List<Order> orders = new ArrayList<>();
-		orders.add(order);
-		Page<M> pr = this.paginate(pageNum, pageSize, filters, orders);
-		return pr;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize) {
-		List<Filter> filters = new ArrayList<>();
-		List<Order> orders = new ArrayList<>();
-		Page<M> pr = this.paginate(pageNum, pageSize, filters, orders);
-		return pr;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize, List<Filter> filters, Order order) {
-		List<Order> orders = new ArrayList<>();
-		if (order != null) {
-			orders.add(order);
-		}
-		Page<M> pr = this.paginate(pageNum, pageSize, filters, orders);
-		return pr;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize, List<Filter> filters) {
-		List<Order> orders = new ArrayList<>();
-		Page<M> pr = this.paginate(pageNum, pageSize, filters, orders);
-		return pr;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize, List<Filter> filters, List<Order> orders) {
-		SqlPara sqlPara = Db.getSqlPara("common.findList", Kv.by("filters", filters).set("orders", orders).set("tableName", this.getTableName()));
-		Page<M> pr = this.modelManager.paginate(pageNum, pageSize, sqlPara);
-		return pr;
-	}
-
-	public Page<M> paginate(Integer pageNum, Integer pageSize, Filter filter, List<Order> orders) {
-		List<Filter> filters = new ArrayList<>();
-		filters.add(filter);
-		Page<M> pr = this.paginate(pageNum, pageSize, filters, orders);
-		return pr;
-	}
-
-	public boolean deleteBatch(Object[]... ids) {
-		return this.deleteBatch(null, ids);
-	}
-
-	public boolean deleteBatch(String[] columns, Object[]... ids) {
-		String[] primaryKeys = columns;
-		if (columns == null) {
-			primaryKeys = this.getPrimaryKeys();
-		}
-
-		SqlPara sqlPara = Db.getSqlPara("common.deleteBatch", Kv.by("ids", ids).set("primaryKeys", primaryKeys).set("tableName", this.getTableName()));
-		return Db.update(sqlPara) > 0;
-	}
-
-	public M findFirst(SqlPara sqlPara) {
-		return this.modelManager.findFirst(sqlPara);
-	}
-
-	public List<M> find(SqlPara sqlPara) {
-		return this.modelManager.find(sqlPara);
-	}
-
-}

src/main/java/com/warewms/dao/CouRequestDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.CouRequestDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CouRequestDetailsDao extends BaseDao<CouRequestDetails> {
-    public CouRequestDetailsDao() {
-        super(CouRequestDetails.class);
-    }
-}

src/main/java/com/warewms/dao/CouRequestHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.CouRequestHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CouRequestHeaderDao extends BaseDao<CouRequestHeader> {
-    public CouRequestHeaderDao() {
-        super(CouRequestHeader.class);
-    }
-}

src/main/java/com/warewms/dao/CouSkuLocDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.CouSkuLoc;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CouSkuLocDao extends BaseDao<CouSkuLoc> {
-    public CouSkuLocDao() {
-        super(CouSkuLoc.class);
-    }
-}

src/main/java/com/warewms/dao/DocAdjDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocAdjDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAdjDetailsDao extends BaseDao<DocAdjDetails> {
-    public DocAdjDetailsDao() {
-        super(DocAdjDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocAdjHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocAdjHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAdjHeaderDao extends BaseDao<DocAdjHeader> {
-    public DocAdjHeaderDao() {
-        super(DocAdjHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocAsnCertificateDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocAsnCertificate;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAsnCertificateDao extends BaseDao<DocAsnCertificate> {
-    public DocAsnCertificateDao() {
-        super(DocAsnCertificate.class);
-    }
-}

src/main/java/com/warewms/dao/DocAsnDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocAsnDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAsnDetailsDao extends BaseDao<DocAsnDetails> {
-    public DocAsnDetailsDao() {
-        super(DocAsnDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocAsnDoublecDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocAsnDoublec;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAsnDoublecDao extends BaseDao<DocAsnDoublec> {
-    public DocAsnDoublecDao() {
-        super(DocAsnDoublec.class);
-    }
-}

src/main/java/com/warewms/dao/DocAsnHeaderDao.java

@@ -1,11 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.model.DocAsnHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocAsnHeaderDao extends BaseDao<DocAsnHeader> {
-    public DocAsnHeaderDao() {
-        super(DocAsnHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocMovementDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocMovementDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocMovementDetailsDao extends BaseDao<DocMovementDetails> {
-    public DocMovementDetailsDao() {
-        super(DocMovementDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocMovementHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocMovementHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocMovementHeaderDao extends BaseDao<DocMovementHeader> {
-    public DocMovementHeaderDao() {
-        super(DocMovementHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocMtDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocMtDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocMtDetailsDao extends BaseDao<DocMtDetails> {
-    public DocMtDetailsDao() {
-        super(DocMtDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocMtHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocMtHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocMtHeaderDao extends BaseDao<DocMtHeader> {
-    public DocMtHeaderDao() {
-        super(DocMtHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocOrderDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocOrderDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocOrderDetailsDao extends BaseDao<DocOrderDetails> {
-    public DocOrderDetailsDao() {
-        super(DocOrderDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocOrderHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocOrderHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocOrderHeaderDao extends BaseDao<DocOrderHeader> {
-    public DocOrderHeaderDao() {
-        super(DocOrderHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocOrderPackingCartonDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocOrderPackingCarton;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocOrderPackingCartonDao extends BaseDao<DocOrderPackingCarton> {
-    public DocOrderPackingCartonDao() {
-        super(DocOrderPackingCarton.class);
-    }
-}

src/main/java/com/warewms/dao/DocOrderPackingCartonInfoDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocOrderPackingCartonInfo;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocOrderPackingCartonInfoDao extends BaseDao<DocOrderPackingCartonInfo> {
-    public DocOrderPackingCartonInfoDao() {
-        super(DocOrderPackingCartonInfo.class);
-    }
-}

src/main/java/com/warewms/dao/DocOrderPackingSummaryDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocOrderPackingSummary;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocOrderPackingSummaryDao extends BaseDao<DocOrderPackingSummary> {
-    public DocOrderPackingSummaryDao() {
-        super(DocOrderPackingSummary.class);
-    }
-}

src/main/java/com/warewms/dao/DocPaDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocPaDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocPaDetailsDao extends BaseDao<DocPaDetails> {
-    public DocPaDetailsDao() {
-        super(DocPaDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocPaHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocPaHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocPaHeaderDao extends BaseDao<DocPaHeader> {
-    public DocPaHeaderDao() {
-        super(DocPaHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocPoDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocPoDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocPoDetailsDao extends BaseDao<DocPoDetails> {
-    public DocPoDetailsDao() {
-        super(DocPoDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocPoHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocPoHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocPoHeaderDao extends BaseDao<DocPoHeader> {
-    public DocPoHeaderDao() {
-        super(DocPoHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocQcDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocQcDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocQcDetailsDao extends BaseDao<DocQcDetails> {
-    public DocQcDetailsDao() {
-        super(DocQcDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocQcHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocQcHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocQcHeaderDao extends BaseDao<DocQcHeader> {
-    public DocQcHeaderDao() {
-        super(DocQcHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocQsmDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocQsmDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocQsmDetailsDao extends BaseDao<DocQsmDetails> {
-    public DocQsmDetailsDao() {
-        super(DocQsmDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocQsmHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocQsmHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocQsmHeaderDao extends BaseDao<DocQsmHeader> {
-    public DocQsmHeaderDao() {
-        super(DocQsmHeader.class);
-    }
-}

src/main/java/com/warewms/dao/DocSerialNumRecordCopyDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocSerialNumRecordCopy;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocSerialNumRecordCopyDao extends BaseDao<DocSerialNumRecordCopy> {
-    public DocSerialNumRecordCopyDao() {
-        super(DocSerialNumRecordCopy.class);
-    }
-}

src/main/java/com/warewms/dao/DocSerialNumRecordDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocSerialNumRecord;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocSerialNumRecordDao extends BaseDao<DocSerialNumRecord> {
-    public DocSerialNumRecordDao() {
-        super(DocSerialNumRecord.class);
-    }
-}

src/main/java/com/warewms/dao/DocTransferDetailsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocTransferDetails;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocTransferDetailsDao extends BaseDao<DocTransferDetails> {
-    public DocTransferDetailsDao() {
-        super(DocTransferDetails.class);
-    }
-}

src/main/java/com/warewms/dao/DocTransferHeaderDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.DocTransferHeader;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DocTransferHeaderDao extends BaseDao<DocTransferHeader> {
-    public DocTransferHeaderDao() {
-        super(DocTransferHeader.class);
-    }
-}

src/main/java/com/warewms/dao/FirstBusinessApplyDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.FirstBusinessApply;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FirstBusinessApplyDao extends BaseDao<FirstBusinessApply> {
-    public FirstBusinessApplyDao() {
-        super(FirstBusinessApply.class);
-    }
-}

src/main/java/com/warewms/dao/FirstBusinessProductApplyDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.FirstBusinessProductApply;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FirstBusinessProductApplyDao extends BaseDao<FirstBusinessProductApply> {
-    public FirstBusinessProductApplyDao() {
-        super(FirstBusinessProductApply.class);
-    }
-}

src/main/java/com/warewms/dao/FirstReviewLogDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.FirstReviewLog;
-import org.springframework.stereotype.Component;
-
-@Component
-public class FirstReviewLogDao extends BaseDao<FirstReviewLog> {
-    public FirstReviewLogDao() {
-        super(FirstReviewLog.class);
-    }
-}

src/main/java/com/warewms/dao/GspBusinessLicenseDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspBusinessLicense;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspBusinessLicenseDao extends BaseDao<GspBusinessLicense> {
-    public GspBusinessLicenseDao() {
-        super(GspBusinessLicense.class);
-    }
-}

src/main/java/com/warewms/dao/GspCustomerDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspCustomer;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspCustomerDao extends BaseDao<GspCustomer> {
-    public GspCustomerDao() {
-        super(GspCustomer.class);
-    }
-}

src/main/java/com/warewms/dao/GspEnterpriseInfoDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspEnterpriseInfo;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspEnterpriseInfoDao extends BaseDao<GspEnterpriseInfo> {
-    public GspEnterpriseInfoDao() {
-        super(GspEnterpriseInfo.class);
-    }
-}

src/main/java/com/warewms/dao/GspFirstRecordDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspFirstRecord;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspFirstRecordDao extends BaseDao<GspFirstRecord> {
-    public GspFirstRecordDao() {
-        super(GspFirstRecord.class);
-    }
-}

src/main/java/com/warewms/dao/GspInstrumentCatalogDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspInstrumentCatalog;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspInstrumentCatalogDao extends BaseDao<GspInstrumentCatalog> {
-    public GspInstrumentCatalogDao() {
-        super(GspInstrumentCatalog.class);
-    }
-}

src/main/java/com/warewms/dao/GspMedicalRecordDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspMedicalRecord;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspMedicalRecordDao extends BaseDao<GspMedicalRecord> {
-    public GspMedicalRecordDao() {
-        super(GspMedicalRecord.class);
-    }
-}

src/main/java/com/warewms/dao/GspOperateDetailDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspOperateDetail;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspOperateDetailDao extends BaseDao<GspOperateDetail> {
-    public GspOperateDetailDao() {
-        super(GspOperateDetail.class);
-    }
-}

src/main/java/com/warewms/dao/GspOperateLicenseDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspOperateLicense;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspOperateLicenseDao extends BaseDao<GspOperateLicense> {
-    public GspOperateLicenseDao() {
-        super(GspOperateLicense.class);
-    }
-}

src/main/java/com/warewms/dao/GspProductRegisterDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspProductRegister;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspProductRegisterDao extends BaseDao<GspProductRegister> {
-    public GspProductRegisterDao() {
-        super(GspProductRegister.class);
-    }
-}

src/main/java/com/warewms/dao/GspProductRegisterSpecsDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspProductRegisterSpecs;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspProductRegisterSpecsDao extends BaseDao<GspProductRegisterSpecs> {
-    public GspProductRegisterSpecsDao() {
-        super(GspProductRegisterSpecs.class);
-    }
-}

src/main/java/com/warewms/dao/GspReceivingAddressDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspReceivingAddress;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspReceivingAddressDao extends BaseDao<GspReceivingAddress> {
-    public GspReceivingAddressDao() {
-        super(GspReceivingAddress.class);
-    }
-}

src/main/java/com/warewms/dao/GspReceivingDao.java

@@ -1,12 +0,0 @@
-package com.warewms.dao;
-
-import com.warewms.dao.BaseDao;
-import com.warewms.model.GspReceiving;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GspReceivingDao extends BaseDao<GspReceiving> {
-    public GspReceivingDao() {
-        super(GspReceiving.class);
-    }
-}