合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -841,7 +841,7 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
 
-        if (null != user.getUserVerifyId()) {
+        if (null != user.getUserVerifyId() && null != user.getCommunityId()) {
             TaUserVO userVO = new TaUserVO();
             // 根据用户id, 获取 用户的住址, 人脸是否认证, 角色
             userSetUp(user, userVO);

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TpEquipmentTreeMapper.java

@@ -0,0 +1,19 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TpEquipmentTree;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TpEquipmentTreeMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TpEquipmentTree record);
+
+    int insertSelective(TpEquipmentTree record);
+
+    TpEquipmentTree selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TpEquipmentTree record);
+
+    int updateByPrimaryKey(TpEquipmentTree record);
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TpEquipmentTree.java

@@ -0,0 +1,95 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TpEquipmentTree {
+    private Integer id;
+
+    private Integer communityId;
+
+    private String equipmentName;
+
+    private Integer pid;
+
+    private Integer sort;
+
+    private Date createTime;
+
+    private Integer createUser;
+
+    private Date updateTime;
+
+    private Integer updateUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getEquipmentName() {
+        return equipmentName;
+    }
+
+    public void setEquipmentName(String equipmentName) {
+        this.equipmentName = equipmentName == null ? null : equipmentName.trim();
+    }
+
+    public Integer getPid() {
+        return pid;
+    }
+
+    public void setPid(Integer pid) {
+        this.pid = pid;
+    }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -38,6 +38,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 
 	@Autowired
 	private TpCarouselSettingMapper tpCarouselSettingMapper;
+
+	@Autowired
+	private TpEquipmentTreeMapper tpEquipmentTreeMapper;
 	
 	/**
 	 * 分页获取小区列表
@@ -82,9 +85,28 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		addAppMenu(toCommunities.getId());
 		// 默认创建 banner轮播数  3
 		addBannerNum(toCommunities.getId(), 3);
+		// 创建默认的设备树
+		addEquipmentTree(toCommunities.getId(), toCommunities.getCommunityName(), tpUser.getId());
 		return size;
 	}
 
+	/**
+	 * 创建默认的设备树
+	 * @param communityId
+	 * @param communityName
+	 */
+	private void addEquipmentTree(Integer communityId, String communityName, Integer userId) {
+		TpEquipmentTree tpEquipmentTree = new TpEquipmentTree();
+		tpEquipmentTree.setCommunityId(communityId);
+		tpEquipmentTree.setEquipmentName(communityName);
+		tpEquipmentTree.setPid(0);
+		tpEquipmentTree.setSort(0);
+		tpEquipmentTree.setCreateTime(new Date());
+		tpEquipmentTree.setCreateUser(userId);
+
+		tpEquipmentTreeMapper.insertSelective(tpEquipmentTree);
+	}
+
 	/**
 	 * 创建 banner轮播数
 	 * @param communityId

CODE/smart-community/operate-api/src/main/resources/mapper/TpEquipmentTreeMapper.xml

@@ -0,0 +1,142 @@
+<?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.community.huiju.dao.TpEquipmentTreeMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TpEquipmentTree" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="equipment_name" property="equipmentName" jdbcType="VARCHAR" />
+    <result column="pid" property="pid" jdbcType="INTEGER" />
+    <result column="sort" property="sort" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, equipment_name, pid, sort, create_time, create_user, update_time, 
+    update_user
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tp_equipment_tree
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from tp_equipment_tree
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TpEquipmentTree" >
+    insert into tp_equipment_tree (id, community_id, equipment_name, 
+      pid, sort, create_time, 
+      create_user, update_time, update_user
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{equipmentName,jdbcType=VARCHAR}, 
+      #{pid,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createUser,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TpEquipmentTree" >
+    insert into tp_equipment_tree
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="equipmentName != null" >
+        equipment_name,
+      </if>
+      <if test="pid != null" >
+        pid,
+      </if>
+      <if test="sort != null" >
+        sort,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentName != null" >
+        #{equipmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null" >
+        #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpEquipmentTree" >
+    update tp_equipment_tree
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentName != null" >
+        equipment_name = #{equipmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null" >
+        pid = #{pid,jdbcType=INTEGER},
+      </if>
+      <if test="sort != null" >
+        sort = #{sort,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TpEquipmentTree" >
+    update tp_equipment_tree
+    set community_id = #{communityId,jdbcType=INTEGER},
+      equipment_name = #{equipmentName,jdbcType=VARCHAR},
+      pid = #{pid,jdbcType=INTEGER},
+      sort = #{sort,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TpConfiguration.java

@@ -1,6 +1,7 @@
 package com.community.huiju.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -32,6 +33,7 @@ public class TpConfiguration implements Serializable {
     /**
      * 配置key
      */
+    @TableField(value = "`key`")
     private String key;
 
     /**

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpEquipmentServiceImpl.java

@@ -14,6 +14,7 @@ import com.community.huiju.model.TpEquipmentTree;
 import com.community.huiju.service.ITpEquipmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -47,6 +48,7 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean saveOrUpdateMonitoring(String parameter, UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -57,7 +59,7 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
 
         List<TpEquipment> tpEquipments = JSONObject.parseArray(parameter, TpEquipment.class);
         for (int i = 0; i < tpEquipments.size(); i++){
-            TpEquipment equipment = tpEquipments.get(0);
+            TpEquipment equipment = tpEquipments.get(i);
             Integer id = equipment.getId();
             if (null == id) {
                 // 监控地址
@@ -85,13 +87,21 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
                 equipment.setSecurityRoomTelId(tpConfigurationSecurityRoomTel.getId());
                 equipment.setEquipmentType("1");
                 equipment.setEquipmentTreeId(tpEquipmentTree.getId());
+                equipment.setCreateTime(LocalDateTime.now());
+                equipment.setCreateUser(userElement.getId());
+                equipment.setCommunityId(userElement.getCommunityId());
 
                 tpEquipmentMapper.insert(equipment);
             } else {
+                updateConfiguration(equipment.getAddress(), equipment.getAddressId());
+                updateConfiguration(equipment.getUrl(), equipment.getUrlId());
+                updateConfiguration(equipment.getSecurityGuardTel(), equipment.getSecurityGuardTelId());
+                updateConfiguration(equipment.getSecurityRoomTel(), equipment.getSecurityGuardTelId());
                 tpEquipmentMapper.updateById(equipment);
             }
         }
 
+        responseBean.addSuccess("操作成功！");
         return responseBean;
     }
 
@@ -116,4 +126,17 @@ public class TpEquipmentServiceImpl extends ServiceImpl<TpEquipmentMapper, TpEqu
 
         return tpConfiguration;
     }
+
+    /**
+     * 根据id更新 设备配置表的值
+     * @param value
+     * @param configurationId
+     */
+    public void updateConfiguration(String value, Integer configurationId) {
+        QueryWrapper<TpConfiguration> configurationQueryWrapper = new QueryWrapper<>();
+        configurationQueryWrapper.eq("id", configurationId);
+        TpConfiguration tpConfiguration = tpConfigurationMapper.selectOne(configurationQueryWrapper);
+        tpConfiguration.setConfigurationValue(value);
+        tpConfigurationMapper.updateById(tpConfiguration);
+    }
 }

VUECODE/smart-property-manage/src/api/equipment.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+// 查询设备列表
 export function getAll(data) {
   return request({
     url: '/equipment',
@@ -10,3 +11,12 @@ export function getAll(data) {
   })
 }
 
+// 提交设备数据，进行保存
+export function equipmentMonitoring(data) {
+  return request({
+    url: '/equipment/monitoring',
+    method: 'post',
+    data
+  })
+}
+

VUECODE/smart-property-manage/src/store/modules/equipment.js

@@ -1,4 +1,4 @@
-import { getAll } from '@/api/equipment'
+import { getAll, equipmentMonitoring } from '@/api/equipment'
 
 const equipment = {
   state: {
@@ -16,6 +16,15 @@ const equipment = {
           reject(error)
         })
       })
+    },
+    EquipmentMonitoring({ commit }, data) { // 提交设备数据
+      return new Promise((resolve, reject) => {
+        equipmentMonitoring(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -212,6 +212,15 @@ export default {
     },
     monitoringSubmit() { // 监控提交
       console.log('monitoringForm : ', this.equipmentList)
+      this.$store.dispatch('EquipmentMonitoring', this.equipmentList).then((res) => {
+        if (res.code === '0') {
+          this.$message.success(res.message)
+          // 监控
+          this.equipmentGetAll()
+        }
+      }).catch(() => {
+        console.log('EquipmentMonitoring error')
+      })
     },
     monitoringRemover(id, equipmentIndex) { // 监控删除
       // console.log('monitoringForm : ', this.equipmentList, '  下坐标：', index)