Merge remote-tracking branch 'origin/master'

src/main/java/com/finikes/oc/base/controller/VerificationCodeController.java

@@ -52,6 +52,7 @@ public class VerificationCodeController {
     public BaseDTO checkVeriCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         // 获取手机号码
         String mobile = (String) map.get("mobile");
+        String password = (String) map.get("password");
         String verificationCode = (String) map.get("verificationCode");
         // 如果已经注册就报错
         Passport tmp = passportDAO.findByMobile(mobile);
@@ -63,7 +64,12 @@ public class VerificationCodeController {
         long now = System.currentTimeMillis();
         long veriCodeDeadline = now + 60 * 1000 * 5;
         if (verificationCode.equals(veriCode) && veriCodeDeadline > tmp.getVeriCodeDeadline()) {
-            passportDAO.updateState(mobile, 1, now);
+            if (password != null && !"".equals(password)) {
+                passportDAO.updateStateAndPassword(mobile, 1, password, now);
+            } else {
+                passportDAO.updateState(mobile, 1, now);
+            }
+            tmp.setState(1);
             HttpSession session = request.getSession();
             session.setAttribute("PASSPORT", tmp);
 

src/main/java/com/finikes/oc/base/dao/PassportDAO.java

@@ -17,4 +17,6 @@ public interface PassportDAO {
     Passport findById(int id);
 
     void updateName(@Param("id") int id, @Param("name") String name);
+
+    void updateStateAndPassword(@Param("mobile") String mobile, @Param("state") int state, @Param("password") String password, @Param("createTime") long createTime);
 }

src/main/java/com/finikes/oc/estate/controller/EstateController.java

@@ -28,11 +28,16 @@ public class EstateController {
     @RequestMapping(value = "/", method = RequestMethod.GET)
     public BaseDTO getEstatesByParent(@RequestParam String estateUnitId) {
         EstateUnit eu = estateUnitDAO.findById(Integer.parseInt(estateUnitId));
-        if(eu.isLeaf()) {
+        if (eu.isLeaf()) {
             List<House> houses = houseDAO.findByUnitId(estateUnitId);
             EstatesResponseDTO dto = new EstatesResponseDTO();
             dto.setLeaf(true);
-            dto.setHouses(houses);
+            dto.setSubs(houses);
+            List<House> subs = dto.getSubs();
+            for (House h : subs) {
+                h.setLeaf(true);
+                h.setParentId(h.getUnitId());
+            }
             return new BaseDTO().setContent(dto);
         }
 
@@ -40,6 +45,10 @@ public class EstateController {
         EstatesResponseDTO dto = new EstatesResponseDTO();
         dto.setLeaf(false);
         dto.setSubs(estateUnits);
+        List<EstateUnit> subs = dto.getSubs();
+        for (EstateUnit e : subs) {
+            e.setLeaf(false);
+        }
         return new BaseDTO().setContent(dto);
     }
 }

src/main/java/com/finikes/oc/estate/dto/EstatesResponseDTO.java

@@ -5,10 +5,9 @@ import com.finikes.oc.estate.entity.House;
 
 import java.util.List;
 
-public class EstatesResponseDTO {
+public class EstatesResponseDTO<T extends EstateUnit> {
     private boolean leaf;
-    private List<House> houses;
-    private List<EstateUnit> subs;
+    private List<T> subs;
 
     public boolean isLeaf() {
         return leaf;
@@ -18,19 +17,11 @@ public class EstatesResponseDTO {
         this.leaf = leaf;
     }
 
-    public List<House> getHouses() {
-        return houses;
-    }
-
-    public void setHouses(List<House> houses) {
-        this.houses = houses;
-    }
-
-    public List<EstateUnit> getSubs() {
+    public List<T> getSubs() {
         return subs;
     }
 
-    public void setSubs(List<EstateUnit> subs) {
+    public void setSubs(List<T> subs) {
         this.subs = subs;
     }
 }

src/main/java/com/finikes/oc/estate/entity/House.java

@@ -3,7 +3,7 @@ package com.finikes.oc.estate.entity;
 /**
  * 房产
  */
-public class House {
+public class House extends EstateUnit {
 	private transient int unitId; // 属于那个单元(肯定是个物业单元的叶节点)
 	private int id;
 	private String name; // 名称

src/main/resources/mapper/PassportMapper.xml

@@ -34,9 +34,17 @@
         WHERE mobile = #{mobile}
     </update>
 
-    <update id="updateName" parameterType="java.lang.String">
+    <update id="updateStateAndPassword" parameterType="com.finikes.oc.base.entity.Passport">
         UPDATE t_passport
-        SET name      = #{name}
+        SET state      = #{state},
+            createTime = #{createTime},
+            password   = #{password}
+        WHERE mobile = #{mobile}
+    </update>
+
+    <update id="updateName">
+        UPDATE t_passport
+        SET name = #{name}
         WHERE id = #{id}
     </update>
 </mapper>