fix

virgo.api/src/main/java/com/bosshand/virgo/api/controller/SingleController.java

@@ -1,8 +1,8 @@
 package com.bosshand.virgo.api.controller;
 
 
-import com.bosshand.virgo.api.model.Single;
-import com.bosshand.virgo.api.service.SingleService;
+import com.bosshand.virgo.api.model.WorkOrder;
+import com.bosshand.virgo.api.service.WorkOrderService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,37 +10,37 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping({"single"})
+@RequestMapping({"workOrder"})
 @Api(tags = {"工单管理"})
-public class SingleController {
+public class WorkOrderController {
 
     @Autowired
-    SingleService singleService;
+    WorkOrderService workOrderService;
 
     @ApiOperation("保存")
     @RequestMapping(value = "", method = RequestMethod.POST)
-    public Response insert(@RequestBody Single single) {
-        singleService.insert(single);
+    public Response insert(@RequestBody WorkOrder workOrder) {
+        workOrderService.insert(workOrder);
         return Response.ok();
     }
 
     @ApiOperation("获取")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Response getList(@RequestBody Single single) {
-        return Response.ok(singleService.getList(single));
+    public Response getList(@RequestBody WorkOrder workOrder) {
+        return Response.ok(workOrderService.getList(workOrder));
     }
 
     @ApiOperation("更新")
     @RequestMapping(value = "/update", method = RequestMethod.PUT)
-    public Response update(@RequestBody Single single) {
-        singleService.update(single);
+    public Response update(@RequestBody WorkOrder workOrder) {
+        workOrderService.update(workOrder);
         return Response.ok();
     }
 
     @ApiOperation("删除")
     @RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
     public Response delete(@PathVariable long id) {
-        singleService.delete(id);
+        workOrderService.delete(id);
         return Response.ok();
     }
 

virgo.api/src/main/java/com/bosshand/virgo/api/dao/SingleDao.java

@@ -1,19 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Single;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SingleDao {
-
-    int insert(Single single);
-
-    int update(Single single);
-
-    int delete(long id);
-
-    List<Single> getList(Single single);
-
-}

virgo.api/src/main/java/com/bosshand/virgo/api/dao/WorkOrderDao.java

@@ -0,0 +1,19 @@
+package com.bosshand.virgo.api.dao;
+
+import com.bosshand.virgo.api.model.WorkOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface WorkOrderDao {
+
+    int insert(WorkOrder workOrder);
+
+    int update(WorkOrder workOrder);
+
+    int delete(long id);
+
+    List<WorkOrder> getList(WorkOrder workOrder);
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/model/Single.java

@@ -3,7 +3,7 @@ package com.bosshand.virgo.api.model;
 /**
  * 工单管理
  */
-public class Single {
+public class WorkOrder {
 
     private long id;
 

virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectItemTargetRoomService.java

@@ -65,10 +65,10 @@ public class ProjectItemTargetRoomService {
 
     public ProjectItemTargetRoom get(long id) {
         ProjectItemTargetRoom room = projectItemTargetRoomDao.get(id);
-        if (room != null) {
-            room.setProjectName(projectCache.get(room.getProjectId()).getName());
-            room.setProjectItemName(projectItemCache.get(room.getProjectItemId()).getName());
-            room.setProjectItemTargetName(projectItemTargetCache.get(room.getProjectItemTargetId()).getName());
+        if(room != null){
+            room.setProjectName(this.getProject(room.getProjectId()).getName());
+            room.setProjectItemName(this.getProjectItem(room.getProjectItemId()).getName());
+            room.setProjectItemTargetName(this.getProjectItemTarget(room.getProjectItemTargetId()).getName());
         }
         return room;
     }
@@ -81,9 +81,9 @@ public class ProjectItemTargetRoomService {
         int currIndex = (currPage - 1) * pageSize;
         List<ProjectItemTargetRoom> list = projectItemTargetRoomDao.getLimit(project, currIndex, pageSize);
         for (ProjectItemTargetRoom room : list) {
-            room.setProjectName(projectCache.get(room.getProjectId()).getName());
-            room.setProjectItemName(projectItemCache.get(room.getProjectItemId()).getName());
-            room.setProjectItemTargetName(projectItemTargetCache.get(room.getProjectItemTargetId()).getName());
+            room.setProjectName(this.getProject(room.getProjectId()).getName());
+            room.setProjectItemName(this.getProjectItem(room.getProjectItemId()).getName());
+            room.setProjectItemTargetName(this.getProjectItemTarget(room.getProjectItemTargetId()).getName());
         }
         return list;
     }
@@ -91,9 +91,9 @@ public class ProjectItemTargetRoomService {
     public List<ProjectItemTargetRoom> getProjectItemTargetRoom(ProjectItemTargetRoom projectItemTargetRoom) {
         List<ProjectItemTargetRoom> list = projectItemTargetRoomDao.getProjectItemTargetRoom(projectItemTargetRoom);
         for (ProjectItemTargetRoom room : list) {
-            room.setProjectName(projectCache.get(room.getProjectId()).getName());
-            room.setProjectItemName(projectItemCache.get(room.getProjectItemId()).getName());
-            room.setProjectItemTargetName(projectItemTargetCache.get(room.getProjectItemTargetId()).getName());
+            room.setProjectName(this.getProject(room.getProjectId()).getName());
+            room.setProjectItemName(this.getProjectItem(room.getProjectItemId()).getName());
+            room.setProjectItemTargetName(this.getProjectItemTarget(room.getProjectItemTargetId()).getName());
         }
         return list;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/service/SingleService.java

@@ -1,32 +0,0 @@
-package com.bosshand.virgo.api.service;
-
-import com.bosshand.virgo.api.dao.SingleDao;
-import com.bosshand.virgo.api.model.Single;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class SingleService {
-
-    @Autowired
-    private SingleDao singleDao;
-
-    public int insert (Single single){
-        return singleDao.insert(single);
-    }
-
-    public int update(Single single){
-        return singleDao.update(single);
-    }
-
-    public int delete(long id){
-        return singleDao.delete(id);
-    }
-
-    public List<Single> getList(Single single){
-        return singleDao.getList(single);
-    }
-
-}

virgo.api/src/main/java/com/bosshand/virgo/api/service/WorkOrderService.java

@@ -0,0 +1,32 @@
+package com.bosshand.virgo.api.service;
+
+import com.bosshand.virgo.api.dao.WorkOrderDao;
+import com.bosshand.virgo.api.model.WorkOrder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WorkOrderService {
+
+    @Autowired
+    private WorkOrderDao workOrderDao;
+
+    public int insert (WorkOrder workOrder){
+        return workOrderDao.insert(workOrder);
+    }
+
+    public int update(WorkOrder workOrder){
+        return workOrderDao.update(workOrder);
+    }
+
+    public int delete(long id){
+        return workOrderDao.delete(id);
+    }
+
+    public List<WorkOrder> getList(WorkOrder workOrder){
+        return workOrderDao.getList(workOrder);
+    }
+
+}

virgo.api/src/main/resources/mapper/SingleMapper.xml

@@ -2,31 +2,31 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.SingleDao">
+<mapper namespace="com.bosshand.virgo.api.dao.WorkOrderDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.Single" id="singleResult">
+    <resultMap type="com.bosshand.virgo.api.model.WorkOrder" id="workOrderResult">
         <id column="id" property="id"/>
         <result column="projectId" property="projectId"/>
     </resultMap>
 
-    <insert id="insert" parameterType="com.bosshand.virgo.api.model.Single" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO single(projectId) VALUES (#{projectId})
+    <insert id="insert" parameterType="com.bosshand.virgo.api.model.WorkOrder" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO work_order(projectId) VALUES (#{projectId})
     </insert>
 
     <delete id="delete">
-        DELETE from single where id=#{id}
+        DELETE from work_order where id=#{id}
     </delete>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.Single">
-        UPDATE single
+    <update id="update" parameterType="com.bosshand.virgo.api.model.WorkOrder">
+        UPDATE work_order
         <trim prefix="set" suffixOverrides=",">
             <if test="projectId!=0">projectId=#{projectId},</if>
         </trim>
         WHERE id=#{id}
     </update>
 
-    <select id="getList" resultMap="singleResult">
-        SELECT * FROM single
+    <select id="getList" resultMap="workOrderResult">
+        SELECT * FROM work_order
         <where>
             <if test="id != 0">
                 and id = #{id}