fix

virgo.api/src/main/java/com/bosshand/virgo/api/test/controller/TestCont.java

@@ -384,6 +384,50 @@ public class TestCont {
         return Response.ok(testService.saveAir(air));
     }
 
+    //--------------------------------------------供配电和电梯机房---------------------------------------------------------
+
+
+    @ApiOperation("供配电和电梯机房-获取")
+    @RequestMapping(value = "/powerDistributionMachine/get", method = RequestMethod.POST)
+    public Response get(@RequestBody PowerDistributionMachine data) {
+        List<PowerDistributionMachine> powerDistributionMachines = testService.get(data);
+        if (powerDistributionMachines.size() > 0) {
+            for (PowerDistributionMachine r : powerDistributionMachines) {
+                r.setProjectName(r.getProjectId() != 0 ? projectItemTargetRoomService.getProject(r.getProjectId()).getName() : null);
+                r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
+                r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
+                r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
+            }
+        }
+        return Response.ok(powerDistributionMachines);
+    }
+
+    @ApiOperation("供配电和电梯机房-保存")
+    @RequestMapping(value = "/powerDistributionMachine/save", method = RequestMethod.POST)
+    public Response save(@RequestBody PowerDistributionMachine data) {
+        return Response.ok(testService.save(data));
+    }
+
+    @ApiOperation("供配电和电梯机房-更新")
+    @RequestMapping(value = "/powerDistributionMachine/update", method = RequestMethod.PUT)
+    public Response update(@RequestBody PowerDistributionMachine data) {
+        testService.update(data);
+        return Response.ok();
+    }
+
+    @ApiOperation("供配电和电梯机房-详情")
+    @RequestMapping(value = "/powerDistributionMachine/{id}", method = RequestMethod.GET)
+    public Response getPowerDistributionMachine(@PathVariable long id) {
+        PowerDistributionMachine r = testService.getPowerDistributionMachine(id);
+        if (r != null) {
+            r.setProjectName(r.getProjectId() != 0 ? projectItemTargetRoomService.getProject(r.getProjectId()).getName() : null);
+            r.setProjectItemName(r.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(r.getProjectItemId()).getName() : null);
+            r.setProjectItemTargetName(r.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(r.getProjectItemTargetId()).getName() : null);
+            r.setProjectItemTargetRoomName(r.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(r.getProjectItemTargetRoomId()).getName() : null);
+        }
+        return Response.ok(r);
+    }
+
     //-----------------------------------------------------------------------------------------------------
 
     @ApiOperation("用能分析获取")

virgo.api/src/main/java/com/bosshand/virgo/api/test/dao/PowerDistributionMachineDao.java

@@ -0,0 +1,19 @@
+package com.bosshand.virgo.api.test.dao;
+
+import com.bosshand.virgo.api.test.model.PowerDistributionMachine;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PowerDistributionMachineDao {
+
+    List<PowerDistributionMachine> get(PowerDistributionMachine data);
+
+    int save(PowerDistributionMachine data);
+
+    int update(PowerDistributionMachine data);
+
+    PowerDistributionMachine getInfo(long id);
+
+}

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/PowerDistributionMachine.java

@@ -0,0 +1,183 @@
+package com.bosshand.virgo.api.test.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 模拟供配电和电梯机房
+ */
+public class PowerDistributionMachine {
+
+    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;
+
+    /**
+     * 类型
+     */
+    private int type;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 日期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String date;
+    /**
+     * 数据
+     */
+    private String data;
+    /**
+     * 状态
+     */
+    private Integer state;
+
+    private String column1;
+
+    private String column2;
+
+    private String column3;
+
+    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 int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getColumn1() {
+        return column1;
+    }
+
+    public void setColumn1(String column1) {
+        this.column1 = column1;
+    }
+
+    public String getColumn2() {
+        return column2;
+    }
+
+    public void setColumn2(String column2) {
+        this.column2 = column2;
+    }
+
+    public String getColumn3() {
+        return column3;
+    }
+
+    public void setColumn3(String column3) {
+        this.column3 = column3;
+    }
+}

virgo.api/src/main/java/com/bosshand/virgo/api/test/service/TestService.java

@@ -76,6 +76,9 @@ public class TestService {
     @Autowired
     FireFightingLevelDao fireFightingLevelDao;
 
+    @Autowired
+    PowerDistributionMachineDao powerDistributionMachineDao;
+
     private static Logger logger = LoggerFactory.getLogger(TestService.class);
 
     public List<AccessControl> get(AccessControl data) {
@@ -555,5 +558,23 @@ public class TestService {
         return data;
     }
 
+    public List<PowerDistributionMachine> get(PowerDistributionMachine data) {
+        return powerDistributionMachineDao.get(data);
+    }
+
+    public PowerDistributionMachine save(PowerDistributionMachine data) {
+        powerDistributionMachineDao.save(data);
+        return data;
+    }
+
+    public PowerDistributionMachine update(PowerDistributionMachine data) {
+        powerDistributionMachineDao.update(data);
+        return data;
+    }
+
+    public PowerDistributionMachine getPowerDistributionMachine(long id) {
+        return powerDistributionMachineDao.getInfo(id);
+    }
+
 
 }

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

@@ -0,0 +1,100 @@
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bosshand.virgo.api.test.dao.PowerDistributionMachineDao">
+
+    <resultMap type="com.bosshand.virgo.api.test.model.PowerDistributionMachine" id="result" >
+        <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="type" property="type"/>
+        <result column="date" property="date"/>
+        <result column="data" property="data"/>
+        <result column="state" property="state"/>
+        <result column="column1" property="column1"/>
+        <result column="column2" property="column2"/>
+        <result column="column3" property="column3"/>
+    </resultMap>
+
+    <select id="get" resultMap="result">
+        SELECT * FROM test_s
+        <where>
+            <if test="projectId != 0">
+                and projectId = #{projectId}
+            </if>
+            <if test="projectItemId != 0">
+                and projectItemId = #{projectItemId}
+            </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
+            <if test="name != null">
+                and name = #{name}
+            </if>
+            <if test="type != 0">
+                and type = #{type}
+            </if>
+            <if test="date != null">
+                and date like concat('%',#{date},'%')
+            </if>
+        </where>
+        order by date desc
+    </select>
+
+    <select id="getInfo" resultMap="result">
+     SELECT * FROM test_s where id =#{id}
+    </select>
+
+    <insert id="save" parameterType="com.bosshand.virgo.api.test.model.PowerDistributionMachine" useGeneratedKeys="true" keyProperty="id">
+        INSERT into test_s(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, name, type, date, data,state, column1, column2, column3)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{name}, #{type}, now(), #{data}, #{state}, #{column1}, #{column2}, #{column3})
+    </insert>
+
+    <update id="update" parameterType="com.bosshand.virgo.api.test.model.PowerDistributionMachine">
+        UPDATE test_s
+        <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="name != null">
+                 name = #{name},
+            </if>
+            <if test="type != 0">
+                type = #{type},
+            </if>
+            <if test="data != null">
+                data = #{data},
+            </if>
+            <if test="state != null">
+                state = #{state},
+            </if>
+            <if test="column1 != null">
+                column1 = #{column1},
+            </if>
+            <if test="column2 != null">
+                column2 = #{column2},
+            </if>
+            <if test="column3 != null">
+                column3 = #{column3},
+            </if>
+        </trim>
+        WHERE id=#{id}
+    </update>
+
+</mapper>