整理

src/main/java/com/ym/adminap/controller/BaseController.java

@@ -0,0 +1,70 @@
+package com.ym.adminap.controller;
+
+import com.ym.adminap.enity.AppResultJson;
+
+public class BaseController
+{
+
+    /**
+     * 接口返回体
+     * @param status 状态编码
+     * @param info 返回消息
+     * @param data 数据包
+     * @param other 附加数据包
+     * @return
+     */
+    public AppResultJson ResultController(String status, String messge, Object data, Object other)
+    {
+        AppResultJson result = new AppResultJson();
+        result.status = "1";
+        result.messge = messge;
+        result.data = data;
+        result.other = other;
+        return result;
+    }
+
+    /**
+     * 接口返回体
+     * @param status 状态编码
+     * @param info 返回消息
+     * @param data 数据包
+     * @return
+     */
+    public AppResultJson ResultController(String status, String messge, Object data)
+    {
+        AppResultJson result = new AppResultJson();
+        result.status = "1";
+        result.messge = messge;
+        result.data = data;
+        return result;
+    }
+
+    /**
+     * 接口返回体
+     * @param status 状态编码
+     * @param data 数据包
+     * @return
+     */
+    public AppResultJson ResultController(String status, Object data)
+    {
+        AppResultJson result = new AppResultJson();
+        result.status = "1";
+        result.data = data;
+        return result;
+    }
+
+    /**
+     * 接口返回体
+     * @param status 状态编码
+     * @param info 返回消息
+     * @return
+     */
+    public AppResultJson ResultController(String status, String messge)
+    {
+        AppResultJson result = new AppResultJson();
+        result.status = "1";
+        result.messge = messge;
+        return result;
+    }
+
+}

src/main/java/com/ym/adminap/controller/main/UsersController.java

@@ -3,6 +3,7 @@ package com.ym.adminap.controller.main;
 import org.springframework.web.bind.annotation.*;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ym.adminap.controller.BaseController;
 import com.ym.adminap.enity.AppResultJson;
 import com.ym.adminap.enity.RelationData;
 import com.ym.adminap.model.main.Users;
@@ -19,19 +20,22 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 创客
+ */
 @RestController
-public class UsersController
+@RequestMapping("/main/users")
+public class UsersController extends BaseController
 {
     @Resource
 	RedisUtils redisUtils;
 
-    //根据条件查询创客列表
-
-    /// <summary>
-    /// 创客列表
-    /// </summary>
-    /// <returns></returns>
-    @PostMapping("/main/users/all")
+    /**
+     * 根据条件查询创客列表
+     * @param value
+     * @return
+     */
+    @PostMapping("/all")
     public @ResponseBody AppResultJson list(String value)
     {
         value = DesUtil.decrypt(value);
@@ -58,79 +62,64 @@ public class UsersController
         // {
             //这里可以构造特殊需要处理的字段
         // }
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = list;
-        result.other = count;
-        return result;
+        return ResultController("1", "", data, count);
     }
 
 
     //创客详情
 
-    /// <summary>
-    /// 创客详情
-    /// </summary>
-    /// <returns></returns>
-    @GetMapping("/main/users")
+    /**
+     * 创客详情
+     * @param value
+     * @return
+     */
+    @GetMapping("")
     public @ResponseBody AppResultJson query(String value)
     {
         value = DesUtil.decrypt(value);
         JSONObject data = JSONObject.parseObject(value);
         Integer Id = Integer.parseInt(Util.CheckInt(data.get("Id").toString()));
         Users item = UsersService.query(Id);
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = item;
-        return result;
+        return ResultController("1", item);
     }
 
 
-    //增加创客
-
-    /// <summary>
-    /// 增加或修改创客信息
-    /// </summary>
-    /// <returns></returns>
-    @PostMapping("/main/users")
+    /**
+     * 增加创客
+     * @param value
+     * @return
+     */
+    @PostMapping("")
     public @ResponseBody AppResultJson add(String value)
     {
         value = DesUtil.decrypt(value);
         Users data = JSONObject.parseObject(JSONObject.toJSONString(value), Users.class);
         Integer id = UsersService.add(data);
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = id;
-        return result;
+        return ResultController("1", id);
     }
 
 
-    //修改创客
-
-    /// <summary>
-    /// 增加或修改创客信息
-    /// </summary>
-    /// <returns></returns>
-    @PutMapping("/main/users")
+    /**
+     * 修改创客
+     * @param value
+     * @return
+     */
+    @PutMapping("")
     public @ResponseBody AppResultJson edit(String value)
     {
         value = DesUtil.decrypt(value);
         Users data = JSONObject.parseObject(JSONObject.toJSONString(value), Users.class);
         Integer id = UsersService.update(data);
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = id;
-        return result;
+        return ResultController("1", id);
     }
 
 
-    //逻辑删除创客信息
-
-    /// <summary>
-    /// 删除创客信息
-    /// </summary>
-    /// <returns></returns>
-    @DeleteMapping("/main/users/remove")
+    /**
+     * 逻辑删除创客信息
+     * @param value
+     * @return
+     */
+    @DeleteMapping("/remove")
     public @ResponseBody AppResultJson remove(String value)
     {
         value = DesUtil.decrypt(value);
@@ -142,20 +131,16 @@ public class UsersController
             Integer id = Integer.parseInt(subid);
             UsersService.remove(id);
         }
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = ids;
-        return result;
+        return ResultController("1", ids);
     }
 
 
-    //彻底删除创客信息
-
-    /// <summary>
-    /// 删除创客信息
-    /// </summary>
-    /// <returns></returns>
-    @DeleteMapping("/main/users")
+    /**
+     * 彻底删除创客信息
+     * @param value
+     * @return
+     */
+    @DeleteMapping("")
     public @ResponseBody AppResultJson delete(String value)
     {
         value = DesUtil.decrypt(value);
@@ -167,20 +152,16 @@ public class UsersController
             Integer id = Integer.parseInt(subid);
             UsersService.delete(id);
         }
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = ids;
-        return result;
+        return ResultController("1", ids);
     }
 
 
-    //开启
-
-    /// <summary>
-    /// 开启
-    /// </summary>
-    /// <returns></returns>
-    @PutMapping("/main/users/open")
+    /**
+     * 开启
+     * @param value
+     * @return
+     */
+    @PutMapping("/open")
     public @ResponseBody AppResultJson open(String value)
     {
         value = DesUtil.decrypt(value);
@@ -196,20 +177,16 @@ public class UsersController
             UsersService.update(data);
         }
         Dictionary<String, Object> obj = new Hashtable<>(); //返回字段
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = obj;
-        return result;
+        return ResultController("1", obj);
     }
 
 
-    //关闭
-
-    /// <summary>
-    /// 关闭
-    /// </summary>
-    /// <returns></returns>
-    @PutMapping("/main/users/close")
+    /**
+     * 关闭
+     * @param value
+     * @return
+     */
+    @PutMapping("/close")
     public @ResponseBody AppResultJson close(String value)
     {
         value = DesUtil.decrypt(value);
@@ -225,19 +202,16 @@ public class UsersController
             UsersService.update(data);
         }
         Dictionary<String, Object> obj = new Hashtable<>(); //返回字段
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = obj;
-        return result;
+        return ResultController("1", obj);
     }
 
 
-    //排序
-    /// <summary>
-    /// 排序
-    /// </summary>
-    /// <param name="Id"></param>
-    @PutMapping("/main/users/sort")
+    /**
+     * 排序
+     * @param value
+     * @return
+     */
+    @PutMapping("/sort")
     public @ResponseBody AppResultJson sort(String value)
     {
         value = DesUtil.decrypt(value);
@@ -245,10 +219,7 @@ public class UsersController
         Integer id = Integer.parseInt(jsonObj.get("id").toString());
         Integer sort = Integer.parseInt(jsonObj.get("sort").toString());
         UsersService.sort(id, sort);
-        AppResultJson result = new AppResultJson();
-        result.status = "1";
-        result.data = id;
-        return result;
+        return ResultController("1", id);
     }
 
 }

src/main/java/com/ym/adminap/dao/main/UsersMapper.java

@@ -15,13 +15,13 @@ public interface UsersMapper {
 
     Users selectByPrimaryKey(Integer id);
 
-    Users selectByCondition(@Param("data") Users data);
+    Users selectByCondition(@Param("query") Users data);
 
     List<Map<String, Object>> selectAll(ListParam param);
 
     Integer updateByPrimaryKey(Users record);
 
-    Integer getCount(@Param("field") String field, @Param("data") Users data, @Param("condition") String condition);
+    Integer getCount(@Param("field") String field, @Param("query") Users data, @Param("condition") String condition);
 
-    Object getSum(@Param("field") String field, @Param("data") Users data, @Param("condition") String condition);
+    Object getSum(@Param("field") String field, @Param("query") Users data, @Param("condition") String condition);
 }

src/main/java/com/ym/adminap/enity/AppResultJson.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 public class AppResultJson implements Serializable
 {
-    public String info;
+    public String messge;
     public Object data;
     public Object other;
     public String status;

src/main/java/com/ym/adminap/model/main/Users.java

@@ -1,3 +1,4 @@
+/* */
 package com.ym.adminap.model.main;
 
 import java.io.Serializable;
@@ -6,9 +7,9 @@ import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-import io.lettuce.core.GeoArgs.Sort;
-
 public class Users implements Serializable {
+
+    /** */
     private Integer id;
 
     private Integer sort;
@@ -198,14 +199,23 @@ public class Users implements Serializable {
         return id != null ? id : 0;
     }
 
+    
     public void setId(Integer id) {
         this.id = id;
     }
 
+    /**
+     * 排序序号
+     * @return
+     */
     public Integer getSort() {
         return sort != null ? sort : 0;
     }
 
+    /**
+     * id
+     * @param id
+     */
     public void setSort(Integer sort) {
         this.sort = sort;
     }

src/main/java/com/ym/adminap/service/main/UsersService.java

@@ -13,35 +13,35 @@ import com.ym.adminap.enity.RelationData;
 import com.ym.adminap.model.main.Users;
 import com.ym.adminap.util.SqlSessionUtils;
 
-public class UsersService
-{
+/**
+ * 创客
+ */
+public class UsersService {
     /**
      * 查询列表
-     * @param fields 查询的字段
+     * 
+     * @param fields       查询的字段
      * @param relationData 关联表
-     * @param query 查询条件
-     * @param condition 查询条件(sql语句，慎用，注意sql注入)
-     * @param page 页码
-     * @param limit 每页条数
-     * @param orderBy 排序（如：id desc,sort asc）
+     * @param query        查询条件
+     * @param condition    查询条件(sql语句，慎用，注意sql注入)
+     * @param page         页码
+     * @param limit        每页条数
+     * @param orderBy      排序（如：id desc,sort asc）
      * @return
      */
-    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields, Users query, String condition, List<RelationData> relationData)
-    {
-        if(fields.isBlank()) {
+    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields,
+            Users query, String condition, List<RelationData> relationData) {
+        if (fields.isBlank()) {
             fields = "*";
         }
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         ListParam param = new ListParam();
-        if (page > 1)
-        {
+        if (page > 1) {
             Integer spage = (page - 1) * limit;
             param.skip = spage;
             param.limit = limit;
-        }
-        else
-        {
+        } else {
             param.skip = 0;
         }
         param.relationData = relationData;
@@ -54,30 +54,32 @@ public class UsersService
         sqlSession.close();
         return result;
     }
-    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields, Users query, String condition)
-    {
+
+    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields,
+            Users query, String condition) {
         return list(page, limit, orderBy, fields, query, condition, new ArrayList<>());
     }
-    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields, Users query)
-    {
+
+    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields,
+            Users query) {
         return list(page, limit, orderBy, fields, query, "", new ArrayList<>());
     }
-    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields)
-    {
+
+    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy, String fields) {
         return list(page, limit, orderBy, fields, new Users(), "", new ArrayList<>());
     }
-    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy)
-    {
+
+    public static List<Map<String, Object>> list(Integer page, Integer limit, String orderBy) {
         return list(page, limit, orderBy, "*", new Users(), "", new ArrayList<>());
     }
 
     /**
      * 查询一条记录
+     * 
      * @param id 主键Id
      * @return
      */
-    public static Users query(Integer Id)
-    {
+    public static Users query(Integer Id) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Users result = usersMapper.selectByPrimaryKey(Id);
@@ -87,29 +89,30 @@ public class UsersService
 
     /**
      * 根据条件查询一条记录
-     * @param data 查询条件
+     * 
+     * @param data      查询条件
      * @param condition 查询条件(sql语句，慎用，注意sql注入)
      * @return
      */
-    public static Users query(Users data)
-    {
+    public static Users query(Users data) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Users result = usersMapper.selectByCondition(data);
-        if(result == null) result = new Users();
+        if (result == null)
+            result = new Users();
         sqlSession.close();
         return result;
     }
 
     /**
      * 查询记录数
-     * @param field 查询字段
-     * @param data 查询条件
+     * 
+     * @param field     查询字段
+     * @param data      查询条件
      * @param condition 查询条件(sql语句，慎用，注意sql注入)
      * @return
      */
-    public static Integer count(String field, Users data, String condition)
-    {
+    public static Integer count(String field, Users data, String condition) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Integer result = usersMapper.getCount(field, data, condition);
@@ -119,13 +122,13 @@ public class UsersService
 
     /**
      * 查询总数
-     * @param field 查询字段
-     * @param data 查询条件
+     * 
+     * @param field     查询字段
+     * @param data      查询条件
      * @param condition 查询条件(sql语句，慎用，注意sql注入)
      * @return
      */
-    public static Object sum(String field, Users data, String condition)
-    {
+    public static Object sum(String field, Users data, String condition) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Object result = usersMapper.getSum(field, data, condition);
@@ -135,17 +138,17 @@ public class UsersService
 
     /**
      * 查询是否存在
-     * @param data 查询条件
+     * 
+     * @param data      查询条件
      * @param condition 查询条件(sql语句，慎用，注意sql注入)
      * @return
      */
-    public static Boolean exist(Users data, String condition)
-    {
+    public static Boolean exist(Users data, String condition) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Integer result = usersMapper.getCount("1", data, condition);
         sqlSession.close();
-        if(result > 0) {
+        if (result > 0) {
             return true;
         }
         return false;
@@ -153,11 +156,11 @@ public class UsersService
 
     /**
      * 添加数据
+     * 
      * @param data 数据包
      * @return
      */
-    public static Integer add(Users data)
-    {
+    public static Integer add(Users data) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Integer result = usersMapper.insert(data);
@@ -167,11 +170,11 @@ public class UsersService
 
     /**
      * 修改数据
+     * 
      * @param data 数据包
      * @return
      */
-    public static Integer update(Users data)
-    {
+    public static Integer update(Users data) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Integer result = usersMapper.updateByPrimaryKey(data);
@@ -181,11 +184,11 @@ public class UsersService
 
     /**
      * 逻辑删除数据，将status字段设置为-1
+     * 
      * @param id 主键id
      * @return
      */
-    public static Integer remove(Integer id)
-    {
+    public static Integer remove(Integer id) {
         Users data = new Users();
         data.setId(id);
         data.setStatus(-1);
@@ -198,11 +201,11 @@ public class UsersService
 
     /**
      * 彻底删除数据
+     * 
      * @param id 主键id
      * @return
      */
-    public static Integer delete(Integer id)
-    {
+    public static Integer delete(Integer id) {
         SqlSession sqlSession = SqlSessionUtils.getSqlSession();
         UsersMapper usersMapper = sqlSession.getMapper(UsersMapper.class);
         Integer result = usersMapper.deleteByPrimaryKey(id);
@@ -212,12 +215,12 @@ public class UsersService
 
     /**
      * 排序
-     * @param id 主键id
+     * 
+     * @param id   主键id
      * @param Sort 序号
      * @return
      */
-    public static Integer sort(Integer id, Integer sort)
-    {
+    public static Integer sort(Integer id, Integer sort) {
         Users user = new Users();
         user.setId(id);
         user.setSort(sort);

src/main/resources/xml/main/UsersMapper.xml

@@ -265,21 +265,21 @@
   <select id="getCount" parameterType="com.ym.adminap.model.main.Users" resultMap="Count">
     select count(#{field}) from Users
     where 1=1${condition} 
-    <if test="data.makerCode != null">
-      and MakerCode = #{data.makerCode}
+    <if test="query.makerCode != null">
+      and MakerCode = #{query.makerCode}
     </if>
-    <if test="data.realName != null">
-      and RealName = #{data.realName}
+    <if test="query.realName != null">
+      and RealName = #{query.realName}
     </if>
   </select>
   <select id="getSum" parameterType="com.ym.adminap.model.main.Users" resultMap="Sum">
     select sum(${field}) from Users
     where 1=1${condition} 
-    <if test="data.makerCode != null">
-      and MakerCode = #{data.makerCode}
+    <if test="query.makerCode != null">
+      and MakerCode = #{query.makerCode}
     </if>
-    <if test="data.realName != null">
-      and RealName = #{data.realName}
+    <if test="query.realName != null">
+      and RealName = #{query.realName}
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -289,11 +289,11 @@
   <select id="selectByCondition" parameterType="com.ym.adminap.model.main.Users" resultMap="BaseResultMap">
     select * from Users
     where 1=1 
-    <if test="data.makerCode != null">
-      and MakerCode = #{data.makerCode}
+    <if test="query.makerCode != null">
+      and MakerCode = #{query.makerCode}
     </if>
-    <if test="data.realName != null">
-      and RealName = #{data.realName}
+    <if test="query.realName != null">
+      and RealName = #{query.realName}
     </if>
   </select>
   <select id="selectAll" parameterType="com.ym.adminap.enity.ListParam" resultMap="MyMap">