finikes alpha 10

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

@@ -119,7 +119,7 @@ public class PassportController {
 
     @ResponseBody
     @RequestMapping(value = "/", method = RequestMethod.GET)
-    public BaseDTO getPassportAndHouse(HttpServletRequest request) {
+    public BaseDTO getPassportAndHouses(HttpServletRequest request) {
         Passport passport = Passports.getPassport(request);
         if (passport == null || passport.getState() != 1) {
             // 不能查看
@@ -128,6 +128,7 @@ public class PassportController {
 
         PassportHouseInfoResponseDTO dto = new PassportHouseInfoResponseDTO();
         dto.setMobile(passport.getMobile());
+        dto.setName(passport.getName());
         HouseRelation relation = houseRelationDAO.findByPassport(passport.getId());
         if (relation != null && relation.getState() == 1) {
             House house = houseDAO.findById(relation.getHouseId());

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

@@ -62,14 +62,11 @@ public class VerificationCodeController {
         String veriCode = tmp.getVeriCode();
         long now = System.currentTimeMillis();
         long veriCodeDeadline = now + 60 * 1000 * 5;
-        System.out.println(veriCode);
-        System.out.println(verificationCode);
         if (verificationCode.equals(veriCode) && veriCodeDeadline > tmp.getVeriCodeDeadline()) {
             passportDAO.updateState(mobile, 1, now);
             HttpSession session = request.getSession();
             session.setAttribute("PASSPORT", tmp);
 
-            System.out.println(Passports.getPassport(request) + " =============");
             return new BaseDTO();
         } else {
             return new BaseDTO(new BizException("103", "验证码错误或失效"));

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

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

src/main/java/com/finikes/oc/base/dto/PassportHouseInfoResponseDTO.java

@@ -2,12 +2,21 @@ package com.finikes.oc.base.dto;
 
 public class PassportHouseInfoResponseDTO {
     private String mobile;
+    private String name;
     private String certificateNo;
     private String certificateUrl;
     private String houseAddress;
     private String area;
     private String function;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getMobile() {
         return mobile;
     }

src/main/java/com/finikes/oc/base/entity/Passport.java

@@ -7,10 +7,19 @@ public class Passport {
     private int id;
     private String mobile; // 手机号码
     private String password; // 密码
+    private String name;
     private transient int state;
     private transient String veriCode;
     private transient long veriCodeDeadline;
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public long getVeriCodeDeadline() {
         return veriCodeDeadline;
     }

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

@@ -2,6 +2,7 @@ package com.finikes.oc.estate.controller;
 
 import com.finikes.oc.BaseDTO;
 import com.finikes.oc.Passports;
+import com.finikes.oc.base.dao.PassportDAO;
 import com.finikes.oc.base.entity.Passport;
 import com.finikes.oc.estate.dao.HouseDAO;
 import com.finikes.oc.management.dao.HouseRelationDAO;
@@ -25,12 +26,16 @@ public class HouseController {
     @Autowired
     private HouseRelationDAO houseRelationDAO;
 
+    @Autowired
+    private PassportDAO passportDAO;
+
     @ResponseBody
     @RequestMapping(value = "/passport", method = RequestMethod.PUT)
     public BaseDTO bind(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         String certificateNo = (String) map.get("certificateNo");
         String certificatePhoto = (String) map.get("certificatePhoto");
         String houseId = (String) map.get("houseId");
+        String name = (String) map.get("name");
         Passport passport = Passports.getPassport(request);
         if (passport == null) {
             return new BaseDTO("104", "需要登录");
@@ -45,6 +50,9 @@ public class HouseController {
                 relation.setCertificateNo(certificateNo);
                 relation.setCertificateUrl(certificatePhoto);
                 houseRelationDAO.update(relation);
+                if(name != null && !"".equals(name)) {
+                    passportDAO.updateName(passport.getId(), name);
+                }
                 return new BaseDTO();
             }
         }
@@ -56,6 +64,9 @@ public class HouseController {
         relation.setCertificateNo(certificateNo);
         relation.setCertificateUrl(certificatePhoto);
         houseRelationDAO.insert(relation);
+        if(name != null && !"".equals(name)) {
+            passportDAO.updateName(passport.getId(), name);
+        }
         return new BaseDTO();
     }
 

src/main/resources/mapper/PassportMapper.xml

@@ -33,4 +33,10 @@
             createTime = #{createTime}
         WHERE mobile = #{mobile}
     </update>
+
+    <update id="updateName" parameterType="java.lang.String">
+        UPDATE t_passport
+        SET name      = #{name}
+        WHERE id = #{id}
+    </update>
 </mapper>