获取会员信息

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/processNode.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * Created by wangxiaoming on 2017/8/25.
  *
  */
-public class processNode implements Serializable {
+public class ProcessNode implements Serializable {
     private static final long serialVersionUID = -8907483062161665521L;
     private Integer nodeId;             //节点id
     private Integer produceId;          //产品id
@@ -86,7 +86,7 @@ public class processNode implements Serializable {
 
     @Override
     public String toString() {
-        return "processNode{" +
+        return "ProcessNode{" +
                 "nodeId=" + nodeId +
                 ", produceId=" + produceId +
                 ", processId=" + processId +

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsEmployee.java

@@ -8,7 +8,7 @@ import java.util.Date;
  * Created by Administrator on 2017 /8/25.
  */
 public class PtsEmployee implements Serializable{
-    private static final long serialVersionUID = 5366910371221991247L;
+    private static final long serialVersionUID = -285275733790334526L;
     private Integer employeeId;
     private String employeeNo; //员工编号
     private String employeeName; //员工姓名

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/PtsEmployeeService.java

@@ -0,0 +1,14 @@
+package com.iamberry.rst.faces.pts;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+
+/**
+ * pts员工信息接口
+ * Created by wangxiaoming on 2017/8/29.
+ */
+public interface PtsEmployeeService {
+    /**
+     * 获取员工信息
+     */
+    PtsEmployee getPtsEmployee(PtsEmployee ptsEmployee);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsEmployeeServiceImpl.java

@@ -0,0 +1,29 @@
+package com.iamberry.rst.service.pts;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+import com.iamberry.rst.faces.pts.PtsEmployeeService;
+import com.iamberry.rst.service.pts.mapper.PtsEmployeeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * pts员工信息接口实现
+ * Created by wangxiaoming on 2017/8/29.
+ */
+@Service
+public class PtsEmployeeServiceImpl implements PtsEmployeeService {
+
+    @Autowired
+    private PtsEmployeeMapper ptsEmployeeMapper;
+
+    /**
+     * 获取员工信息
+     *
+     * @param ptsEmployee
+     * @return
+     */
+    public PtsEmployee getPtsEmployee(PtsEmployee ptsEmployee) {
+        return ptsEmployeeMapper.getPtsEmployee(ptsEmployee);
+    }
+
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/PtsEmployeeMapper.java

@@ -0,0 +1,17 @@
+package com.iamberry.rst.service.pts.mapper;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+
+/**
+ * pts员工信息
+ * Created by wangxiaoming on 2017/8/29.
+ */
+public interface PtsEmployeeMapper {
+
+    /**
+     * 获取员工信息
+     * @param ptsEmployee
+     * @return
+     */
+    PtsEmployee getPtsEmployee(PtsEmployee ptsEmployee);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -1,6 +1,6 @@
 <?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.iamberry.rst.service.product.mapper.ProductMapper">
+<mapper namespace="com.iamberry.rst.service.pts.mapper.ProduceMapper">
 
     <select id="getProduceList" parameterType="Produce" resultType="Produce">
         SELECT

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -0,0 +1,21 @@
+<?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.iamberry.rst.service.pts.mapper.PtsEmployeeMapper">
+
+    <select id="getPtsEmployee" parameterType="PtsEmployee" resultType="PtsEmployee">
+       SELECT
+            tb_rst_pts_employee.employee_id AS employeeId,
+            tb_rst_pts_employee.employee_no AS employeeNo,
+            tb_rst_pts_employee.employee_name AS employeeName,
+            tb_rst_pts_employee.employee_tel AS  employeeTel,
+            tb_rst_pts_employee.employee_state AS  employeeState,
+            tb_rst_pts_employee.employee_entry_date AS  employeeEntryDate,
+            tb_rst_pts_employee.employee_departure_date AS employeeDepartureDate ,
+            tb_rst_pts_employee.employee_post AS  employeePost,
+            tb_rst_pts_employee.employee_desc AS  employeeDesc,
+            tb_rst_pts_employee.employee_create_time AS  employeeCreateTime,
+            tb_rst_pts_employee.employee_update_time AS  employeeUpdateTime
+        FROM
+            tb_rst_pts_employee
+    </select>
+</mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/ProduceController.java

@@ -70,4 +70,10 @@ public class ProduceController {
         return mv;
     }
 
+
+
+    //获取生产产品、员工工作工序、工序操作选项
+
+
+
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/PtsEmployeeController.java

@@ -0,0 +1,57 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.pts.PtsEmployee;
+import com.iamberry.rst.faces.pts.PtsEmployeeService;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * pts系统员工信息controller
+ * Created by wangxiaoming on 2017/8/29.
+ */
+public class PtsEmployeeController {
+
+    @Autowired
+    private PtsEmployeeService ptsEmployeeService;
+
+    /**
+     * 根据员工编号查询员工信息
+     *
+     * @param request
+     * @return
+     */
+    //@RequiresPermissions("produce:list_produce:produce")
+    @RequestMapping("/staffmember/getStaffmemberByNumber")
+    public ResponseJson getStaffmemberByNumber(HttpServletRequest request) {
+        ResponseJson rsj = new ResponseJson();
+        String employeeNo = request.getParameter("staffmemberNumber");
+        if (employeeNo == null || "".equals(employeeNo)) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("员工编号为空");
+            return rsj;
+        }
+        PtsEmployee ptsEmployee = new PtsEmployee();
+        ptsEmployee.setEmployeeNo(employeeNo);
+        ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee);
+        if (ptsEmployee == null) {
+            rsj.setResultCode(500);
+            rsj.setResultMsg("ERROR");
+            rsj.addResponseKeyValue("查询不到该员工");
+            return rsj;
+        }
+
+        rsj.setResultCode(200);
+        rsj.setResultMsg("SUCCESS");
+        rsj.addResponseKeyValue("returnMsg", ptsEmployee);
+        return rsj;
+    }
+
+}

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -38,6 +38,13 @@
 		<typeAlias type="com.iamberry.rst.core.faq.FAQDetails" alias="FAQDetails"/>
 		<typeAlias type="com.iamberry.rst.core.faq.FAQMenu" alias="FAQMenu"/>
 		<typeAlias type="com.iamberry.rst.core.faq.FAQSubMenu" alias="FAQSubMenu"/>
+		<typeAlias type="com.iamberry.rst.core.pts.ProcessNode" alias="ProcessNode"/>
+		<typeAlias type="com.iamberry.rst.core.pts.Produce" alias="Produce"/>
+		<typeAlias type="com.iamberry.rst.core.pts.ProduceProcess" alias="ProduceProcess"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsDevice" alias="PtsDevice"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsEmployee" alias="PtsEmployee"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsMachine" alias="PtsMachine"/>
+		<typeAlias type="com.iamberry.rst.core.pts.PtsMachineLogs" alias="PtsMachineLogs"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -53,5 +60,7 @@
 		<mapper resource="com/iamberry/rst/service/sms/mapper/messageMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/product/mapper/productMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/faq/mapper/faqMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/pts/mapper/produceMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml"/>
 	</mappers>
 </configuration>