Merge remote-tracking branch 'mesnac/master'

common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java

@@ -1,18 +1,15 @@
-package com.foreverwin.mesnac.production.controller;
+package com.foreverwin.mesnac.common.controller;
 
-import com.foreverwin.mesnac.common.enums.HandleEnum;
-import com.foreverwin.modular.core.util.R;
-import com.foreverwin.modular.core.util.FrontPage;
-import com.foreverwin.modular.core.util.CommonMethods;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import oracle.jdbc.proxy.annotation.Post;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.foreverwin.mesnac.common.model.Tool;
+import com.foreverwin.mesnac.common.service.ToolService;
+import com.foreverwin.modular.core.util.CommonMethods;
+import com.foreverwin.modular.core.util.FrontPage;
+import com.foreverwin.modular.core.util.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.foreverwin.mesnac.production.service.ToolService;
-import com.foreverwin.mesnac.production.model.Tool;
 import java.util.List;
 
 /**

common/src/main/java/com/foreverwin/mesnac/common/mapper/ToolMapper.java

@@ -1,7 +1,7 @@
-package com.foreverwin.mesnac.production.mapper;
+package com.foreverwin.mesnac.common.mapper;
 
-import com.foreverwin.mesnac.production.model.Tool;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.common.model.Tool;
 import org.springframework.stereotype.Repository;
 
 /**

common/src/main/java/com/foreverwin/mesnac/common/model/Tool.java

@@ -1,14 +1,13 @@
-package com.foreverwin.mesnac.production.model;
-
-import java.io.Serializable;
+package com.foreverwin.mesnac.common.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
 
 /**
  * <p>

common/src/main/java/com/foreverwin/mesnac/common/service/ToolService.java

@@ -1,8 +1,8 @@
-package com.foreverwin.mesnac.production.service;
+package com.foreverwin.mesnac.common.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.production.model.Tool;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.common.model.Tool;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.List;

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ToolServiceImpl.java

@@ -1,21 +1,22 @@
-package com.foreverwin.mesnac.production.service.impl;
+package com.foreverwin.mesnac.common.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.mapper.ToolMapper;
+import com.foreverwin.mesnac.common.model.Tool;
+import com.foreverwin.mesnac.common.service.ToolService;
 import com.foreverwin.modular.core.exception.BusinessException;
 import com.foreverwin.modular.core.util.CommonMethods;
 import com.foreverwin.modular.core.util.FrontPage;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.production.model.Tool;
-import com.foreverwin.mesnac.production.mapper.ToolMapper;
-import com.foreverwin.mesnac.production.service.ToolService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+
 /**
  * <p>
  * 工具表 服务实现类

common/src/main/resources/mapper/ToolMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.foreverwin.mesnac.production.mapper.ToolMapper">
+<mapper namespace="com.foreverwin.mesnac.common.mapper.ToolMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.production.model.Tool">
+    <resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.Tool">
         <id column="HANDLE" property="handle" />
         <result column="SITE" property="site" />
         <result column="TOOL" property="tool" />
@@ -257,7 +257,7 @@
         </if>
     </select>
 
-    <insert id="insert" parameterType="com.foreverwin.mesnac.production.model.Tool">
+    <insert id="insert" parameterType="com.foreverwin.mesnac.common.model.Tool">
         INSERT INTO Z_TOOL
         <trim prefix="(" suffix=")" suffixOverrides=",">
             HANDLE,
@@ -291,7 +291,7 @@
         </trim>
     </insert>
 
-    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.production.model.Tool">
+    <insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.Tool">
         INSERT INTO Z_TOOL
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <include refid="Base_Column_List"></include>