合并分支

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

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,12 +34,14 @@ public class ImageController {
 
     @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
     @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile) throws Exception {
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "uploadFiles" ,required = true) MultipartFile[] uploadFiles) throws Exception {
         ResponseBean responseBean = new ResponseBean();
-        Map<String,Object> map = Maps.newHashMap();
-        String url = imageService.getImageUrl(uploadFile);
-        map.put("url",url);
-        responseBean.addSuccess(map);
+        List<String> urls = new ArrayList<String>();
+        for (MultipartFile uploadFile : uploadFiles){
+            String url = imageService.getImageUrl(uploadFile);
+            urls.add(url);
+        }
+        responseBean.addSuccess(urls);
         return responseBean;
     }
 }

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

@@ -24,4 +24,10 @@ public interface TaFaceMapper{
      */
     TaFace getByUserId(@Param("userid") Integer userid);
 
+    /**
+     * 查看当前信息
+     * @param id
+     * @return
+     */
+    TaFace getById(@Param("id")Integer id);
 }

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

@@ -56,4 +56,12 @@ public interface TaUserMapper {
      * @return
      */
     TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID")Integer otherUserID);
+
+    /**
+     * 查询此电话在小区是否存在
+     * @param communityId
+     * @param phone
+     * @return
+     */
+    TaUser getByLoginName(@Param("communityId")Integer communityId, @Param("phone")String phone);
 }

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

@@ -38,6 +38,16 @@ public class TpMessage {
     private Integer updateUser;
 
     private Date updateDate;
+    
+    /**
+     * 工单状态
+     */
+    private String ticketStatus;
+    
+    /**
+     * 工单扭转自动添加的内容
+     */
+    private String content;
 
     public Integer getId() {
         return id;
@@ -182,4 +192,20 @@ public class TpMessage {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
+    
+    public String getTicketStatus() {
+        return ticketStatus;
+    }
+    
+    public void setTicketStatus(String ticketStatus) {
+        this.ticketStatus = ticketStatus;
+    }
+    
+    public String getContent() {
+        return content;
+    }
+    
+    public void setContent(String content) {
+        this.content = content;
+    }
 }

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

@@ -130,7 +130,6 @@ public class FaceServicelimpl implements FaceServiceI {
                 }
                 taFaceMapper.insertSelective(taFace);
                 responseBean.addSuccess("操作成功");
-
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
             } else if (isA == false){
                     if (null == data) {

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

@@ -237,7 +237,17 @@ public class TaUserServiceImpl implements ITaUserService {
         String  codes= (String) AppkeyCache.getCache(phone);
         //用户电话
             /*String  phones=user.getLoginName();*/
-        if(codes.equals(code)){
+        if (!AccountValidatorUtil.isPhone(phone)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+        //当前小区下的电话校验
+        TaUser loginName=taUserMapper.getByLoginName(user.getCommunityId(),phone);
+        if (null!=loginName)  {
+            response.addError("号码重复");
+            return response;
+        }
+        if(null!=codes && codes.equals(code)){
             TaUser taUser=new TaUser();
             taUser.setLoginName(phone);
             taUser.setId(user.getId());
@@ -246,7 +256,7 @@ public class TaUserServiceImpl implements ITaUserService {
             AppkeyCache.setCache(user.getLoginName(),"null");
             return response;
         }else {
-            response.addError("验证码错误");
+            response.addError("验证码错误或电话号码错误");
             return response;
         }
 

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

@@ -117,4 +117,12 @@
         from ta_face
         where ta_user_id = #{userid,jdbcType=INTEGER}
     </select>
+
+    <select id="getById" resultMap="BaseResultMap"  parameterType="java.lang.Integer" >
+        select
+        <include refid="Base_Column_List" />
+        from ta_face
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
 </mapper>

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

@@ -319,4 +319,13 @@
     </if>
 
   </select>
+
+  <select id="getByLoginName" parameterType="com.community.huiju.model.TaUser" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where community_id = #{communityId,jdbcType=INTEGER}
+      and login_name = #{phone ,jdbcType=VARCHAR}
+  </select>
+
 </mapper>

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

@@ -20,6 +20,8 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="ticket_status" property="ticketStatus" jdbcType="VARCHAR" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, ticket_id,community_id, message_type, advice_type, model_type, uuid, uuid_type, source,
@@ -260,18 +262,41 @@
 
   <select id="getMessages" resultMap="BaseResultMap">
     SELECT
-      <include refid="Base_Column_List" />
+        t.id,
+        t.ticket_id,
+        t.community_id,
+        t.message_type,
+        t.advice_type,
+        t.model_type,
+        t.uuid,
+        t.uuid_type,
+        t.source,
+        t.message_content,
+        t.STATUS,
+        t.result,
+        t.meaasge_type_id,
+        t.read_status,
+        t.create_user,
+        t.create_date,
+        t.update_user,
+        t.update_date,
+        k.status,
+        r.content,
+        d.name as ticket_status
     FROM
-        tp_message
+        tp_message t
+    LEFT JOIN tp_ticket k on t.ticket_id = k.id  AND k.community_id = #{communityId,jdbcType=INTEGER}
+    LEFT JOIN tp_ticket_record r on t.ticket_id = r.ticket_id AND r.community_id = #{communityId,jdbcType=INTEGER}  AND k.status = r.status
+    LEFT JOIN sys_dictionary d on k.status = d.code AND d.group_id = ( SELECT id FROM sys_dictionary WHERE CODE = "ticket_status" )
     WHERE
-        uuid_type = 1
-        AND community_id = #{communityId,jdbcType=INTEGER}
-        AND uuid = #{userId,jdbcType=INTEGER}
-        AND STATUS = 1
-        AND advice_type = 1
-        AND model_type = #{modelType,jdbcType=INTEGER}
+        t.uuid_type = 1
+        AND t.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.uuid = #{userId,jdbcType=INTEGER}
+        AND t.STATUS = 1
+        AND t.advice_type = 1
+        AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
-    create_date DESC
+    t.create_date DESC
   </select>
 
   <update id="updateReadStatus" parameterType="java.lang.Integer" >