冲突处理

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/LoginController.java

@@ -49,6 +49,7 @@ public class LoginController extends EnvelopRestEndpoint {
    public ResponseEntity<HashMap> captcha(
            @ApiParam(name = "clientId", value = "应用id", defaultValue = "EwC0iRSrcS", required = true) @RequestParam(required = true, name = "clientId") String clientId,
            @ApiParam(name = "msgType", value = "消息类型（login：登录验证，checkPhone：验证安全手机，resetPhone：重设安全手机", required = true) @RequestParam(required = true, name = "msgType") String msgType,
            @ApiParam(name = "userType", value = "账号类型（patient：普通账号，superAdmin：炒鸡管理员", required = true) @RequestParam(required = true, name = "userType") String userType,
            @ApiParam(name = "username", value = "手机账号", required = true) @RequestParam(required = true, name = "username") String username) throws Exception {
        if (StringUtils.isEmpty(clientId)) {
            failed("clientId 为空！");
@@ -57,7 +58,7 @@ public class LoginController extends EnvelopRestEndpoint {
            failed("username 为空！");
        }
        //验证用户是否被冻结
        User user = userService.findByCode(username);
        User user = userService.findByTelephoneAndUserType(username,userType);
        if (HouseUserContant.activated_lock.equals(user)) {
            failed("该用户已被冻结，无法发送验证码!");
        }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/facility/FacilityService.java

@@ -75,17 +75,18 @@ public class FacilityService extends BaseJpaService<Facility, FacilityDao> {
        font.setFontName("黑体");
        font.setFontHeightInPoints((short) 12);
        style.setFont(font);
        ExcelUtils.addCellData(sheet, 0, 0, "序号", style);
        ExcelUtils.addCellData(sheet, 1, 0, "设施编码", style);
        ExcelUtils.addCellData(sheet, 2, 0, "设施类型名称", style);
        ExcelUtils.addCellData(sheet, 3, 0, "设施详细地址", style);
        ExcelUtils.addCellData(sheet, 4, 0, "联系人", style);
        ExcelUtils.addCellData(sheet, 5, 0, "联系方式", style);
        ExcelUtils.addCellData(sheet, 6, 0, "所在省", style);
        ExcelUtils.addCellData(sheet, 7, 0, "所在市", style);
        ExcelUtils.addCellData(sheet, 8, 0, "所在区", style);
        ExcelUtils.addCellData(sheet, 9, 0, "所在街道", style);
        ExcelUtils.addCellData(sheet, 10, 0, "运营状态", style);
        ExcelUtils.addCellData(sheet,0,0,"序号",style);
        ExcelUtils.addCellData(sheet,1,0,"设施编码",style);
        ExcelUtils.addCellData(sheet,2,0,"设施名称",style);
        ExcelUtils.addCellData(sheet,3,0,"设施类型名称",style);
        ExcelUtils.addCellData(sheet,4,0,"设施详细地址",style);
        ExcelUtils.addCellData(sheet,5,0,"联系人",style);
        ExcelUtils.addCellData(sheet,6,0,"联系方式",style);
        ExcelUtils.addCellData(sheet,7,0,"所在省",style);
        ExcelUtils.addCellData(sheet,8,0,"所在市",style);
        ExcelUtils.addCellData(sheet,9,0,"所在区",style);
        ExcelUtils.addCellData(sheet,10,0,"所在街道",style);
        ExcelUtils.addCellData(sheet,11,0,"运营状态",style);
    }