fix

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

@@ -0,0 +1,52 @@
+package com.bosshand.virgo.api.operate.controller;
+
+import com.bosshand.virgo.api.operate.model.OperateDeviceModel;
+import com.bosshand.virgo.api.operate.service.OperateDeviceModelService;
+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("operateDeviceModel")
+@Api(tags = {"设备模型"})
+public class OperateDeviceModelController {
+
+    @Autowired
+    OperateDeviceModelService operateDeviceModelService;
+
+    @ApiOperation(value = "详情", notes = "详情")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Response get(@PathVariable long id) {
+        return Response.ok(operateDeviceModelService.get(id));
+    }
+
+    @ApiOperation(value = "新增", notes = "新增")
+    @RequestMapping(value = "", method = RequestMethod.POST)
+    public Response save(@RequestBody OperateDeviceModel data) {
+        operateDeviceModelService.save(data);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "删除", notes = "删除")
+    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
+    public Response delete(@PathVariable long id) {
+        operateDeviceModelService.delete(id);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "编辑", notes = "编辑")
+    @RequestMapping(value = "", method = RequestMethod.PUT)
+    public Response update(@RequestBody OperateDeviceModel data) {
+        operateDeviceModelService.update(data);
+        return Response.ok();
+    }
+
+    @ApiOperation(value = "获取", notes = "获取")
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
+    public Response getList(@RequestBody OperateDeviceModel data) {
+        return Response.ok(operateDeviceModelService.getList(data));
+    }
+
+}

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

@@ -0,0 +1,21 @@
+package com.bosshand.virgo.api.operate.dao;
+
+import com.bosshand.virgo.api.operate.model.OperateDeviceModel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface OperateDeviceModelDao {
+
+    int save(OperateDeviceModel data);
+
+    int delete(long id);
+
+    int update(OperateDeviceModel data);
+
+    List<OperateDeviceModel> getList(OperateDeviceModel data);
+
+    OperateDeviceModel get(long id);
+
+}

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

@@ -23,6 +23,8 @@ public class OperateDeviceLevel {
 
     private int isp;
 
+    private long modelLevelId;
+
     private List<OperateDeviceLevel> children;
 
     private List<OperateDevice> deviceList;
@@ -91,6 +93,14 @@ public class OperateDeviceLevel {
         this.isp = isp;
     }
 
+    public long getModelLevelId() {
+        return modelLevelId;
+    }
+
+    public void setModelLevelId(long modelLevelId) {
+        this.modelLevelId = modelLevelId;
+    }
+
     public List<OperateDeviceLevel> getChildren() {
         return children;
     }

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

@@ -0,0 +1,141 @@
+package com.bosshand.virgo.api.operate.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 设备模型
+ */
+public class OperateDeviceModel {
+
+    private long id;
+
+    /**
+     * 模型名称
+     */
+    private String name;
+    /**
+     * 自定义层级id
+     */
+    private long levelId;
+    /**
+     * 模板层级id
+     */
+    private long modelLevelId;
+    /**
+     * 模型地址
+     */
+    private String address;
+    /**
+     * 类型
+     */
+    private int type;
+    /**
+     * 时间
+     */
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private String date;
+    /**
+     * 上传人id
+     */
+    private long userId;
+    /**
+     * 上传人名称
+     */
+    private String userName;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 预览url
+     */
+    private String previewURL;
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public long getLevelId() {
+        return levelId;
+    }
+
+    public void setLevelId(long levelId) {
+        this.levelId = levelId;
+    }
+
+    public long getModelLevelId() {
+        return modelLevelId;
+    }
+
+    public void setModelLevelId(long modelLevelId) {
+        this.modelLevelId = modelLevelId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getPreviewURL() {
+        return previewURL;
+    }
+
+    public void setPreviewURL(String previewURL) {
+        this.previewURL = previewURL;
+    }
+}

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

@@ -90,6 +90,7 @@ public class OperateDeviceLevelService {
         level.setProjectId(projectId);
         level.setSign(operateDeviceLevelModel.getSign());
         level.setIsp(operateDeviceLevelModel.getIsp());
+        level.setModelLevelId(operateDeviceLevelModel.getId());
         operateDeviceLevelDao.save(level);
         List<OperateDeviceLevelModel> children = operateDeviceLevelModel.getChildren();
         if (children.size() > 0) {

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

@@ -0,0 +1,36 @@
+package com.bosshand.virgo.api.operate.service;
+
+import com.bosshand.virgo.api.operate.dao.OperateDeviceModelDao;
+import com.bosshand.virgo.api.operate.model.OperateDeviceModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OperateDeviceModelService {
+
+    @Autowired
+    OperateDeviceModelDao operateDeviceModelDao;
+
+    public int save(OperateDeviceModel data) {
+        return operateDeviceModelDao.save(data);
+    }
+
+    public int delete(long id) {
+        return operateDeviceModelDao.delete(id);
+    }
+
+    public int update(OperateDeviceModel data) {
+        return operateDeviceModelDao.update(data);
+    }
+
+    public List<OperateDeviceModel> getList(OperateDeviceModel data) {
+        return operateDeviceModelDao.getList(data);
+    }
+
+    public OperateDeviceModel get(long id) {
+        return operateDeviceModelDao.get(id);
+    }
+
+}

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

@@ -13,6 +13,7 @@
         <result column="remark" property="remark"/>
         <result column="sign" property="sign"/>
         <result column="isp" property="isp"/>
+        <result column="modelLevelId" property="modelLevelId"/>
         <collection property="deviceList" ofType="com.bosshand.virgo.api.operate.model.OperateDevice" resultMap="com.bosshand.virgo.api.operate.dao.OperateDeviceDao.OperateDeviceResult" columnPrefix="operateDevice_"/>
     </resultMap>
 
@@ -62,8 +63,8 @@
     </select>
 
     <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 into operate_device_level(name, operateOrganizationId, projectId, parentId, remark, sign, isp, modelLevelId)
+        values(#{name}, #{operateOrganizationId}, #{projectId}, #{parentId}, #{remark}, #{sign}, #{isp}, #{modelLevelId})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceLevel">

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

@@ -0,0 +1,73 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.api.operate.dao.OperateDeviceModelDao">
+
+    <resultMap type="com.bosshand.virgo.api.operate.model.OperateDeviceModel" id="result">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="levelId" property="levelId"/>
+        <result column="modelLevelId" property="modelLevelId"/>
+        <result column="address" property="address"/>
+        <result column="type" property="type"/>
+        <result column="date" property="date"/>
+        <result column="userId" property="userId"/>
+        <result column="userName" property="userName"/>
+        <result column="remark" property="remark"/>
+        <result column="previewURL" property="previewURL"/>
+    </resultMap>
+
+    <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceModel" useGeneratedKeys="true" keyProperty="id">
+        insert into operate_device_model(`name`, `levelId`, `modelLevelId`, `address`, `type`, `date`, `userId`, `remark`, `previewURL`) VALUES
+            (#{name}, #{levelId}, #{modelLevelId}, #{address}, #{type}, now(), #{userId}, #{remark}, #{previewURL})
+    </insert>
+
+    <select id="getList" resultMap="result">
+        SELECT * FROM operate_device_model
+        <where>
+            <if test="id != 0">
+                and id = #{id}
+            </if>
+            <if test="name != null">
+                and name = #{name}
+            </if>
+            <if test="levelId != 0">
+                and levelId = #{levelId}
+            </if>
+            <if test="modelLevelId != 0">
+                and modelLevelId = #{modelLevelId}
+            </if>
+            <if test="type != 0">
+                and type = #{type}
+            </if>
+            <if test="userId != 0">
+                and userId = #{userId}
+            </if>
+        </where>
+    </select>
+
+    <select id="get" resultMap="result">
+        SELECT * FROM operate_device_model where id = #{id}
+    </select>
+
+    <delete id="delete">
+        delete from operate_device_model where id = #{id}
+    </delete>
+
+    <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDeviceModel">
+        update operate_device_model
+        <trim prefix="set" suffixOverrides=",">
+            <if test="name!=null">name=#{name},</if>
+            <if test="levelId!=0">levelId=#{levelId},</if>
+            <if test="modelLevelId!=0">modelLevelId=#{modelLevelId},</if>
+            <if test="address!=null">address=#{address},</if>
+            <if test="type!=0">type=#{type},</if>
+            <if test="userId!=0">userId=#{userId},</if>
+            <if test="remark!=null">remark=#{remark},</if>
+            <if test="previewURL!=null">previewURL=#{previewURL},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+</mapper>