Browse Source

设备信息

lin 4 years ago
parent
commit
9c25c18efd

+ 45 - 8
zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -257,8 +257,34 @@
   <select id="findById" resultMap="BaseResultMap">
   <select id="findById" resultMap="BaseResultMap">
   select <include refid="Base_Column_List"/> from rmcp_device where status = 1 and id = #{id}
   select <include refid="Base_Column_List"/> from rmcp_device where status = 1 and id = #{id}
   </select>
   </select>
-  <sql id="">
-
+  <sql id="permissionCondition">
+    <if test="condition.userType!=null and condition.userType!=-999 and condition.userType!=-9999 and  condition.programItems != null and condition.programItems.size() > 0">
+      <if test="condition.permissionType == 5 or condition.permissionType == 2">
+        and ( rd.dept_org_id in
+        <foreach collection="condition.programItems" item="item" open="(" close=")" separator=",">
+          #{item.orgId}
+        </foreach>
+        or
+        rd.company_org_id in
+        <foreach collection="condition.programItems" item="item" open="(" close=")" separator=",">
+          #{item.orgId}
+        </foreach>
+        )
+      </if>
+      <if test="condition.permissionType == 4 or condition.permissionType == 3">
+        and rd.dept_org_id in
+        <foreach collection="condition.programItems" item="item" open="(" close=")" separator=",">
+          #{item.orgId}
+        </foreach>
+      </if>
+      <if test="condition.permissionType == 1">
+        and rd.company_org_id in
+        <foreach collection="condition.programItems" item="item" open="(" close=")" separator=",">
+          #{item.orgId}
+        </foreach>
+        and (rd.dept_org_id is null or rd.dept_org_id =0)
+      </if>
+    </if>
   </sql>
   </sql>
 
 
   <select id="findList" resultType="com.zcxk.rmcp.api.vo.DeviceVo">
   <select id="findList" resultType="com.zcxk.rmcp.api.vo.DeviceVo">
@@ -276,18 +302,29 @@
     rp.product_name,
     rp.product_name,
     rp.product_model,
     rp.product_model,
     rm.name as manufacturer_name,
     rm.name as manufacturer_name,
-    uoc.ORG_NAME as company_name,
-    uod.ORG_NAME as dept_name,
+    roc.ORG_NAME as company_name,
+    rod.ORG_NAME as dept_name,
     rc.name as community_name
     rc.name as community_name
     from rmcp_device rd
     from rmcp_device rd
     left join rmcp_product rp on (rp.id = rd.product_id)
     left join rmcp_product rp on (rp.id = rd.product_id)
     left join rmcp_manufacturer rm on (rm.id = rp.manufacturer_id)
     left join rmcp_manufacturer rm on (rm.id = rp.manufacturer_id)
-    left join uims_org uoc on (uoc.ID = rd.company_org_id)
-    left join uims_org uod on (uod.ID = rd.dept_org_id)
-
+    left join rmcp_org roc on (roc.ID = rd.company_org_id)
+    left join rmcp_org rod on (rod.ID = rd.dept_org_id)
     left join rmcp_community rc on (rc.id = rd.community_id)
     left join rmcp_community rc on (rc.id = rd.community_id)
-
     where rd.status = 1
     where rd.status = 1
+    <if test="condition.tenantId != null">and rd.tenant_id = #{condition.tenantId}</if>
+    <if test="condition.categoryId != null">and rd.category_id = #{condition.categoryId}</if>
+    <if test="condition.productId != null">and rd.product_id = #{condition.productId}</if>
+    <if test="condition.companyOrgId != null">and rd.company_org_id = #{condition.companyOrgId}</if>
+    <if test="condition.deptOrgId != null">and rd.dept_org_id = #{condition.deptOrgId}</if>
+    <if test="condition.communityId != null">and rd.community_id = #{condition.communityId}</if>
+    <if test="condition.deviceNo != null and condition.deviceNo != ''">and (rd.device_no LIKE concat('%',#{condition.deviceNo},'%') or rd.meter_no LIKE concat('%',#{condition.deviceNo},'%') )</if>
+    <if test="condition.address != null and condition.address != ''">and rd.address LIKE concat('%',#{condition.address},'%') </if>
+    <if test="condition.deviceStatus != null">and rd.device_status = #{condition.deviceStatus}</if>
+    <if test="condition.valveStatus != null">and rd.valve_status = #{condition.deviceStatus}</if>
+    <if test="condition.startDate != null"> and rd.last_receive_time <![CDATA[ >= ]]> #{condition.startDate}</if>
+    <if test="condition.endDate != null"> and rd.last_receive_time <![CDATA[ <= ]]> #{condition.endDate}</if>
+    <include refid="permissionCondition"/>
   </select>
   </select>
 
 
   <update id="delByIds">
   <update id="delByIds">