暂存

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/HttpSessionConfig.java

@@ -2,6 +2,7 @@ package com.community.huiju.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.session.MapSession;
 import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
 import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
 import org.springframework.session.web.http.HttpSessionIdResolver;
@@ -10,7 +11,7 @@ import org.springframework.session.web.http.HttpSessionIdResolver;
  * @author weiximei
  */
 @Configuration
-@EnableJdbcHttpSession
+@EnableJdbcHttpSession(maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS*4)
 public class HttpSessionConfig {
 
     @Bean

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MonitoringController.java

@@ -55,7 +55,7 @@ public class MonitoringController extends BaseController {
     @RequestMapping(value = "/monitoring/token/{communityId}",method = RequestMethod.GET)
     public ResponseBean getMonitoringToken(@PathVariable("communityId") Integer communityId,
                                 @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+                                @RequestParam(value = "pageSize",defaultValue = "100") Integer pageSize){
         ResponseBean response = new ResponseBean();
         if (!check(communityId)) {
             response.addError("小区不存在");

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -148,7 +148,7 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "添加报修", notes = "添加报修")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "paramets", value =
-                    "ticketTitle:工单内容,ticketContent:小区标题，repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
+                    "ticketTitle:工单内容,ticketContent:小区标题，type: 0 代表 报修  1 代表 投诉  2代表 联系单 , repairType：0:公共区域  1: 房屋质量  2:户内设施, imageUrl:图片地址 "),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
     @RequestMapping(value = "/addtpTicket", method = RequestMethod.POST)

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TdImagesMapper.java

@@ -3,6 +3,9 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TdImages;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 @Mapper
 public interface TdImagesMapper {
     int deleteByPrimaryKey(Integer id);
@@ -16,4 +19,6 @@ public interface TdImagesMapper {
     int updateByPrimaryKeySelective(TdImages record);
 
     int updateByPrimaryKey(TdImages record);
+
+    List<TdImages> getByUUIDAndByType(Map<String,Object> map);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTicket.java

@@ -38,9 +38,12 @@ public class TpTicket {
     private Integer updateUser;
 
     private Date updateDate;
-    
+
+    private List<TdImages> tdImagesList;
+
     private List<TpTicketRecord> ticketRecordList;
 
+
     public Integer getId() {
         return id;
     }
@@ -176,4 +179,12 @@ public class TpTicket {
     public void setTicketRecordList(List<TpTicketRecord> ticketRecordList) {
         this.ticketRecordList = ticketRecordList;
     }
+
+    public List<TdImages> getTdImagesList() {
+        return tdImagesList;
+    }
+
+    public void setTdImagesList(List<TdImages> tdImagesList) {
+        this.tdImagesList = tdImagesList;
+    }
 }

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

@@ -122,6 +122,17 @@ public class TicketServiceImpl implements ITicketService {
             // 设置工单编号
             lastRecordMap.put("tickerId", e.getId());
             TpTicketRecordComment comment = getTicketRecordComment(lastRecordMap);
+            List<TpTicketRecord> recordList = tpTicketRecordMapper.getTicketRecordByTicketId(e.getCommunityId()+"",e.getId());
+            // 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型
+            String repairType = e.getRepairType();
+            String repairName = repairType == null?
+                    null:"0".equals(repairType)?
+                    "公共区域":"1".equals(repairType)?
+                    "房屋质量":"2".equals(repairType)?
+                    "户内设施":null;
+            tpTicketVO.setRepairName(repairName);
+            tpTicketVO.setStatus(recordList.get(0).getStatus());
+            tpTicketVO.setTicketStatusName(recordList.get(0).getTicketStatusName());
             if (null != comment) {
                 tpTicketVO.setCommentContent(comment.getContent());
                 tpTicketVO.setCommentCreateDate(comment.getCreateDate());
@@ -176,7 +187,15 @@ public class TicketServiceImpl implements ITicketService {
                 List<TpTicketRecordComment> ticketRecordCommentList = tpTicketRecordCommentMapper.selectByTicketRecordId(TpTicketRecord);
                 TpTicketRecord.setTicketRecordCommentList(ticketRecordCommentList);
             });
+
+            Map<String,Object> map = Maps.newHashMap();
+            map.put("uuid",ticket.getId());
+            map.put("type","service");
+            List<TdImages> tdImagesList = tdImagesMapper.getByUUIDAndByType(map);
+
+            ticket.setTdImagesList(tdImagesList);
             ticket.setTicketRecordList(ticketRecordList);
+
         }
         return ticket;
     }
@@ -185,26 +204,21 @@ public class TicketServiceImpl implements ITicketService {
     public ResponseBean addAiTicketService(Integer userId, String parameter) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
-        String ticketContent = (String) jsonObject.get("ticketContent");
-        String ticketTitle = (String) jsonObject.get("ticketTitle");
-        String repairType = (String) jsonObject.get("repairType");
         String imageUrl = (String) jsonObject.get("imageUrl");
 
+
+        TpTicket tpTicket = JSONObject.parseObject(parameter,TpTicket.class);
+
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
 
-        TpTicket tpTicket=new TpTicket();
         tpTicket.setCommunityId(user.getCommunityId());
         tpTicket.setTaUserId(userId);
         tpTicket.setStatus("2");
-        tpTicket.setRepairType(repairType);
-        tpTicket.setTicketTitle(ticketTitle);
-        tpTicket.setTicketContent(ticketContent);
         tpTicket.setCreateUser(userId);
         tpTicket.setCreateDate(new Date());
         tpTicket.setUpdateUser(userId);
         tpTicket.setUpdateDate(new Date());
 
-
         tpTicketMapper.insertSelective(tpTicket);
         insertTdImage(tpTicket, imageUrl, userId);
 
@@ -223,6 +237,13 @@ public class TicketServiceImpl implements ITicketService {
         return response;
     }
 
+    /**
+     * 存入图片
+     * @param tpTicket
+     * @param imageUrl
+     * @param userId
+     * @throws IOException
+     */
     private void insertTdImage(TpTicket tpTicket, String imageUrl, Integer userId) throws IOException {
         TdImages tdImages = new TdImages();
         Integer uuId = tpTicket.getId();

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TpTicketVO.java

@@ -39,8 +39,22 @@ public class TpTicketVO {
 
     private Date updateDate;
 
+    /** 报修类型：0:公共区域  1: 房屋质量  2::户内设施  PS : 报修的情况下才有报修类型  **/
+    private String repairType;
+
+    /**
+     * 报修类型的名字
+     */
+    private String repairName;
+
     /** ====================================== **/
 
+    /** 流程状态 **/
+    private String status;
+
+    /** 流程状态名称 **/
+    private String ticketStatusName;
+
     /** 最新进展 **/
     private String commentContent;
 

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

@@ -103,4 +103,13 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="getByUUIDAndByType" parameterType="map" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from td_images
+    where uuid = #{uuid,jdbcType=INTEGER} and type = #{type,jdbcType=CHAR}
+    order by create_time DESC
+  </select>
+
 </mapper>

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

@@ -154,8 +154,8 @@
   <select id="selectByTicketId" parameterType="map" resultMap="BaseResultMap" >
     select ttrc.* from tp_ticket tp
                 inner join tp_ticket_record ttr on tp.id = ttr.ticket_id
-                inner join tp_ticket_record_comment ttrc on ttr.ticket_id = ttrc.ticket_record_id
-    where tp.id=#{ticketId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
+                inner join tp_ticket_record_comment ttrc on ttr.id = ttrc.ticket_record_id
+    where tp.id=#{tickerId,jdbcType=INTEGER} order by ttrc.create_date DESC LIMIT #{size,jdbcType=INTEGER}
   </select>
 
   <select id="selectByTicketRecordId" parameterType="com.community.huiju.model.TpTicketRecord" resultMap="BaseResultMap" >

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

@@ -108,6 +108,7 @@
   <select id="getTicketRecordByTicketId" resultType="com.community.huiju.model.TpTicketRecord">
     SELECT
         t.id,
+        t.status,
         t.ticket_id AS ticketId,
         t.community_id AS communityId,
         d.NAME AS ticketStatusName
@@ -118,6 +119,6 @@
     WHERE
         community_id = #{communityId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
-
+    order by t.create_date DESC
   </select>
 </mapper>

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.3.9
-version=0.0.1
-groupId=com.community
-artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,28 +0,0 @@
-com\community\commom\redis\RedisTemplate.class
-com\community\commom\redis\RedisConfiguration.class
-com\community\commom\utils\OssUtil.class
-com\community\commom\redis\SingleRedisTemplate.class
-com\community\commom\utils\EnumUtils.class
-com\community\commom\hk\HttpClientSSLUtils$2.class
-com\community\commom\redis\RedisJsonSerializer.class
-com\community\commom\utils\BeanTools.class
-com\community\commom\hk\HttpClientSSLUtils.class
-com\community\commom\session\UserElement.class
-com\community\commom\utils\CommonUtils.class
-com\community\commom\redis\RedisSerializer.class
-com\community\commom\utils\StringConverter.class
-com\community\commom\mode\ResponseBean.class
-com\community\commom\utils\DESUtils.class
-com\community\commom\redis\FastJsonSerializer.class
-com\community\commom\utils\DateUtils.class
-com\community\commom\utils\HttpClientUtils.class
-com\community\commom\constant\Constant.class
-com\community\commom\utils\CookieUtil.class
-com\community\commom\ailiyun\AESDecode.class
-com\community\commom\hk\HttpClientSSLUtils$1.class
-com\community\commom\utils\MD5Utils.class
-com\community\commom\redis\RedisObjectSerializer.class
-com\community\commom\utils\QRCodeGeneratorUtils.class
-com\community\commom\redis\SerializationFailedException.class
-com\community\commom\hk\Digests.class
-com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,26 +0,0 @@
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
-E:\weiximei\git\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java