添加班组和班次管理模块

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Constant.java

@@ -26,14 +26,14 @@ public class Constant{
 	private static final long serialVersionUID = -7765958097423155178L;
 	private Long id;
 	@NotEmpty(message="字典值不能为空")
-	private String codeValue;
+	private String code_value;
 	@NotEmpty(message="字典名称不能为空")
-	private String codeName;
+	private String code_name;
 	@NotEmpty(message="字典标识不能为空")
-	private String codeFlag;
+	private String code_flag;
 	@NotEmpty(message="标识名称不能为空")
-	private String flagName;
+	private String flag_name;
 	private int valid;
 	private String remark;
-	private int sortNo;
+	private int sort_no;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Team.java

@@ -1,5 +1,9 @@
 package com.xintong.visualinspection.bean;
 
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
 import lombok.Data;
 
 /**
@@ -9,9 +13,13 @@ import lombok.Data;
 @Data
 public class Team {
     //编号
-    private Integer id;
+    private Long id;
     //名称
+    @NotEmpty(message="班组名称不能为空")
     private String name;
+    //部门id
+    @NotNull(message="部门编号不能为空")
+    private Long dept_id;
     //人员ids
     private String user_ids;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/TeamClass.java

@@ -1,9 +1,16 @@
 package com.xintong.visualinspection.bean;
 
-import lombok.Data;
-
 import java.util.Date;
 
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+
 /**
  * 文件名：ScoreDeducting
  * 版本信息：日期：2017/4/18 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -11,23 +18,28 @@ import java.util.Date;
 @Data
 public class TeamClass {
     //编号
-    private Integer id;
-    //时间
-    private Date time;
-    //扣分内容
-    private String content;
-    //图片数组
-    private String pictures;
-    //视频数组
-    private String videos;
-    //稽查任务编号
-    private Integer visual_inspection_task_id;
-    //名称
-    private String name;
-    //考核项id
-    private Integer assessment_item_id;
-    //考核人员ids
-    private String assessment_personnels;
-    //被考核人员id
-    private Integer check_personnel_id;
+    private Long id;
+    //上班日期
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date work_date;
+    //上班时间
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date start_time;
+    //下班时间
+    @NotNull
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date end_time;
+    //班组id
+    private Long team_id;
+    //人员ids
+    private String user_ids;
+    //部门id
+    private Long dept_id;
+    //班次类型（早、中、晚、全天）
+    private Integer class_type;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/BaseController.java

@@ -6,6 +6,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.ibatis.exceptions.TooManyResultsException;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -113,14 +115,18 @@ public class BaseController {
         	code = new ErrorCode(10005);  
         } else if (ex instanceof IllegalArgumentException) {  
         	code = new ErrorCode(10006); 
+        } else if (ex instanceof HttpMessageNotReadableException) {
+        	code = new ErrorCode(10007); 
         } else if (ex instanceof BusinessException) {
-        	code = ((BusinessException) ex).getErrCode(); 
+        	code = ((BusinessException) ex).getErrCode();
+        } else if(ex.getCause() instanceof TooManyResultsException){
+        	code = new ErrorCode(10008);
         } else if (ex instanceof MethodArgumentNotValidException) {
         	BindingResult bindingResult = ((MethodArgumentNotValidException) ex).getBindingResult();
         	code = new ErrorCode(20001,getValidatorErrors(bindingResult)); 
         } else{
-        	code = new ErrorCode(11000); 
-        }
+        	code = new ErrorCode(11000);  
+        } 
         return returnResult(code.getCode(),code.getDesc(),null);
     }
     

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ConstantController.java

@@ -78,10 +78,10 @@ public class ConstantController extends BaseController {
      */
     @RequestMapping(value = "/getConstantByFlag")
     public String getConstantByFlag(@RequestBody Constant constant){
-    	if(StringUtils.isNullOrEmpty(constant.getCodeFlag())){
+    	if(StringUtils.isNullOrEmpty(constant.getCode_flag())){
     		throw new BusinessException(20101);
     	}
-    	List<Constant> constantList = constantService.getByFlag(constant.getCodeFlag());
+    	List<Constant> constantList = constantService.getByFlag(constant.getCode_flag());
     	return super.returnSuccessResult(constantList);
     }
     
@@ -94,10 +94,10 @@ public class ConstantController extends BaseController {
      */
     @RequestMapping(value = "/getConstantByFlagAndValue")
     public String getConstantByFlagAndValue(@RequestBody Constant constant){
-    	if(StringUtils.isNullOrEmpty(constant.getCodeFlag())){
+    	if(StringUtils.isNullOrEmpty(constant.getCode_flag())){
     		throw new BusinessException(20101);
     	}
-    	if(StringUtils.isNullOrEmpty(constant.getCodeValue())){
+    	if(StringUtils.isNullOrEmpty(constant.getCode_flag())){
     		throw new BusinessException(20102);
     	}
     	Constant con = constantService.getByFlagAndValue(constant);
@@ -113,10 +113,10 @@ public class ConstantController extends BaseController {
      */
     @RequestMapping(value = "/getConstantByName")
     public String getConstantByName(@RequestBody Constant constant){
-    	if(StringUtils.isNullOrEmpty(constant.getFlagName())){
+    	if(StringUtils.isNullOrEmpty(constant.getFlag_name())){
     		throw new BusinessException(20103);
     	}
-    	List<Constant> constantList = constantService.getByName(constant.getFlagName());
+    	List<Constant> constantList = constantService.getByName(constant.getFlag_name());
     	return super.returnSuccessResult(constantList);
     }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamClassController.java

@@ -1,15 +1,17 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.service.ConstantService;
+import com.xintong.visualinspection.bean.TeamClass;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.service.TeamClassService;
 
 /**
  * 文件名：TestController
@@ -20,45 +22,83 @@ import com.xintong.visualinspection.service.ConstantService;
 public class TeamClassController extends BaseController {
 
     @Autowired
-    private ConstantService constantService;
+    private TeamClassService teamClassService;
 
    
     /**
-     * 添加常量
+     * 添加班次
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addConstant")
-    public String addConstant(@Valid @RequestBody Constant constant, BindingResult result){
-    	constantService.insert(constant);
+    @RequestMapping(value = "/addClass")
+    public String addClass(@Valid @RequestBody TeamClass teamClass){
+    	teamClassService.insert(teamClass);
     	return super.returnSuccessResult("添加成功");
     }
     
     /**
-     * 修改常量
+     * 修改班次
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateConstant")
-    public String updateConstant(@RequestBody Constant constant){
-    	constantService.update(constant);
+    @RequestMapping(value = "/updateClass")
+    public String updateClass(@Valid @RequestBody TeamClass teamClass){
+    	teamClassService.update(teamClass);
     	return super.returnSuccessResult("修改成功");
     }
     
     /**
-     * 删除常量
+     * 删除班次
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteConstant")
-    public String deleteConstant(@RequestBody String id){
-    	constantService.delete(Long.parseLong(id));
+    @RequestMapping(value = "/deleteClass")
+    public String deleteClass(@RequestBody TeamClass teamClass){
+    	teamClassService.delete(teamClass.getId());
     	return super.returnSuccessResult("删除成功");
     }
+    
+    /**
+     * 通过id获取班次
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getClassById")
+    public String getClassById(@RequestBody TeamClass teamClass){
+    	if(teamClass.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	TeamClass tc = teamClassService.getById(teamClass.getId());
+    	return super.returnSuccessResult(tc);
+    }
+    
+    /**
+     * 通过多个条件查询班次
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getClassList")
+    public String getClassList(@RequestBody TeamClass teamClass){
+    	if(teamClass.getDept_id()==null){
+    		throw new BusinessException(20901);
+    	}
+    	if(teamClass.getStart_time()==null){
+    		throw new BusinessException(20902);
+    	}
+    	if(teamClass.getEnd_time()==null){
+    		throw new BusinessException(20903);
+    	}
+    	List<TeamClass> tcList = teamClassService.getClassList(teamClass);
+    	return super.returnSuccessResult(tcList);
+    }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TeamController.java

@@ -1,15 +1,17 @@
 package com.xintong.visualinspection.controller;
 
+import java.util.List;
+
 import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.service.ConstantService;
+import com.xintong.visualinspection.bean.Team;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.service.TeamService;
 
 /**
  * 文件名：TestController
@@ -20,45 +22,77 @@ import com.xintong.visualinspection.service.ConstantService;
 public class TeamController extends BaseController {
 
     @Autowired
-    private ConstantService constantService;
+    private TeamService teamService;
 
    
     /**
-     * 添加常量
+     * 添加班组
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addConstant")
-    public String addConstant(@Valid @RequestBody Constant constant, BindingResult result){
-    	constantService.insert(constant);
+    @RequestMapping(value = "/addTeam")
+    public String addTeam(@Valid @RequestBody Team team){
+    	teamService.insert(team);
     	return super.returnSuccessResult("添加成功");
     }
     
     /**
-     * 修改常量
+     * 修改班组
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateConstant")
-    public String updateConstant(@RequestBody Constant constant){
-    	constantService.update(constant);
+    @RequestMapping(value = "/updateTeam")
+    public String updateTeam(@Valid @RequestBody Team team){
+    	teamService.update(team);
     	return super.returnSuccessResult("修改成功");
     }
     
     /**
-     * 删除常量
+     * 删除班组
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/deleteConstant")
-    public String deleteConstant(@RequestBody String id){
-    	constantService.delete(Long.parseLong(id));
+    @RequestMapping(value = "/deleteTeam")
+    public String deleteTeam(@RequestBody Team team){
+    	teamService.delete(team.getId());
     	return super.returnSuccessResult("删除成功");
     }
+    
+    /**
+     * 通过id获取班组
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getTeamById")
+    public String getTeamById(@RequestBody Team team){
+    	if(team.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	Team t = teamService.getById(team.getId());
+    	return super.returnSuccessResult(t);
+    }
+    
+    /**
+     * 通过部门id获取班组
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getTeamByDeptId")
+    public String getTeamByDeptId(@RequestBody Team team){
+    	if(team.getDept_id()==null){
+    		throw new BusinessException(20901);
+    	}
+    	List<Team> teamList = teamService.getByDeptId(team.getDept_id());
+    	return super.returnSuccessResult(teamList);
+    }
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamClassDao.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.TeamClass;
 
 /**
  * 文件名：UserInfoDao
@@ -12,10 +12,9 @@ import java.util.List;
  */
 @Mapper
 public interface TeamClassDao  {
-    public List<User> getAll();
-    public User getOne(Long id);
-    public void insert(User user);
-    public void update(User user);
+    public TeamClass getOne(Long id);
+    public List<TeamClass> getClassList(TeamClass teamClass);
+    public void insert(TeamClass teamClass);
+    public void update(TeamClass teamClass);
     public void delete(Long id);
-    public User findByUserName(String username);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/TeamDao.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.Team;
 
 /**
  * 文件名：UserInfoDao
@@ -12,10 +12,10 @@ import java.util.List;
  */
 @Mapper
 public interface TeamDao  {
-    public List<User> getAll();
-    public User getOne(Long id);
-    public void insert(User user);
-    public void update(User user);
+    public List<Team> getAll();
+    public Team getOne(Long id);
+    public List<Team> getByDeptId(Long id);
+    public void insert(Team team);
+    public void update(Team team);
     public void delete(Long id);
-    public User findByUserName(String username);
 }

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

@@ -3,64 +3,68 @@
 <mapper namespace="com.xintong.visualinspection.dao.master.ConstantDao" >
     <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Constant" >
         <id property="id" column="ID"/>
-        <result property="codeValue" column="codeValue"/>
-        <result property="codeName" column="codeName"/>
-        <result property="codeFlag" column="codeFlag"/>
-        <result property="flagName" column="flagName"/>
+        <result property="code_value" column="code_value"/>
+        <result property="code_name" column="code_name"/>
+        <result property="code_flag" column="code_flag"/>
+        <result property="flag_name" column="flag_name"/>
         <result property="valid" column="valid"/>
         <result property="remark" column="remark"/>
-        <result property="sortNo" column="sortNo"/>
+        <result property="sort_no" column="sort_no"/>
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
         SELECT *
         FROM sys_code
+        WHERE valid!=0
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_code
-        WHERE id = #{id}
+        WHERE valid!=0 and id = #{id}
     </select>
     
     <select id="getByFlag" parameterType="String" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_code
-        WHERE codeFlag=#{codeFlag}
+        WHERE  valid!=0 
+           and code_flag=#{code_flag}
     </select>
     
      <select id="getByName" parameterType="String" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_code
-        WHERE flagName like CONCAT('%',#{flagName},'%') 
+        WHERE flag_name like CONCAT('%',#{flag_name},'%') 
+          and valid!=0
     </select>
     
     <select id="getByFlagAndValue" parameterType="com.xintong.visualinspection.bean.Constant" resultMap="BaseResultMap" >
         SELECT *
         FROM sys_code
-        WHERE codeFlag=#{codeFlag}
-        	and codeValue=#{codeValue}
+        WHERE code_flag=#{code_flag}
+        	and code_value=#{code_value}
+        	and valid!=0
     </select>
 
     <insert id="insert" parameterType="com.xintong.visualinspection.bean.Constant" >
         INSERT INTO
         sys_code
-        (codeValue,codeName,codeFlag,flagName,valid,remark,sortNo)
+        (code_value,code_name,code_flag,flag_name,valid,remark,sort_no)
         VALUES
-        (#{codeValue}, #{codeName},#{codeFlag},#{flagName},#{valid},#{remark},#{sortNo})
+        (#{code_value}, #{code_name},#{code_flag},#{flag_name},#{valid},#{remark},#{sort_no})
     </insert>
 
     <update id="update" parameterType="com.xintong.visualinspection.bean.Constant" >
         UPDATE
         sys_code
         SET
-        <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="code_value != null">code_value = #{code_value},</if>
+        <if test="code_name != null">code_name = #{code_name},</if>
+        <if test="code_flag != null">code_flag = #{code_flag},</if>
+        <if test="flag_name != null">flag_name = #{flag_name},</if>
         <if test="valid != null">valid = #{valid},</if>
         <if test="remark != null">remark = #{remark},</if>
-        <if test="sortNo != null">sortNo = #{sortNo}</if>
+        <if test="sort_no != null">sort_no = #{sort_no}</if>
         WHERE
         id = #{id}
     </update>

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

@@ -1,68 +1,64 @@
 <?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.TeamClassDao" >
-    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.User" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.TeamClass" >
         <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">
-        <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 column="work_date" property="work_date" jdbcType="DATE" />
+        <result column="dept_id" property="dept_id" jdbcType="INTEGER" />
+        <result column="user_ids" property="user_ids" jdbcType="VARCHAR" />
+        <result column="class_type" property="class_type" jdbcType="VARCHAR" />
+        <result column="team_id" property="team_id" jdbcType="INTEGER" />
+        <result column="start_time" property="start_time" jdbcType="DATE" />
+        <result column="end_time" property="end_time" jdbcType="DATE" />
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_team_class
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_team_class
         WHERE id = #{id}
     </select>
+    
+    <select id="getClassList" parameterType="com.xintong.visualinspection.bean.TeamClass" resultMap="BaseResultMap" >
+        SELECT *
+        FROM sys_team_class
+        WHERE 1=1
+        <if test="dept_id != null">AND dept_id = #{dept_id}</if>
+        <if test="start_time != null">AND work_date &gt;= #{start_time}</if>
+        <if test="end_time != null">AND work_date &lt;= #{end_time}</if>
+    </select>
 
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.TeamClass" >
         INSERT INTO
-        sys_user
-        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+        sys_team_class
+        (work_date,dept_id,user_ids,class_type,team_id,start_time,end_time)
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{work_date}, #{dept_id},#{user_ids},#{class_type},#{team_id},#{start_time},#{end_time})
     </insert>
 
-    <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
+    <update id="update" parameterType="com.xintong.visualinspection.bean.TeamClass" >
         UPDATE
-        sys_user
+        sys_team_class
         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="work_date != null">work_date = #{work_date},</if>
+        <if test="dept_id != null">dept_id = #{dept_id},</if>
+        <if test="user_ids != null">user_ids = #{user_ids},</if>
+        <if test="class_type != null">class_type = #{class_type},</if>
+        <if test="team_id != null">team_id = #{team_id},</if>
+        <if test="start_time != null">start_time = #{start_time},</if>
+        <if test="end_time != null">end_time = #{end_time}</if>
         WHERE
         id = #{id}
     </update>
 
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
-        sys_user
+        sys_team_class
         WHERE
         id =#{id}
     </delete>
-
-
-    <select id="findByUserName" parameterType="String" resultMap="userMap">
-        select u.*
-        ,r.name
-        from sys_user u
-        LEFT JOIN sys_role_user sru on u.id= sru.Sys_User_id
-        LEFT JOIN sys_role r on sru.sys_role_id=r.id
-        where username= #{username}
-    </select>
 </mapper>

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

@@ -1,68 +1,53 @@
 <?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.TeamDao" >
-    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.User" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Team" >
         <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">
-        <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 column="name" property="name" jdbcType="VARCHAR" />
+        <result column="dept_id" property="dept_id" jdbcType="INTEGER" />
+        <result column="user_ids" property="user_ids" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_team
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM sys_team
         WHERE id = #{id}
     </select>
+    
+    <select id="getByDeptId" parameterType="java.lang.Long" resultMap="BaseResultMap" >
+        SELECT *
+        FROM sys_team
+        WHERE dept_id = #{dept_id}
+    </select>
 
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Team" >
         INSERT INTO
-        sys_user
-        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+        sys_team
+        (name,dept_id,user_ids)
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{name}, #{dept_id},#{user_ids})
     </insert>
 
-    <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Team" >
         UPDATE
-        sys_user
+        sys_team
         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="name != null">name = #{name},</if>
+        <if test="dept_id != null">dept_id = #{dept_id},</if>
+        <if test="user_ids != null">user_ids = #{user_ids}</if>
         WHERE
         id = #{id}
     </update>
 
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
-        sys_user
+        sys_team
         WHERE
         id =#{id}
     </delete>
-
-
-    <select id="findByUserName" parameterType="String" resultMap="userMap">
-        select u.*
-        ,r.name
-        from sys_user u
-        LEFT JOIN sys_role_user sru on u.id= sru.Sys_User_id
-        LEFT JOIN sys_role r on sru.sys_role_id=r.id
-        where username= #{username}
-    </select>
 </mapper>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamClassService.java

@@ -18,10 +18,8 @@ import com.xintong.visualinspection.bean.TeamClass;
  *
  */
 public interface TeamClassService {
-    public List<TeamClass> getAll();
-    public Constant getById(Long id);
-    public List<TeamClass> getByFlag();
-    public Constant getByFlagAndValue(String flag, int value);
+    public List<TeamClass> getClassList(TeamClass teamClass);
+    public TeamClass getById(Long id);
     public void insert(TeamClass teamClass);
     public void update(TeamClass teamClass);
     public void delete(Long id);

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/TeamService.java

@@ -8,7 +8,7 @@ import com.xintong.visualinspection.bean.Team;
 /**
  * 
  *
- * ConstantService
+ * TeamService
  * 
  * tiger
  * tiger
@@ -19,9 +19,8 @@ import com.xintong.visualinspection.bean.Team;
  */
 public interface TeamService {
     public List<Team> getAll();
-    public Constant getById(Long id);
-    public List<Team> getByFlag();
-    public Constant getByFlagAndValue(String flag, int value);
+    public Team getById(Long id);
+    public List<Team> getByDeptId(Long deptId);
     public void insert(Team team);
     public void update(Team team);
     public void delete(Long id);

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

@@ -6,7 +6,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.TeamClass;
 import com.xintong.visualinspection.dao.master.TeamClassDao;
 import com.xintong.visualinspection.service.BaseService;
@@ -26,45 +25,38 @@ public class TeamClassServiceImpl extends BaseService implements TeamClassServic
     private TeamClassDao teamClassDao;
 
 
-	public List getAll() {
+	@Override
+	public List<TeamClass> getClassList(TeamClass teamClass) {
 		// TODO Auto-generated method stub
-		return null;
+		return teamClassDao.getClassList(teamClass);
 	}
 
 
-	public Constant getById(Long id) {
+	@Override
+	public TeamClass getById(Long id) {
 		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	public List getByFlag() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	public Constant getByFlagAndValue(String flag, int value) {
-		// TODO Auto-generated method stub
-		return null;
+		return teamClassDao.getOne(id);
 	}
 
 
+	@Override
 	public void insert(TeamClass teamClass) {
 		// TODO Auto-generated method stub
-		
+		teamClassDao.insert(teamClass);
 	}
 
 
+	@Override
 	public void update(TeamClass teamClass) {
 		// TODO Auto-generated method stub
-		
+		teamClassDao.update(teamClass);
 	}
 
 
+	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
-		
+		teamClassDao.delete(id);
 	}
 
 }

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

@@ -26,46 +26,45 @@ public class TeamServiceImpl extends BaseService implements TeamService {
     private TeamDao teamDao;
 
 
-	public List getAll() {
+	@Override
+	public List<Team> getAll() {
 		// TODO Auto-generated method stub
-		return null;
+		return teamDao.getAll();
 	}
 
 
-	public Constant getById(Long id) {
+	@Override
+	public Team getById(Long id) {
 		// TODO Auto-generated method stub
-		return null;
+		return teamDao.getOne(id);
 	}
 
 
-	public List getByFlag() {
+	@Override
+	public List<Team> getByDeptId(Long deptId) {
 		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	public Constant getByFlagAndValue(String flag, int value) {
-		// TODO Auto-generated method stub
-		return null;
+		return teamDao.getByDeptId(deptId);
 	}
 
 
+	@Override
 	public void insert(Team team) {
 		// TODO Auto-generated method stub
-		
+		teamDao.insert(team);
 	}
 
 
+	@Override
 	public void update(Team team) {
 		// TODO Auto-generated method stub
-		
+		teamDao.update(team);
 	}
 
 
+	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
-		
+		teamDao.delete(id);
 	}
 
-    
 }

VisualInspection_server/src/main/resources/application.properties

@@ -8,7 +8,7 @@ master.datasource.password = root
 master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
-## 用户数据源配置
+## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
 cluster.datasource.url=jdbc:mysql://git.topm.win:9001/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -16,28 +16,28 @@ cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
 cluster.mapper-locations=classpath:com/xintong/visualinspection/mapper/cluster/*.xml
 
 
-# 初始化大小，最小，最大
+# \u521d\u59cb\u5316\u5927\u5c0f\uff0c\u6700\u5c0f\uff0c\u6700\u5927
 spring.datasource.initialSize=5
 spring.datasource.minIdle=5
 spring.datasource.maxActive=20
-# 配置获取连接等待超时的时间
+# \u914d\u7f6e\u83b7\u53d6\u8fde\u63a5\u7b49\u5f85\u8d85\u65f6\u7684\u65f6\u95f4
 spring.datasource.maxWait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# \u914d\u7f6e\u95f4\u9694\u591a\u4e45\u624d\u8fdb\u884c\u4e00\u6b21\u68c0\u6d4b\uff0c\u68c0\u6d4b\u9700\u8981\u5173\u95ed\u7684\u7a7a\u95f2\u8fde\u63a5\uff0c\u5355\u4f4d\u662f\u6beb\u79d2
 spring.datasource.timeBetweenEvictionRunsMillis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
+# \u914d\u7f6e\u4e00\u4e2a\u8fde\u63a5\u5728\u6c60\u4e2d\u6700\u5c0f\u751f\u5b58\u7684\u65f6\u95f4\uff0c\u5355\u4f4d\u662f\u6beb\u79d2
 spring.datasource.minEvictableIdleTimeMillis=300000
 spring.datasource.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.testWhileIdle=true
 spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
-# 打开PSCache，并且指定每个连接上PSCache的大小
+# \u6253\u5f00PSCache\uff0c\u5e76\u4e14\u6307\u5b9a\u6bcf\u4e2a\u8fde\u63a5\u4e0aPSCache\u7684\u5927\u5c0f
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
-# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
+# \u914d\u7f6e\u76d1\u63a7\u7edf\u8ba1\u62e6\u622a\u7684filters\uff0c\u53bb\u6389\u540e\u76d1\u63a7\u754c\u9762sql\u65e0\u6cd5\u7edf\u8ba1\uff0c'wall'\u7528\u4e8e\u9632\u706b\u5899
 spring.datasource.filters=stat,wall,log4j
-# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
+# \u901a\u8fc7connectProperties\u5c5e\u6027\u6765\u6253\u5f00mergeSql\u529f\u80fd\uff1b\u6162SQL\u8bb0\u5f55
 spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# 合并多个DruidDataSource的监控数据
+# \u5408\u5e76\u591a\u4e2aDruidDataSource\u7684\u76d1\u63a7\u6570\u636e
 spring.datasource.useGlobalDataSourceStat=true
 
 
@@ -47,32 +47,32 @@ spring.datasource.useGlobalDataSourceStat=true
 
 
 # REDIS (RedisProperties)
-# Redis数据库索引（默认为0）
+# Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
-# Redis服务器地址
+# Redis\u670d\u52a1\u5668\u5730\u5740
 spring.redis.host=git.topm.win
-# Redis服务器连接端口
+# Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 spring.redis.port=6379  
-# Redis服务器连接密码（默认为空）
+# Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong
-# 连接池最大连接数（使用负值表示没有限制）
+# \u8fde\u63a5\u6c60\u6700\u5927\u8fde\u63a5\u6570\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
 spring.redis.pool.max-active=8  
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
+# \u8fde\u63a5\u6c60\u6700\u5927\u963b\u585e\u7b49\u5f85\u65f6\u95f4\uff08\u4f7f\u7528\u8d1f\u503c\u8868\u793a\u6ca1\u6709\u9650\u5236\uff09
 spring.redis.pool.max-wait=-1  
-# 连接池中的最大空闲连接
+# \u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5927\u7a7a\u95f2\u8fde\u63a5
 spring.redis.pool.max-idle=8  
-# 连接池中的最小空闲连接
+# \u8fde\u63a5\u6c60\u4e2d\u7684\u6700\u5c0f\u7a7a\u95f2\u8fde\u63a5
 spring.redis.pool.min-idle=0  
-# 连接超时时间（毫秒）
+# \u8fde\u63a5\u8d85\u65f6\u65f6\u95f4\uff08\u6beb\u79d2\uff09
 spring.redis.timeout=0 
 
 
 
-logging.level.root=DEBUG
+logging.level.root=INFO
 logging.level.org.springframework.web=DEBUG
 logging.level.org.springframework.data=DEBUG
 logging.level.org.springframework.security=DEBUG
-logging.level.org.mybites=DEBUG
+logging.level.org.mybites=INFO
 
 
 

VisualInspection_server/src/main/resources/errcode.properties

@@ -5,6 +5,8 @@
 10004=\u6570\u5b66\u8fd0\u7b97\u9519\u8bef
 10005=\u6587\u4ef6\u672a\u627e\u5230
 10006=\u53c2\u6570\u9519\u8bef
+10007=\u65e0\u6548\u7684\u53c2\u6570\u7c7b\u578b
+10008=\u67e5\u8be2\u7ed3\u679c\u8fc7\u591a\uff08\u4e00\u822c\u662f\u671f\u671b1\u4e2a\uff09
 11000=\u5176\u4ed6\u9519\u8bef
 #\u901a\u7528\u4e1a\u52a1\u9519\u8bef
 20001=\u8f93\u5165\u53c2\u6570\u9519\u8bef
@@ -29,7 +31,9 @@
 #\u73ed\u7ec4\u7ba1\u7406\u9519\u8bef
 20801=
 #\u73ed\u6b21\u7ba1\u7406\u9519\u8bef
-20901=
+20901=\u90e8\u95e8\u7f16\u53f7\u4e0d\u80fd\u4e3a\u7a7a
+20902=\u5f00\u59cb\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a
+20903=\u7ed3\u675f\u65f6\u95f4\u4e0d\u80fd\u4e3a\u7a7a
 #\u8003\u6838\u9879\u7ba1\u7406\u9519\u8bef
 21001=
 #\u8003\u6838\u529e\u6cd5\u7ba1\u7406\u9519\u8bef