fix

virgo.api/src/main/java/com/bosshand/virgo/api/Application.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 //@EnableEurekaClient
 @EnableTransactionManagement
-@MapperScan("com.bosshand.virgo.core.dao,com.bosshand.virgo.api.dao")
+@MapperScan("com.bosshand.virgo.core.dao,com.bosshand.virgo.api.dao,com.bosshand.virgo.api.operate.dao")
 @ComponentScan(basePackages = {"com.bosshand"})
 public class Application {
 	public static void main(String[] args) {

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

@@ -1,7 +1,7 @@
-package com.bosshand.virgo.api.controller;
+package com.bosshand.virgo.api.operate.controller;
 
-import com.bosshand.virgo.api.model.OperateDevice;
-import com.bosshand.virgo.api.service.OperateDeviceService;
+import com.bosshand.virgo.api.operate.model.OperateDevice;
+import com.bosshand.virgo.api.operate.service.OperateDeviceService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,7 @@
-package com.bosshand.virgo.api.controller;
+package com.bosshand.virgo.api.operate.controller;
 
-import com.bosshand.virgo.api.model.OperateDeviceEvent;
-import com.bosshand.virgo.api.service.OperateDeviceEventService;
+import com.bosshand.virgo.api.operate.model.OperateDeviceEvent;
+import com.bosshand.virgo.api.operate.service.OperateDeviceEventService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,9 +1,9 @@
-package com.bosshand.virgo.api.controller;
+package com.bosshand.virgo.api.operate.controller;
 
-import com.bosshand.virgo.api.model.OperateDeviceLevel;
-import com.bosshand.virgo.api.model.OperateDeviceLevelModel;
-import com.bosshand.virgo.api.service.OperateDeviceLevelModelService;
-import com.bosshand.virgo.api.service.OperateDeviceLevelService;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevel;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel;
+import com.bosshand.virgo.api.operate.service.OperateDeviceLevelModelService;
+import com.bosshand.virgo.api.operate.service.OperateDeviceLevelService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,7 @@
-package com.bosshand.virgo.api.controller;
+package com.bosshand.virgo.api.operate.controller;
 
-import com.bosshand.virgo.api.model.OperateDeviceLevelModel;
-import com.bosshand.virgo.api.service.OperateDeviceLevelModelService;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel;
+import com.bosshand.virgo.api.operate.service.OperateDeviceLevelModelService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,7 +1,8 @@
-package com.bosshand.virgo.api.controller;
+package com.bosshand.virgo.api.operate.controller;
 
-import com.bosshand.virgo.api.model.OperateFlowData;
-import com.bosshand.virgo.api.service.OperateFlowDataService;
+import com.bosshand.virgo.api.operate.model.OperateFlowData;
+import com.bosshand.virgo.api.operate.service.OperateFlowDataService;
+import com.bosshand.virgo.api.service.ProjectItemTargetRoomService;
 import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,10 +21,22 @@ public class OperateFlowDataController {
     @Autowired
     OperateFlowDataService operateFlowDataService;
 
+    @Autowired
+    ProjectItemTargetRoomService projectItemTargetRoomService;
+
     @ApiOperation(value = "详情", notes = "详情")
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public Response get(@PathVariable long id) {
-        return Response.ok(operateFlowDataService.get(id));
+        OperateFlowData operateFlowData = operateFlowDataService.get(id);
+        if (operateFlowData != null) {
+            operateFlowData.setProjectName(projectItemTargetRoomService.getProject(operateFlowData.getProjectId()).getName());
+            operateFlowData.setProjectItemName(projectItemTargetRoomService.getProjectItem(operateFlowData.getProjectItemId()).getName());
+            operateFlowData.setProjectItemTargetName(projectItemTargetRoomService.getProjectItemTarget(operateFlowData.getProjectItemTargetId()).getName());
+            if (operateFlowData.getProjectItemTargetRoomId() != 0) {
+                operateFlowData.setProjectItemTargetRoomName(projectItemTargetRoomService.getProjectItemTargetRoom(operateFlowData.getProjectItemTargetRoomId()).getName());
+            }
+        }
+        return Response.ok(operateFlowData);
     }
 
     @ApiOperation(value = "查询", notes = "查询")
@@ -36,6 +49,16 @@ public class OperateFlowDataController {
     @RequestMapping(value = "/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response getList(@RequestBody OperateFlowData operateFlowData, @PathVariable int currPage, @PathVariable int pageSize) {
         List<OperateFlowData> list = operateFlowDataService.getListLimit(operateFlowData, currPage, pageSize);
+        if (list.size() > 0) {
+            for (OperateFlowData of : list) {
+                of.setProjectName(projectItemTargetRoomService.getProject(of.getProjectId()).getName());
+                of.setProjectItemName(projectItemTargetRoomService.getProjectItem(of.getProjectItemId()).getName());
+                of.setProjectItemTargetName(projectItemTargetRoomService.getProjectItemTarget(of.getProjectItemTargetId()).getName());
+                if (of.getProjectItemTargetRoomId() != 0) {
+                    of.setProjectItemTargetRoomName(projectItemTargetRoomService.getProjectItemTargetRoom(of.getProjectItemTargetRoomId()).getName());
+                }
+            }
+        }
         int totalCount = operateFlowDataService.count(operateFlowData);
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("dataList", list);

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/OperatePatrolController.java

@@ -0,0 +1,67 @@
+package com.bosshand.virgo.api.operate.controller;
+
+import com.bosshand.virgo.api.operate.model.OperatePatrol;
+import com.bosshand.virgo.api.operate.service.OperatePatrolService;
+import com.bosshand.virgo.core.response.Response;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("patrol")
+@Api(tags = {"巡查管理"})
+public class OperatePatrolController {
+
+    @Autowired
+    OperatePatrolService operatePatrolService;
+
+    @ApiOperation(value = "详情", notes = "详情")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Response get(@PathVariable long id) {
+        return Response.ok(operatePatrolService.get(id));
+    }
+
+    @ApiOperation(value = "查询", notes = "查询")
+    @RequestMapping(value = "/{currPage}/{pageSize}", method = RequestMethod.POST)
+    public Response getList(@RequestBody OperatePatrol operatePatrol, @PathVariable int currPage, @PathVariable int pageSize) {
+        List<OperatePatrol> list = operatePatrolService.getListLimit(operatePatrol, currPage, pageSize);
+        int totalCount = operatePatrolService.count(operatePatrol);
+        Map<String, Object> result = new HashMap<String, Object>();
+        result.put("dataList", list);
+        result.put("totalCount", totalCount);
+        return Response.ok(result);
+    }
+
+    @ApiOperation(value = "查询", notes = "查询")
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
+    public Response getList(@RequestBody OperatePatrol operatePatrol) {
+        return Response.ok(operatePatrolService.getList(operatePatrol));
+    }
+
+    @ApiOperation(value = "新增", notes = "新增")
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public Response save(@RequestBody OperatePatrol operatePatrol) {
+        operatePatrolService.save(operatePatrol);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "修改", notes = "修改")
+    @RequestMapping(value = "", method = RequestMethod.PUT)
+    public Response update(@RequestBody OperatePatrol operatePatrol) {
+        operatePatrolService.update(operatePatrol);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "删除", notes = "删除")
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Response delete(@PathVariable long id) {
+        operatePatrolService.delete(id);
+        return Response.ok();
+    }
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/RoamController.java

@@ -0,0 +1,43 @@
+package com.bosshand.virgo.api.operate.controller;
+
+import com.bosshand.virgo.api.operate.model.Roam;
+import com.bosshand.virgo.api.operate.service.RoamService;
+import com.bosshand.virgo.core.response.Response;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("roam")
+@Api(tags = {"bim路径漫游设置"})
+public class RoamController {
+
+    @Autowired
+    RoamService roamService;
+
+    @ApiOperation(value = "获取", notes = "获取")
+    @RequestMapping(value = "/{projectItemId}/{integrateId}", method = RequestMethod.GET)
+    public Response getList(@PathVariable long projectItemId, @PathVariable String integrateId) {
+        return Response.ok(roamService.getList(projectItemId, integrateId));
+    }
+
+    @ApiOperation(value = "保存", notes = "保存")
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public Response save(@RequestBody Roam roam) {
+        return Response.ok(roamService.save(roam));
+    }
+
+    @ApiOperation(value = "更新", notes = "更新")
+    @RequestMapping(value = "", method = RequestMethod.PUT)
+    public Response update(@RequestBody Roam roam) {
+        return Response.ok(roamService.update(roam));
+    }
+
+    @ApiOperation(value = "删除", notes = "删除")
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Response delete(@PathVariable long id) {
+        roamService.delete(id);
+        return Response.ok();
+    }
+}

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

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.api.dao;
+package com.bosshand.virgo.api.operate.dao;
 
-import com.bosshand.virgo.api.model.OperateDevice;
+import com.bosshand.virgo.api.operate.model.OperateDevice;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.api.dao;
+package com.bosshand.virgo.api.operate.dao;
 
-import com.bosshand.virgo.api.model.OperateDeviceEvent;
+import com.bosshand.virgo.api.operate.model.OperateDeviceEvent;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.api.dao;
+package com.bosshand.virgo.api.operate.dao;
 
-import com.bosshand.virgo.api.model.OperateDeviceLevel;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevel;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.api.dao;
+package com.bosshand.virgo.api.operate.dao;
 
-import com.bosshand.virgo.api.model.OperateDeviceLevelModel;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.api.dao;
+package com.bosshand.virgo.api.operate.dao;
 
-import com.bosshand.virgo.api.model.OperateFlowData;
+import com.bosshand.virgo.api.operate.model.OperateFlowData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

virgo.api/src/main/java/com/bosshand/virgo/api/operate/dao/OperatePatrolDao.java

@@ -0,0 +1,27 @@
+package com.bosshand.virgo.api.operate.dao;
+
+import com.bosshand.virgo.api.operate.model.OperatePatrol;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface OperatePatrolDao {
+
+    OperatePatrol get(long id);
+
+    int delete(long id);
+
+    int save(OperatePatrol operatePatrol);
+
+    int update(OperatePatrol operatePatrol);
+
+    int count(@Param(value = "op") OperatePatrol op);
+
+    List<OperatePatrol> getList(@Param(value = "op") OperatePatrol op);
+
+    List<OperatePatrol> getListLimit(@Param(value = "op") OperatePatrol op,
+                                       @Param(value = "currIndex") int currIndex,
+                                       @Param(value = "pageSize") int pageSize);
+}

virgo.api/src/main/java/com/bosshand/virgo/api/operate/dao/RoamDao.java

@@ -0,0 +1,19 @@
+package com.bosshand.virgo.api.operate.dao;
+
+import com.bosshand.virgo.api.operate.model.Roam;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface RoamDao {
+
+    int save(Roam roam);
+
+    int update(Roam roam);
+
+    int delete(long id);
+
+    List<Roam> getList(long projectItemId, String integrateId);
+
+}

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 /**
  *  设备信息

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 /**
  * 设备统计

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.api.model;
+package com.bosshand.virgo.api.operate.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperatePatrol.java

@@ -0,0 +1,185 @@
+package com.bosshand.virgo.api.operate.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 巡查
+ */
+public class OperatePatrol {
+
+    private long id;
+
+    private long projectId;
+
+    private String projectName;
+
+    private long projectItemId;
+
+    private String projectItemName;
+
+    private long projectItemTargetId;
+
+    private String projectItemTargetName;
+
+    private long projectItemTargetRoomId;
+
+    private String projectItemTargetRoomName;
+
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date date;
+
+    private String data;
+
+    private String name;
+
+    private String remark;
+
+    private String attachment;
+
+    private String document;
+
+    private String receiver;
+
+    /**
+     安全、环境、设备、能源
+     */
+    private int type;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public long getProjectItemId() {
+        return projectItemId;
+    }
+
+    public void setProjectItemId(long projectItemId) {
+        this.projectItemId = projectItemId;
+    }
+
+    public String getProjectItemName() {
+        return projectItemName;
+    }
+
+    public void setProjectItemName(String projectItemName) {
+        this.projectItemName = projectItemName;
+    }
+
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public String getProjectItemTargetName() {
+        return projectItemTargetName;
+    }
+
+    public void setProjectItemTargetName(String projectItemTargetName) {
+        this.projectItemTargetName = projectItemTargetName;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
+    public String getProjectItemTargetRoomName() {
+        return projectItemTargetRoomName;
+    }
+
+    public void setProjectItemTargetRoomName(String projectItemTargetRoomName) {
+        this.projectItemTargetRoomName = projectItemTargetRoomName;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getAttachment() {
+        return attachment;
+    }
+
+    public void setAttachment(String attachment) {
+        this.attachment = attachment;
+    }
+
+    public String getDocument() {
+        return document;
+    }
+
+    public void setDocument(String document) {
+        this.document = document;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+}

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/Roam.java

@@ -0,0 +1,64 @@
+package com.bosshand.virgo.api.operate.model;
+
+public class Roam {
+
+    private long id;
+
+    private long projectItemId;
+
+    private String integrateId;
+
+    private String roamName;
+
+    private String roamTime;
+
+    private String roamNode;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getProjectItemId() {
+        return projectItemId;
+    }
+
+    public void setProjectItemId(long projectItemId) {
+        this.projectItemId = projectItemId;
+    }
+
+    public String getIntegrateId() {
+        return integrateId;
+    }
+
+    public void setIntegrateId(String integrateId) {
+        this.integrateId = integrateId;
+    }
+
+    public String getRoamName() {
+        return roamName;
+    }
+
+    public void setRoamName(String roamName) {
+        this.roamName = roamName;
+    }
+
+    public String getRoamTime() {
+        return roamTime;
+    }
+
+    public void setRoamTime(String roamTime) {
+        this.roamTime = roamTime;
+    }
+
+    public String getRoamNode() {
+        return roamNode;
+    }
+
+    public void setRoamNode(String roamNode) {
+        this.roamNode = roamNode;
+    }
+}

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

@@ -1,7 +1,7 @@
-package com.bosshand.virgo.api.service;
+package com.bosshand.virgo.api.operate.service;
 
-import com.bosshand.virgo.api.dao.OperateDeviceEventDao;
-import com.bosshand.virgo.api.model.OperateDeviceEvent;
+import com.bosshand.virgo.api.operate.dao.OperateDeviceEventDao;
+import com.bosshand.virgo.api.operate.model.OperateDeviceEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,7 +1,7 @@
-package com.bosshand.virgo.api.service;
+package com.bosshand.virgo.api.operate.service;
 
-import com.bosshand.virgo.api.dao.OperateDeviceLevelModelDao;
-import com.bosshand.virgo.api.model.OperateDeviceLevelModel;
+import com.bosshand.virgo.api.operate.dao.OperateDeviceLevelModelDao;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,8 +1,8 @@
-package com.bosshand.virgo.api.service;
+package com.bosshand.virgo.api.operate.service;
 
-import com.bosshand.virgo.api.dao.OperateDeviceLevelDao;
-import com.bosshand.virgo.api.model.OperateDeviceLevel;
-import com.bosshand.virgo.api.model.OperateDeviceLevelModel;
+import com.bosshand.virgo.api.operate.dao.OperateDeviceLevelDao;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevel;
+import com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,10 +1,10 @@
-package com.bosshand.virgo.api.service;
+package com.bosshand.virgo.api.operate.service;
 
-import com.bosshand.virgo.api.dao.OperateDeviceDao;
-import com.bosshand.virgo.api.dao.OperateDeviceEventDao;
-import com.bosshand.virgo.api.model.OperateDevice;
-import com.bosshand.virgo.api.model.OperateDeviceCountState;
-import com.bosshand.virgo.api.model.OperateDeviceEvent;
+import com.bosshand.virgo.api.operate.dao.OperateDeviceDao;
+import com.bosshand.virgo.api.operate.dao.OperateDeviceEventDao;
+import com.bosshand.virgo.api.operate.model.OperateDevice;
+import com.bosshand.virgo.api.operate.model.OperateDeviceCountState;
+import com.bosshand.virgo.api.operate.model.OperateDeviceEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,8 +1,8 @@
-package com.bosshand.virgo.api.service;
+package com.bosshand.virgo.api.operate.service;
 
 import com.alibaba.fastjson.JSON;
-import com.bosshand.virgo.api.dao.OperateFlowDataDao;
-import com.bosshand.virgo.api.model.OperateFlowData;
+import com.bosshand.virgo.api.operate.dao.OperateFlowDataDao;
+import com.bosshand.virgo.api.operate.model.OperateFlowData;
 import com.bosshand.virgo.core.model.MgrUser;
 import com.bosshand.virgo.core.utils.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;

virgo.api/src/main/java/com/bosshand/virgo/api/operate/service/OperatePatrolService.java

@@ -0,0 +1,43 @@
+package com.bosshand.virgo.api.operate.service;
+
+import com.bosshand.virgo.api.operate.dao.OperatePatrolDao;
+import com.bosshand.virgo.api.operate.model.OperatePatrol;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OperatePatrolService {
+
+    @Autowired
+    OperatePatrolDao operatePatrolDao;
+
+    public OperatePatrol get(long id){
+        return operatePatrolDao.get(id);
+    }
+
+    public int delete(long id){
+        return operatePatrolDao.delete(id);
+    }
+
+    public int save(OperatePatrol operatePatrol){
+        return operatePatrolDao.save(operatePatrol);
+    }
+
+    public int update(OperatePatrol operatePatrol){
+        return operatePatrolDao.update(operatePatrol);
+    }
+
+    public int count(OperatePatrol operatePatrol){
+        return operatePatrolDao.count(operatePatrol);
+    }
+
+    public List<OperatePatrol> getListLimit(OperatePatrol operatePatrol, int currPage, int pageSize){
+        return operatePatrolDao.getListLimit(operatePatrol,(currPage - 1) * pageSize,pageSize);
+    }
+
+    public List<OperatePatrol> getList(OperatePatrol operatePatrol) {
+        return operatePatrolDao.getList(operatePatrol);
+    }
+}

virgo.api/src/main/java/com/bosshand/virgo/api/operate/service/RoamService.java

@@ -0,0 +1,35 @@
+package com.bosshand.virgo.api.operate.service;
+
+
+import com.bosshand.virgo.api.operate.dao.RoamDao;
+import com.bosshand.virgo.api.operate.model.Roam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class RoamService {
+
+    @Autowired
+    RoamDao roamDao;
+
+    public Roam save(Roam roam) {
+        roamDao.save(roam);
+        return roam;
+    }
+
+    public Roam update(Roam roam) {
+        roamDao.update(roam);
+        return roam;
+    }
+
+    public int delete(long id) {
+        return roamDao.delete(id);
+    }
+
+    public List<Roam> getList(long projectItemId, String integrateId) {
+        return roamDao.getList(projectItemId, integrateId);
+    }
+
+}

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

@@ -2,9 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.OperateDeviceEventDao">
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateDeviceEventDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.OperateDeviceEvent" id="OperateDeviceEventResult" >
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateDeviceEvent" id="OperateDeviceEventResult" >
         <id column="id" property="id"/>
         <result column="deviceId" property="deviceId"/>
         <result column="title" property="title"/>
@@ -39,11 +39,11 @@
         </where>
     </select>
 
-    <insert id="save" parameterType="com.bosshand.virgo.api.model.OperateDeviceEvent" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceEvent" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device_event(deviceId, title, content, remark, attachment, type, date) values(#{deviceId}, #{title}, #{content}, #{remark}, #{attachment}, #{type}, now())
     </insert>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.OperateDeviceEvent">
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceEvent">
         UPDATE operate_device_event
         <trim prefix="set" suffixOverrides=",">
             <if test="deviceId!=0">deviceId=#{deviceId},</if>

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

@@ -2,9 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.OperateDeviceLevelDao">
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateDeviceLevelDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.OperateDeviceLevel" id="OperateDeviceLevelResult" >
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateDeviceLevel" id="OperateDeviceLevelResult" >
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="operateOrganizationId" property="operateOrganizationId"/>
@@ -13,7 +13,7 @@
         <result column="remark" property="remark"/>
         <result column="sign" property="sign"/>
         <result column="isp" property="isp"/>
-        <collection property="deviceList" ofType="com.bosshand.virgo.api.model.OperateDevice" resultMap="com.bosshand.virgo.api.dao.OperateDeviceDao.OperateDeviceResult" columnPrefix="operateDevice_"/>
+        <collection property="deviceList" ofType="com.bosshand.virgo.api.operate.model.OperateDevice" resultMap="com.bosshand.virgo.api.operate.dao.OperateDeviceDao.OperateDeviceResult" columnPrefix="operateDevice_"/>
     </resultMap>
 
     <sql id="query">
@@ -61,12 +61,12 @@
         where odl.operateOrganizationId = #{operateOrganizationId} and odl.projectId = #{projectId} and odl.parentId = -1
     </select>
 
-    <insert id="save" parameterType="com.bosshand.virgo.api.model.OperateDeviceLevel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceLevel" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device_level(name, operateOrganizationId, projectId, parentId, remark, sign, isp)
         values(#{name}, #{operateOrganizationId}, #{projectId}, #{parentId}, #{remark}, #{sign}, #{isp})
     </insert>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.OperateDeviceLevel">
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceLevel">
         UPDATE operate_device_level
         <trim prefix="set" suffixOverrides=",">
             <if test="name!=null">name=#{name},</if>

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

@@ -2,9 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.OperateDeviceLevelModelDao">
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateDeviceLevelModelDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.OperateDeviceLevelModel" id="OperateDeviceLevelModelResult" >
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel" id="OperateDeviceLevelModelResult" >
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="parentId" property="parentId"/>
@@ -21,11 +21,11 @@
         select * from operate_device_level_model where parentId = -1
     </select>
 
-    <insert id="save" parameterType="com.bosshand.virgo.api.model.OperateDeviceLevelModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device_level_model(name, parentId, remark, sign, isp) values(#{name}, #{parentId}, #{remark}, #{sign}, #{isp})
     </insert>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.OperateDeviceLevelModel">
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceLevelModel">
         UPDATE operate_device_level_model
         <trim prefix="set" suffixOverrides=",">
             <if test="name!=null">name=#{name},</if>

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

@@ -2,9 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.OperateDeviceDao">
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateDeviceDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.OperateDevice" id="OperateDeviceResult" >
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateDevice" id="OperateDeviceResult" >
         <id column="id" property="id"/>
         <result column="operateDeviceLevelId" property="operateDeviceLevelId"/>
         <result column="projectId" property="projectId"/>
@@ -51,7 +51,7 @@
         </where>
     </select>
 
-    <select id="getTotalCount" parameterType="com.bosshand.virgo.api.model.OperateDevice" resultType="Integer">
+    <select id="getTotalCount" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice" resultType="Integer">
         SELECT count(*) FROM operate_device
         <where>
             <if test="id!=0">and id=#{id}</if>
@@ -96,14 +96,14 @@
         limit #{currIndex} , #{pageSize}
     </select>
 
-    <insert id="save" parameterType="com.bosshand.virgo.api.model.OperateDevice" useGeneratedKeys="true" keyProperty="id">
+    <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device(operateDeviceLevelId, projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, name, type, designNumber, assetNumber, deviceNumber,
                                    deviceBrand, deviceModel, deviceSerialNumber, attachment, remark, document, state)
         values(#{operateDeviceLevelId}, #{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{name}, #{type}, #{designNumber},
                #{assetNumber}, #{deviceNumber}, #{deviceBrand}, #{deviceModel}, #{deviceSerialNumber}, #{attachment}, #{remark}, #{document}, #{state})
     </insert>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.OperateDevice">
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice">
         UPDATE operate_device
         <trim prefix="set" suffixOverrides=",">
             <if test="operateDeviceLevelId!=0">operateDeviceLevelId=#{operateDeviceLevelId},</if>

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

@@ -2,9 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.api.dao.OperateFlowDataDao">
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateFlowDataDao">
 
-    <resultMap type="com.bosshand.virgo.api.model.OperateFlowData" id="operateFlowDataResult">
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateFlowData" id="operateFlowDataResult">
         <id column="id" property="id" />
         <result column="projectId" property="projectId" />
         <result column="projectItemId" property="projectItemId" />
@@ -128,7 +128,7 @@
         DELETE FROM operate_flow_data WHERE id=#{id}
     </delete>
 
-    <update id="update" parameterType="com.bosshand.virgo.api.model.OperateFlowData">
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateFlowData">
         UPDATE operate_flow_data
         <trim prefix="set" suffixOverrides=",">
             <if test="projectId!=0">projectId=#{projectId},</if>

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

@@ -0,0 +1,139 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.opg//DTD Mapper 3.0//EN"
+        "http://mybatis.opg/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperatePatrolDao">
+
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperatePatrol" id="operatePatrolResult">
+        <id column="id" property="id" />
+        <result column="projectId" property="projectId" />
+        <result column="projectItemId" property="projectItemId" />
+        <result column="projectItemTargetId" property="projectItemTargetId" />
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId" />
+        <result column="name" property="name" />
+        <result column="date" property="date" />
+        <result column="type" property="type" />
+        <result column="remark" property="remark" />
+        <result column="attachment" property="attachment" />
+        <result column="document" property="document" />
+        <result column="receiver" property="receiver" />
+        <result column="data" property="data" />
+    </resultMap>
+
+    <select id="get" resultMap="operatePatrolResult">
+        SELECT * FROM operate_patrol where id = #{id}
+    </select>
+
+    <select id="getList" resultMap="operatePatrolResult">
+        SELECT * FROM operate_patrol
+        <where>
+            <if test="op.id != 0">
+                and id = #{op.id}
+            </if>
+            <if test="op.projectId != 0">
+                and projectId = #{op.projectId}
+            </if>
+            <if test="op.projectItemId != 0">
+                and projectItemId = #{op.projectItemId}
+            </if>
+            <if test="op.projectItemTargetId != 0">
+                and projectItemTargetId = #{op.projectItemTargetId}
+            </if>
+            <if test="op.projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{op.projectItemTargetRoomId}
+            </if>
+            <if test="op.name != null">
+                and name = #{op.name}
+            </if>
+            <if test="op.type != 0">
+                and type = #{op.type}
+            </if>
+        </where>
+        order by date desc
+    </select>
+
+    <select id="getListLimit" resultMap="operatePatrolResult">
+        SELECT * FROM operate_patrol
+        <where>
+            <if test="op.id != 0">
+                and id = #{op.id}
+            </if>
+            <if test="op.projectId != 0">
+                and projectId = #{op.projectId}
+            </if>
+            <if test="op.projectItemId != 0">
+                and projectItemId = #{op.projectItemId}
+            </if>
+            <if test="op.projectItemTargetId != 0">
+                and projectItemTargetId = #{op.projectItemTargetId}
+            </if>
+            <if test="op.projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{op.projectItemTargetRoomId}
+            </if>
+            <if test="op.name != null">
+                and name = #{op.name}
+            </if>
+            <if test="op.type != 0">
+                and type = #{op.type}
+            </if>
+        </where>
+        order by date desc
+        limit #{currIndex} , #{pageSize}
+    </select>
+
+    <select id="count" parameterType="map" resultType="Integer">
+        SELECT count(*) FROM operate_patrol
+        <where>
+            <if test="op.id != 0">
+                and id = #{op.id}
+            </if>
+            <if test="op.projectId != 0">
+                and projectId = #{op.projectId}
+            </if>
+            <if test="op.projectItemId != 0">
+                and projectItemId = #{op.projectItemId}
+            </if>
+            <if test="op.projectItemTargetId != 0">
+                and projectItemTargetId = #{op.projectItemTargetId}
+            </if>
+            <if test="op.projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{op.projectItemTargetRoomId}
+            </if>
+            <if test="op.name != null">
+                and name = #{op.name}
+            </if>
+            <if test="op.type != 0">
+                and type = #{op.type}
+            </if>
+        </where>
+
+    </select>
+
+    <insert id="save" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO operate_patrol(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, date, data, name, remark, attachment, document, receiver, type)
+        VALUES (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, now(), #{data}, #{name}, #{remark}, #{attachment}, #{document}, #{receiver}, #{type})
+    </insert>
+
+    <delete id="delete">
+        DELETE FROM operate_patrol WHERE id=#{id}
+    </delete>
+
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperatePatrol">
+        UPDATE operate_patrol
+        <trim prefix="set" suffixOverrides=",">
+            <if test="projectId!=0">projectId=#{projectId},</if>
+            <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
+            <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
+            <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
+            <if test="type!=0">type=#{type},</if>
+            <if test="name!=null">name=#{name},</if>
+            <if test="remark!=null">remark=#{remark},</if>
+            <if test="attachment!=null">attachment=#{attachment},</if>
+            <if test="document!=null">document=#{document},</if>
+            <if test="receiver!=null">receiver=#{receiver},</if>
+            <if test="data!=null">data=#{data},</if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+</mapper>