Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/controller/WxSysAreaController.java

@@ -1,13 +1,16 @@
 package com.bofeng.controller;
 
+import com.bofeng.dao.SysAreaMapper;
 import com.bofeng.entity.SysArea;
+import com.bofeng.entity.Uptown;
+import com.bofeng.entity.UptownUnit;
 import com.bofeng.service.SysAreaService;
 import com.yvan.Model;
-import com.yvan.mvc.Pd;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
@@ -15,20 +18,63 @@ public class WxSysAreaController {
 
     @Autowired
     private SysAreaService sysAreaService;
+    @Autowired
+    private SysAreaMapper sysAreaMapper;
 
+    //选择省
     @GetMapping("/admin/selectProvince")
     public Model<List<SysArea>> selectProvince() {
         return Model.newSuccess(sysAreaService.selectProvince());
     }
 
+    //选择城市
     @GetMapping("/admin/selectCityByProvince")
-    public Model<List<SysArea>> selectCityByProvince(@Pd(name = "areaId") Long areaId) {
+    public Model<List<SysArea>> selectCityByProvince(HttpServletRequest request) {
+        Long areaId = Long.parseLong(request.getParameter("areaId"));
+        if (areaId == null || areaId == 0L) {
+            return Model.newFail("请选择所在省");
+        }
         return Model.newSuccess(sysAreaService.selectCityByProvince(areaId));
     }
 
+    //选择区
     @GetMapping("/admin/selectAreaByCity")
-    public Model<List<SysArea>> selectAreaByCity(@Pd(name = "areaId") Long areaId) {
+    public Model<List<SysArea>> selectAreaByCity(HttpServletRequest request) {
+        Long areaId = Long.parseLong(request.getParameter("areaId"));
+        if (areaId == null || areaId == 0L) {
+            return Model.newFail("请选择所在城市");
+        }
         return Model.newSuccess(sysAreaService.selectAreaByCity(areaId));
     }
 
+    //选择小区
+    @GetMapping("/admin/selectUptownByArea")
+    public Model<List<Uptown>> selectUptownByArea(HttpServletRequest request) {
+        Long areaId = Long.parseLong(request.getParameter("areaId"));
+        if (areaId == null || areaId == 0L) {
+            return Model.newFail("请选择所在区");
+        }
+        return Model.newSuccess(sysAreaMapper.selectUptownByArea(areaId));
+    }
+
+    //选择栋
+    @GetMapping("/admin/selectRidgepoleByArea")
+    public Model<List<String>> selectRidgepoleByArea(HttpServletRequest request) {
+        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+        if (uptownId == null || uptownId == 0L) {
+            return Model.newFail("请选择所在小区");
+        }
+        return Model.newSuccess(sysAreaMapper.selectRidgepoleByArea(uptownId));
+    }
+
+    //选择单元
+    @GetMapping("/admin/selectUnitByArea")
+    public Model<List<UptownUnit>> selectUnitByArea(HttpServletRequest request) {
+        Long uptownId = Long.parseLong(request.getParameter("uptownId"));
+        Long ridgepole = Long.parseLong(request.getParameter("ridgepole"));
+        if (uptownId == null || uptownId == 0L) {
+            return Model.newFail("请选择所在小区");
+        }
+        return Model.newSuccess(sysAreaMapper.selectUnitByArea(uptownId, ridgepole));
+    }
 }

whepi-web/src/main/java/com/bofeng/controller/WxUserOpenController.java

@@ -1,7 +1,5 @@
 package com.bofeng.controller;
 
-import com.bofeng.dao.UptownHomeMapper;
-import com.bofeng.dao.UptownHouseMapper;
 import com.bofeng.dao.UserRoleMapper;
 import com.bofeng.entity.UserOpen;
 import com.bofeng.entity.UserRole;
@@ -27,10 +25,6 @@ public class WxUserOpenController {
     @Autowired
     private UserRoleMapper userRoleMapper;
     @Autowired
-    private UptownHouseMapper uptownHouseMapper;
-    @Autowired
-    private UptownHomeMapper uptownHomeMapper;
-    @Autowired
     private WxUserOpenService wxUserOpenService;
 
     @ApiOperation("用户注册页面点登录")

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -22,6 +22,9 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
     Long selectHouseIdByUserId(@Param("userId") Long userId);
 
+    @Select("select property_id from sys_user_role where user_id=#{userId} and role_id=1")
+    List<Long> selectHouseIdsByUserId(@Param("userId") Long userId);
+
     //确诊
     @Select("select count(*) from ms_suspected where report_id=#{reportId} and  medical=#{medical}")
     Integer selectSuspectedNum(@Param("reportId") Long reportId, @Param("medical") Integer medical);

whepi-web/src/main/java/com/bofeng/dao/SysAreaMapper.java

@@ -2,8 +2,11 @@ package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.bofeng.entity.SysArea;
+import com.bofeng.entity.Uptown;
+import com.bofeng.entity.UptownUnit;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -21,4 +24,16 @@ public interface SysAreaMapper extends BaseMapper<SysArea> {
     //查询城市下的区
     List<SysArea> selectAreaByCity(@Param("areaId") Long areaId);
 
+    //查询小区
+    @Select("select * from sys_uptown where status = 1 and area = #{area}")
+    List<Uptown> selectUptownByArea(@Param("area") Long area);
+
+    //查询小区的栋
+    @Select("select ridgepole from sys_uptown_unit where status = 1 and uptown_id = #{uptownId} group by ridgepole")
+    List<String> selectRidgepoleByArea(@Param("uptownId") Long uptownId);
+
+    //查询小区栋的单元
+    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = #{uptownId} and ridgepole = #{ridgepole}")
+    List<UptownUnit> selectUnitByArea(@Param("uptownId") Long uptownId, @Param("ridgepole") Long ridgepole);
+
 }

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -75,7 +75,7 @@ public class MsSuspectedService {
         //判断是否疑似
         Integer suspectedStatus = 0;
         //确诊
-        if (medical == 0)
+        if (medical == 1)
             suspectedStatus = 1;
         //隔离
         if (singleRoom == 1)

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -84,8 +84,18 @@ public class RiBaoService {
     //获取今天数据
     public String getHouseStr(Long houseId) {
         UptownHouse house = uptownHouseMapper.selectById(houseId);
+        if (null == house) {
+            return "";
+        }
+
         UptownUnit unit = uptownUnitMapper.selectById(house.getUnitId());
         StringBuffer sb = new StringBuffer();
+        if (null == unit) {
+            sb.append(house.getDoorplate()).append("室");
+            String houseStr = sb.toString();
+            return houseStr;
+        }
+
         sb.append(unit.getRidgepole()).append("栋").append(unit.getUnit()).append("单元").append(house.getDoorplate()).append("室");
         String houseStr = sb.toString();
         return houseStr;
@@ -315,11 +325,11 @@ public class RiBaoService {
                 msReportMapper.insert(msReport);
             }
         } else {
-            Long houseId = msReportMapper.selectHouseIdByUserId(userCreate);
+            List<Long> houseIds = msReportMapper.selectHouseIdsByUserId(userCreate);
             reportId = IdWorker.getId();
             MsReport msReport = new MsReport();
             msReport.setReportId(reportId);
-            msReport.setHouseId(houseId);
+            msReport.setHouseId(houseIds.get(0).longValue());
             msReport.setSafetyNum(0);
             msReport.setSureNum(0);
             msReport.setSuspectedNum(0);