finikes alpha 20

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

@@ -4,7 +4,9 @@ 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.Houses;
 import com.finikes.oc.estate.dao.HouseDAO;
+import com.finikes.oc.estate.dto.HouseInfoDTO;
 import com.finikes.oc.estate.entity.House;
 import com.finikes.oc.management.dao.HouseRelationDAO;
 import com.finikes.oc.management.entity.HouseRelation;
@@ -16,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -33,6 +36,9 @@ public class HouseController {
     @Autowired
     private HouseDAO houseDAO;
 
+    @Autowired
+    private Houses houses;
+
     @ResponseBody
     @RequestMapping(value = "/passport", method = RequestMethod.PUT)
     public BaseDTO bind(@RequestBody Map<String, Object> map, HttpServletRequest request) {
@@ -149,4 +155,23 @@ public class HouseController {
 
         return new BaseDTO();
     }
+
+
+    @ResponseBody
+    @RequestMapping(value = "/s/passport", method = RequestMethod.GET)
+    public BaseDTO getHousesByPassportChoice(HttpServletRequest request) {
+        List<HouseRelation> relations = houseRelationDAO.findByPassport(Passports.getPassport(request).getId());
+        List<HouseInfoDTO> dtos = new ArrayList<>();
+        for (HouseRelation relation : relations) {
+            HouseInfoDTO dto = new HouseInfoDTO();
+            int houseId = relation.getHouseId();
+            dto.setHouseId(String.valueOf(houseId));
+            House house = houseDAO.findById(houseId);
+            dto.setHouseName(houses.getHouseFullName(house));
+
+            dtos.add(dto);
+        }
+
+        return new BaseDTO().setContent(dtos);
+    }
 }

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

@@ -0,0 +1,22 @@
+package com.finikes.oc.estate.dto;
+
+public class HouseInfoDTO {
+    private String houseId;
+    private String houseName;
+
+    public String getHouseId() {
+        return houseId;
+    }
+
+    public void setHouseId(String houseId) {
+        this.houseId = houseId;
+    }
+
+    public String getHouseName() {
+        return houseName;
+    }
+
+    public void setHouseName(String houseName) {
+        this.houseName = houseName;
+    }
+}

src/main/java/com/finikes/oc/management/dto/HouseInfoDTO.java → src/main/java/com/finikes/oc/management/dto/HouseChoiceInfoDTO.java

@@ -1,6 +1,6 @@
 package com.finikes.oc.management.dto;
 
-public class HouseInfoDTO {
+public class HouseChoiceInfoDTO {
     private String houseId;
     private String houseName;
     private boolean enabled;

src/main/java/com/finikes/oc/vote/controller/ChoicesController.java

@@ -13,7 +13,7 @@ import com.finikes.oc.estate.dao.HouseDAO;
 import com.finikes.oc.estate.entity.EstateUnit;
 import com.finikes.oc.estate.entity.House;
 import com.finikes.oc.management.dao.HouseRelationDAO;
-import com.finikes.oc.management.dto.HouseInfoDTO;
+import com.finikes.oc.management.dto.HouseChoiceInfoDTO;
 import com.finikes.oc.management.entity.HouseRelation;
 import com.finikes.oc.vote.dao.ChoiceDao;
 import com.finikes.oc.vote.dao.OptionDao;
@@ -110,11 +110,11 @@ public class ChoicesController {
     @ResponseBody
     @RequestMapping(value = "/passport/house/s", method = RequestMethod.GET)
     public BaseDTO getHousesByPassportChoice(@RequestParam(name = "voteId") Integer voteId, HttpServletRequest request) {
-        List<HouseInfoDTO> dtos = new ArrayList<>();
+        List<HouseChoiceInfoDTO> dtos = new ArrayList<>();
         // 名下已经投过票的房产
         List<Integer> houseIds = houseRelationDAO.findHousesByPassportChoice(Passports.getPassport(request).getId(), voteId);
         for (Integer houseId : houseIds) {
-            HouseInfoDTO dto = new HouseInfoDTO();
+            HouseChoiceInfoDTO dto = new HouseChoiceInfoDTO();
             dto.setEnabled(false);
             dto.setHouseId(String.valueOf(houseId));
             dto.setHouseName(houses.getHouseFullName(houseDAO.findById(houseId)));
@@ -125,7 +125,7 @@ public class ChoicesController {
         // 名下未投过票的房产
         houseIds = houseRelationDAO.findHousesByNotPassportChoice(Passports.getPassport(request).getId(), voteId);
         for (Integer houseId : houseIds) {
-            HouseInfoDTO dto = new HouseInfoDTO();
+            HouseChoiceInfoDTO dto = new HouseChoiceInfoDTO();
             dto.setEnabled(true);
             dto.setHouseId(String.valueOf(houseId));
             dto.setHouseName(houses.getHouseFullName(houseDAO.findById(houseId)));

src/main/java/com/finikes/oc/vote/dto/ChoiceDelegationDto.java

@@ -3,6 +3,15 @@ package com.finikes.oc.vote.dto;
 public class ChoiceDelegationDto {
     private int optionId;
     private int houseId;
+    private String signature;
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
 
     public int getHouseId() {
         return houseId;

src/main/java/com/finikes/oc/vote/dto/ChoiceDto.java

@@ -17,6 +17,17 @@ public class ChoiceDto {
     @NotNull
     private Integer houseId;
 
+    @NotNull
+    private String signature;
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
     public Integer getHouseId() {
         return houseId;
     }

src/main/java/com/finikes/oc/vote/entity/Choice.java

@@ -11,6 +11,15 @@ public class Choice {
     private boolean proxy; // 是否代理投票
     private int assigneeId; // 代理者ID
     private int houseId;
+    private String signature;
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
 
     public int getHouseId() {
         return houseId;

src/main/java/com/finikes/oc/vote/service/VoteServiceImpl.java

@@ -290,6 +290,7 @@ public class VoteServiceImpl implements VoteService {
             choice.setProxy(false);
             choice.setChooseTime(now);
             choice.setHouseId(dto.getHouseId());
+            choice.setSignature(dto.getSignature());
 
             choiceDao.insert(choice);
         } finally {
@@ -353,6 +354,7 @@ public class VoteServiceImpl implements VoteService {
             choice.setProxy(true);
             choice.setChooseTime(now);
             choice.setHouseId(houseId);
+            choice.setSignature(dto.getSignature());
 
             choiceDao.insert(choice);
         } finally {

src/main/resources/application.yml

@@ -7,9 +7,11 @@ spring:
     host: 10.18.10.106
     port: 6379
   datasource:
-    url: jdbc:mysql://121.5.58.50:3306/community?useSSL=false&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&serverTimezone=UTC
+    # matrix34.tpddns.cn:13306
+    # localhost:3306
+    url: jdbc:mysql://localhost:3306/community?useSSL=false&useUnicode=true&characterEncoding=utf-8&useAffectedRows=true&serverTimezone=UTC
     username: root
-    password: 6bbd00bb4777fe30
+    password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver
     hikari:
       max-lifetime: 3000000

src/main/resources/mapper/ChoiceMapper.xml

@@ -5,8 +5,8 @@
 
     <insert id="insert" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
             parameterType="com.finikes.oc.vote.entity.Choice">
-        INSERT INTO t_choice (option_id, choose_time, proxy, assignee_id, house_id)
-        VALUES (#{optionId}, #{chooseTime}, #{proxy}, #{assigneeId}, #{houseId})
+        INSERT INTO t_choice (option_id, choose_time, proxy, assignee_id, house_id, signature)
+        VALUES (#{optionId}, #{chooseTime}, #{proxy}, #{assigneeId}, #{houseId}, #{signature})
     </insert>
 
     <update id="update" parameterType="com.finikes.oc.vote.entity.Choice">

src/main/resources/mapper/SuggestionMapper.xml

@@ -10,7 +10,7 @@
     </insert>
 
     <select id="getSuggestionSection" resultType="com.finikes.oc.suggestion.dto.SuggestionDTO">
-        select s.id as id, s.passportId as passportId, p.`name` as passportName, s.content as suggestion
+        select s.id as id, s.passportId as passportId, p.mobile as passportName, s.content as suggestion
         from t_suggestion s,
              t_passport p
         where s.passportId = p.id