添加考核任务管理

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

@@ -1,8 +1,8 @@
 package com.xintong.visualinspection.bean;
-import lombok.Data;
-
 import org.hibernate.validator.constraints.NotEmpty;
 
+import lombok.Data;
+
 /**
  * 
  * 常量（字典）实体类
@@ -26,7 +26,7 @@ public class Constant{
 	private static final long serialVersionUID = -7765958097423155178L;
 	private Long id;
 	@NotEmpty(message="字典值不能为空")
-	private String code_value;
+	private Integer code_value;
 	@NotEmpty(message="字典名称不能为空")
 	private String code_name;
 	@NotEmpty(message="字典标识不能为空")
@@ -36,4 +36,10 @@ public class Constant{
 	private int valid;
 	private String remark;
 	private int sort_no;
+	
+	Constant(){}
+	public Constant(String code_flag, int code_value){
+		this.setCode_value(code_value);
+		this.setCode_flag(code_flag);
+	}
 }

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

@@ -4,6 +4,10 @@ import lombok.Data;
 
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * 文件名：CheckTask
  * 版本信息：日期：2017/4/15 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
@@ -11,26 +15,40 @@ import java.util.Date;
 @Data
 public class Task{
     //编号
-    private Integer id;
+    private Long id;
+    //名称
+    private String name;
     //审核状态
     private Integer check_status;
     //视屏编号
     private String video_id;
+    //监控位置类型
+    private Integer checked_location_type;
     //监控位置
-    private String monitoring_position;
+    private String checked_location;
     //生成时间
-    private Date insert_time;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
+    private Date create_time;
     //考核办法ids
-    private String assessment_methods_ids;
-    //跟新时间
+    private String rule_id;
+    //更新时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
     private Date update_time;
     //考核人员ids
-    private String assessment_personnel_ids;
+    private Long checkman;
     //被考核人员id
-    private Integer check_personnel;
+    private Long checked_person;
+    //被考核部门id
+    private Long checked_dept;
     //结束考核时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
     private Date end_time;
     //开始审核时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
     private Date start_time;
     //备注
     private String remark;

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

@@ -0,0 +1,27 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 文件名：TaskStatus
+ * 版本信息：日期：2017/4/15 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class TaskStatus{
+	//编号
+    private Long id;
+    //编号
+    private Long task_id;
+    //更新时间
+    private Date update_time;
+    //更新人id
+    private Long update_user;
+    //更新人
+    private String update_username;
+    //状态
+    private Integer check_status;
+    //状态名称
+    private String check_status_name;
+}

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/TaskController.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.Task;
+import com.xintong.visualinspection.err.BusinessException;
+import com.xintong.visualinspection.service.TaskService;
 
 /**
  * 文件名：TestController
@@ -20,45 +22,80 @@ import com.xintong.visualinspection.service.ConstantService;
 public class TaskController extends BaseController {
 
     @Autowired
-    private ConstantService constantService;
+    private TaskService taskService;
 
    
     /**
-     * 添加常量
+     * 添加考核任务
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/addConstant")
-    public String addConstant(@Valid @RequestBody Constant constant, BindingResult result){
-    	constantService.insert(constant);
+    @RequestMapping(value = "/add")
+    public String add(@Valid @RequestBody Task task){
+    	taskService.insert(task);
     	return super.returnSuccessResult("添加成功");
     }
     
     /**
-     * 修改常量
+     * 修改考核任务
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
-    @RequestMapping(value = "/updateConstant")
-    public String updateConstant(@RequestBody Constant constant){
-    	constantService.update(constant);
+    @RequestMapping(value = "/update")
+    public String update(@Valid @RequestBody Task task){
+    	if(task.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	taskService.update(task);
     	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 = "/delete")
+    public String delete(@RequestBody Task task){
+    	if(task.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	taskService.delete(task.getId());
     	return super.returnSuccessResult("删除成功");
     }
+    
+    /**
+     * 通过id获取考核任务
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getById")
+    public String getById(@RequestBody Task task){
+    	if(task.getId()==null){
+    		throw new BusinessException(20002);
+    	}
+    	Task t = taskService.getById(task.getId());
+    	return super.returnSuccessResult(t);
+    }
+    
+    /**
+     * 通过多条件获取考核任务
+     * @return
+     * String
+     * @exception
+     * @since  1.0.0
+     */
+    @RequestMapping(value = "/getTaskList")
+    public String getTaskList(@RequestBody Task task){
+    	List<Task> taskList = taskService.getTaskList(task);
+    	return super.returnSuccessResult(taskList);
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.xintong.visualinspection.dao.master;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文件名：CommoneDao
+ * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Mapper
+public interface CommonDao  {
+    public Long getLastId();
+}

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

@@ -1,10 +1,11 @@
 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.Task;
+import com.xintong.visualinspection.bean.TaskStatus;
 
 /**
  * 文件名：UserInfoDao
@@ -12,10 +13,11 @@ import java.util.List;
  */
 @Mapper
 public interface TaskDao  {
-    public List<User> getAll();
-    public User getOne(Long id);
-    public void insert(User user);
-    public void update(User user);
+    public List<Task> getAll();
+    public Task getOne(Long id);
+    public List<Task> getList(Task task);
+    public void insert(Task task);
+    public void insertStatus(TaskStatus taskStatus);
+    public void update(Task task);
     public void delete(Long id);
-    public User findByUserName(String username);
 }

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

@@ -53,10 +53,6 @@
          </foreach >
     </insert>
     
-    <select id="getLastId" resultType="Long">
-    	select last_insert_id()
-    </select>
-    
     <update id="update" parameterType="com.xintong.visualinspection.bean.CheckRule" >
         UPDATE
         check_rule

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

@@ -0,0 +1,7 @@
+<?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.CommonDao" >
+    <select id="getLastId" resultType="Long">
+    	select last_insert_id()
+    </select>
+</mapper>

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

@@ -1,68 +1,105 @@
 <?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.TaskDao" >
-    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.User" >
+    <resultMap id="BaseResultMap" type="com.xintong.visualinspection.bean.Task" >
         <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" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+        <result column="check_status" property="check_status" jdbcType="INTEGER" />
+        <result column="video_id" property="video_id" jdbcType="VARCHAR" />
+        <result column="create_time" property="create_time" jdbcType="VARCHAR" />
+        <result column="update_time" property="update_time" jdbcType="VARCHAR" />
+        <result column="start_time" property="start_time" jdbcType="VARCHAR" />
+        <result column="end_time" property="end_time" jdbcType="VARCHAR" />
+        <result column="checkman" property="checkman" jdbcType="INTEGER" />
+        <result column="checked_person" property="checked_person" jdbcType="INTEGER" />
+        <result column="checked_dept" property="checked_dept" jdbcType="INTEGER" />
+        <result column="rule_id" property="rule_id" jdbcType="INTEGER" />
+        <result column="checked_location" property="checked_location" jdbcType="VARCHAR" />
+        <result column="checked_location_type" property="checked_location_type" jdbcType="INTEGER" />
+        <result column="remark" property="remark" jdbcType="VARCHAR" />
     </resultMap>
-    <resultMap id="userMap" type="com.xintong.visualinspection.bean.User">
+    <resultMap id="taskStatusMap" type="com.xintong.visualinspection.bean.TaskStatus">
         <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="task_id" column="task_id"/>
+        <result property="update_time" column="update_time"/>
+        <result property="update_user" column="update_user"/>
+        <result property="update_username" column="update_username"/>
+        <result property="check_status" column="check_status"/>
+        <result property="check_status_name" column="check_status_name"/>
     </resultMap>
 
     <select id="getAll" resultMap="BaseResultMap"  >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM check_task
     </select>
 
     <select id="getOne" parameterType="java.lang.Long" resultMap="BaseResultMap" >
-        SELECT
-        id,username,age,password
-        FROM sys_user
+        SELECT *
+        FROM check_task
         WHERE id = #{id}
     </select>
+    
+    <select id="getList" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
+        SELECT *
+        FROM check_task
+        WHERE 1=1
+        	<if test="check_status != null">AND check_status = #{check_status}</if>
+        	<if test="start_time != null">AND create_time &gt;= #{start_time}</if>
+        	<if test="end_time != null">AND create_time &lt;= #{end_time}</if>
+        	<if test="checked_dept != null">AND checked_dept = #{checked_dept}</if>
+        	<if test="checkman != null">AND checkman = #{checkman}</if>
+        	<if test="checked_person != null">AND checked_person = #{checked_person}</if>
+    </select>
 
-    <insert id="insert" parameterType="com.xintong.visualinspection.bean.User" >
-        INSERT INTO
-        sys_user
-        (username,age,password,TRUENAME,ORGANID,BIRTH,AGE,MOBILE,POSITIONID,SEX,WORKNO,IDNO)
+    <insert id="insert" parameterType="com.xintong.visualinspection.bean.Task" >
+        INSERT INTO check_task
+        (name,check_status,video_id,create_time,update_time,start_time,
+        	end_time,checkman,checked_person,checked_dept,rule_id,checked_location,
+        	checked_location_type,remark
+        )
+        VALUES
+        (#{name}, #{check_status},#{video_id},#{create_time},#{update_time},#{start_time},
+        	#{end_time},#{checkman},#{checked_person},#{checked_dept},#{rule_id},#{checked_location},
+        	#{checked_location_type},#{remark}
+        )
+    </insert>
+    
+    <insert id="insertStatus" parameterType="com.xintong.visualinspection.bean.TaskStatus" >
+        INSERT INTO check_task_status
+        (task_id,update_time,update_user,update_username,check_status,
+        	check_status_name
+        )
         VALUES
-        (#{username}, #{age},#{password},#{truename},#{deptId},#{birth},#{age},#{mobile},#{positionId},#{sex},#{workno},#{idno})
+        (#{task_id}, #{update_time},#{update_user},#{update_username},#{check_status},
+        	#{check_status_name}
+        )
     </insert>
 
-    <update id="update" parameterType="com.xintong.visualinspection.bean.User" >
+    <update id="update" parameterType="com.xintong.visualinspection.bean.Task" >
         UPDATE
-        sys_user
+        check_task
         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="check_status != null">check_status = #{check_status},</if>
+        <if test="video_id != null">video_id = #{video_id},</if>
+        <if test="update_time != null">update_time = #{update_time},</if>
+        <if test="start_time != null">start_time = #{start_time},</if>
+        <if test="end_time != null">end_time = #{end_time},</if>
+        <if test="checkman != null">checkman = #{checkman},</if>
+        <if test="checked_person != null">checked_person = #{checked_person},</if>
+        <if test="checked_dept != null">checked_dept = #{checked_dept},</if>
+        <if test="rule_id != null">rule_id = #{rule_id},</if>
+        <if test="checked_location != null">checked_location = #{checked_location},</if>
+        <if test="checked_location_type != null">checked_location_type = #{checked_location_type},</if>
+        remark = #{remark}
         WHERE
         id = #{id}
     </update>
 
     <delete id="delete" parameterType="java.lang.Long" >
         DELETE FROM
-        sys_user
+        check_task
         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/BaseService.java

@@ -1,8 +1,17 @@
 package com.xintong.visualinspection.service;
 
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.xintong.visualinspection.dao.master.CommonDao;
+import com.xintong.visualinspection.dao.master.ConstantDao;
+
 /**
  * 文件名：BaseService
  * 版本信息：日期：2017/3/30 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
  */
 public class BaseService {
+	@Autowired
+    protected CommonDao commonDao;
+	@Autowired
+	protected ConstantDao constantDao;
 }

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

@@ -19,9 +19,8 @@ import com.xintong.visualinspection.bean.Task;
  */
 public interface TaskService {
     public List<Task> getAll();
-    public Constant getById(Long id);
-    public List<Task> getByFlag();
-    public Constant getByFlagAndValue(String flag, int value);
+    public Task getById(Long id);
+    public List<Task> getTaskList(Task task);
     public void insert(Task task);
     public void update(Task task);
     public void delete(Long id);

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

@@ -1,5 +1,6 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.LoggerFactory;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.Constant;
 import com.xintong.visualinspection.bean.Task;
+import com.xintong.visualinspection.bean.TaskStatus;
 import com.xintong.visualinspection.dao.master.TaskDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.TaskService;
@@ -20,51 +22,66 @@ import com.xintong.visualinspection.service.TaskService;
 public class TaskServiceImpl extends BaseService implements TaskService {
 
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(TaskServiceImpl.class);
-
-
     @Autowired
     private TaskDao taskDao;
 
-
-	public List getAll() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	public Constant getById(Long id) {
+	@Override
+	public List<Task> getAll() {
 		// TODO Auto-generated method stub
-		return null;
+		return taskDao.getAll();
 	}
 
 
-	public List getByFlag() {
+	@Override
+	public Task getById(Long id) {
 		// TODO Auto-generated method stub
-		return null;
+		return taskDao.getOne(id);
 	}
 
 
-	public Constant getByFlagAndValue(String flag, int value) {
+	@Override
+	public List<Task> getTaskList(Task task) {
 		// TODO Auto-generated method stub
-		return null;
+		return taskDao.getList(task);
 	}
 
 
+	@Override
 	public void insert(Task task) {
 		// TODO Auto-generated method stub
-		
+		taskDao.insert(task);
+		TaskStatus status = new TaskStatus();
+		status.setTask_id(commonDao.getLastId());
+		status.setUpdate_time(new Date());
+		status.setUpdate_user(task.getCheckman());
+		status.setUpdate_username("");
+		status.setCheck_status(task.getCheck_status());
+		String name = (constantDao.getByFlagAndValue(new Constant("task_status",task.getCheck_status()))).getCode_name();
+		status.setCheck_status_name(name);
+		taskDao.insertStatus(status);
 	}
 
 
+	@Override
 	public void update(Task task) {
 		// TODO Auto-generated method stub
-		
+		taskDao.update(task);
+		TaskStatus status = new TaskStatus();
+		status.setTask_id(task.getId());
+		status.setUpdate_time(new Date());
+		status.setUpdate_user(task.getCheckman());
+		status.setUpdate_username("");
+		status.setCheck_status(task.getCheck_status());
+		String name = (constantDao.getByFlagAndValue(new Constant("task_status",task.getCheck_status()))).getCode_name();
+		status.setCheck_status_name(name);
+		taskDao.insertStatus(status);
 	}
 
 
+	@Override
 	public void delete(Long id) {
 		// TODO Auto-generated method stub
-		
+		taskDao.delete(id);
 	}
 
 }