修改常量管理模块

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/ConstantDao.java

@@ -1,10 +1,10 @@
 package com.xintong.visualinspection.dao.master;
 
-import com.xintong.visualinspection.bean.User;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
 
-import java.util.List;
+import com.xintong.visualinspection.bean.Constant;
 
 /**
  * 文件名：UserInfoDao
@@ -12,10 +12,10 @@ import java.util.List;
  */
 @Mapper
 public interface ConstantDao  {
-    public List<User> getAll();
-    public User getOne(Long id);
-    public void insert(User user);
-    public void update(User user);
+    public List<Constant> getAll();
+    public Constant getOne(Long id);
+    public void insert(Constant constant);
+    public void update(Constant constant);
     public void delete(Long id);
-    public User findByUserName(String username);
+    public Constant findByUserName(String username);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/err/ErrorCodeEnum.java

@@ -1,10 +1,6 @@
 package com.xintong.visualinspection.err;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.ResourceBundle;
-import java.util.Set;
 
 public class ErrorCodeEnum {
 	

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/ConstantMapper.xml

@@ -1,57 +1,54 @@
 <?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.xintong.visualinspection.dao.master.ConstantDao" >
-    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.User" >
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="username" property="username" jdbcType="VARCHAR" />
-        <result column="age" property="age" jdbcType="INTEGER" />
-        <result column="password" property="password" jdbcType="VARCHAR" />
-    </resultMap>
-    <resultMap id="userMap" type="com.xintong.visualinspection.bean.User">
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Constant" >
         <id property="id" column="ID"/>
-        <result property="username" column="username"/>
-        <result property="password" column="PASSWORD"/>
-        <collection property="roles" ofType="com.xintong.visualinspection.bean.Role">
-            <result column="name" property="name"/>
-        </collection>
+        <result property="codeValue" column="codeValue"/>
+        <result property="codeName" column="codeName"/>
+        <result property="codeFlag" column="codeFlag"/>
+        <result property="flagName" column="flagName"/>
+        <result property="valid" column="valid"/>
+        <result property="remark" column="remark"/>
+        <result property="sortNo" column="sortNo"/>
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_code
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_code
         WHERE id = #{id}
     </select>
 
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Constant" >
         INSERT INTO
-        sys_user
-        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+        sys_code
+        (codeValue,codeName,codeFlag,flagName,valid,remark,sortNo)
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{codeValue}, #{codeName},#{codeFlag},#{flagName},#{valid},#{remark},#{sortNo})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
         UPDATE
-        sys_user
+        sys_code
         SET
-        <if test="username != null">userName = #{username},</if>
-        <if test="age != null">age = #{age},</if>
-        <if test="password != null">password = #{password},</if>
-        id = #{id}
+        <if test="codeValue != null">codeValue = #{codeValue},</if>
+        <if test="codeName != null">codeName = #{codeName},</if>
+        <if test="codeFlag != null">codeFlag = #{codeFlag},</if>
+        <if test="flagName != null">flagName = #{flagName},</if>
+        <if test="valid != null">valid = #{valid},</if>
+        <if test="remark != null">remark = #{remark},</if>
+        <if test="sortNo != null">sortNo = #{sortNo},</if>
         WHERE
         id = #{id}
     </update>
 
-    <delete id="delete" parameterType="java.lang.Long" >
+    <delete id="delete" parameterType="java.lang.Integer" >
         DELETE FROM
-        sys_user
+        sys_code
         WHERE
         id =#{id}
     </delete>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/ConstantServiceImpl.java

@@ -1,25 +1,13 @@
 package com.xintong.visualinspection.service.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Data;
-
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.dao.cluster.UserInfoDao;
-import com.xintong.visualinspection.dao.master.PermissionDao;
-import com.xintong.visualinspection.dao.master.UserDao;
+import com.xintong.visualinspection.dao.master.ConstantDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.ConstantService;
 
@@ -34,7 +22,7 @@ public class ConstantServiceImpl extends BaseService implements ConstantService
 
 
     @Autowired
-    private UserDao userDao;
+    private ConstantDao constantDao;
 
 
 	public List getAll() {
@@ -63,13 +51,13 @@ public class ConstantServiceImpl extends BaseService implements ConstantService
 
 	public void insert(Constant constant) {
 		// TODO Auto-generated method stub
-		int i = 1/0;
+		constantDao.insert(constant);
 	}
 
 
 	public void update(Constant constant) {
 		// TODO Auto-generated method stub
-		
+		constantDao.
 	}