修复 工单bug

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/test/OpenapiTest.java

@@ -180,5 +180,31 @@ class OpenapiTest {
         
         return data;
 	}
-	
+
+
+
+	/**
+	 * HTTPS方式
+	 * 分页获取监控点信息 测试
+	 * @return
+	 * @throws Exception
+	 */
+	private static String testGetDoorEventsHistory() throws Exception{
+		String url = OPENAPI_IP_PORT_HTTPS + "/openapi/service/acs/event/getDoorEventsHistory";
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("appkey", APPKEY);//设置APPKEY
+		map.put("time", System.currentTimeMillis());//设置时间参数
+		map.put("pageNo", 1);//设置分页参数
+		map.put("pageSize", 5);//设置分页参数
+		map.put("opUserUuid", OP_USER_UUID);//设置操作用户UUID
+		String params = JSON.toJSONString(map);
+		System.out.println(" ====== getCameras请求参数：【" + params + "】");
+		String data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, null, SECRET), params);
+		System.out.println(" ====== getCameras请求返回结果：【{" + data + "}】");
+
+		return data;
+	}
+
+
+
 }

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

@@ -11,6 +11,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import com.sun.org.apache.bcel.internal.generic.NEW;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -386,20 +387,23 @@ public class SocialServiceImpl implements SocialServiceI {
     public ResponseBean updateTransaction(String paramets,Integer userId,Integer id) {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
-        String transactionTitle = (String) jsonObject.get("transactionTitle");
-        String transactionContent = (String) jsonObject.get("transactionContent");
         String imageUrl = (String) jsonObject.get("imageUrl");
+
         TpTransaction tpTransaction = JSONObject.parseObject(paramets, TpTransaction.class);
-        TpTransaction taUser = tpTransactionMapper.getById(id);
-        if (null != taUser && userId.equals(taUser.getTaUserId())) {
+        TpTransaction transaction = tpTransactionMapper.getById(id);
+        transaction.setTransactionTitle(tpTransaction.getTransactionTitle());
+        transaction.setTransactionContent(tpTransaction.getTransactionContent());
+
+
+        if (null != transaction && userId.equals(transaction.getTaUserId())) {
             tdImagesMapper.deleteTdImages(Integer.valueOf(id), Constant.TRANSACTION);
             try {
-                insertTdImage(tpTransaction, imageUrl, userId, Constant.TRANSACTION);
+                insertTdImage(transaction, imageUrl, userId, Constant.TRANSACTION);
             } catch (IOException e) {
                 e.printStackTrace();
                 throw new RuntimeException("图片修改异常");
             }
-            tpTransactionMapper.updateTransaction(Integer.valueOf(id), transactionTitle, transactionContent, userId);
+            tpTransactionMapper.updateTransaction(Integer.valueOf(id), transaction.getTransactionTitle(), transaction.getTransactionContent(), userId);
             response.addSuccess("修改成功");
             return response;
 

CODE/smart-community/app-api/src/main/resources/mapper/TpTicketMapper.xml

@@ -214,6 +214,7 @@
     <include refid="Base_Column_List" />
     from tp_ticket
       <trim prefix="where" prefixOverrides="and">
+        and status = 1
         <if test="communityId != null" >
           and community_id = #{communityId,jdbcType=INTEGER}
         </if>
@@ -246,5 +247,6 @@
     WHERE
         t.id = #{ticketId,jdbcType=INTEGER}
         AND t.community_id = #{communityId,jdbcType=INTEGER}
+        and status = 1
   </select>
 </mapper>

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -204,6 +204,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="transactionTitle != null and transactionTitle !=''">
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
     </if>
+    and status = 1
     order by create_date DESC
   </select>
 
@@ -216,6 +217,7 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     <if test="type != null and type != ''">
       and type = #{type,jdbcType=INTEGER}
     </if>
+    and status = 1
     order by create_date DESC
   </select>