Merge branch 'beta_house_1.0' of http://192.168.1.220:10080/zdm/wlyy2.0 into beta_house_1.0

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -26,21 +26,12 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
		delete
    }
	public enum Type {
	    //家医
        familyDoctor,
        //等级医院
        gradeHospital,
        //混合型
        hybrid
    }
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private Type type; //类型
    private Integer type; //类型
	private String manager; //管理员 - 关联user表id字段
	private String email; //管理员邮箱
	private String mobile; //管理员手机号码
@@ -91,11 +82,11 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
	}
	@Column(name = "type", nullable = false)
	public Type getType() {
	public Integer getType() {
		return type;
	}
	public void setType(Type type) {
	public void setType(Integer type) {
		this.type = type;
	}

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDefaultModuleFunctionDO.java

@@ -15,18 +15,18 @@ import javax.persistence.Table;
public class SaasDefaultModuleFunctionDO extends IntegerIdentityEntity {
    //Saas类型
    private SaasDO.Type saasType;
    private Integer saasType;
    //模块ID
    private String moduleId;
    //功能ID
    private String functionId;
    @Column(name = "saas_type", nullable = false)
    public SaasDO.Type getSaasType() {
    public Integer getSaasType() {
        return saasType;
    }
    public void setSaasType(SaasDO.Type saasType) {
    public void setSaasType(Integer saasType) {
        this.saasType = saasType;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasTypeDictDO.java

@@ -0,0 +1,52 @@
package com.yihu.jw.entity.base.saas;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by zdm on 2018/10/10.
 */
@Entity
@Table(name = "base_saas_type_dict")
public class SaasTypeDictDO extends UuidIdentityEntityWithOperator{
    public enum  Status{
        //失效
        invalid,
        //生效
        effective
    }
    //Saas类型编码
    private Integer code;
    //Saas类型名称
    private String name;
    //状态（1生效中，0已失效）
    private Status status;
    public Integer getCode() {
        return code;
    }
    public void setCode(Integer code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public Status getStatus() {
        return status;
    }
    public void setStatus(Status status) {
        this.status = status;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -51,6 +51,13 @@ public class BaseRequestMapping {
        public static final String GENERATE = "/generate";
    }
    /**
     * SAAS类型
     */
    public static class SaasTypeDict extends Basic {
        public static final String PREFIX  = "/saas_type_dict";
    }
    /**
     * 模块
     */

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/house/HealthyHouseMapping.java

@@ -85,6 +85,8 @@ public class HealthyHouseMapping {
            public static final String GET_FEEDBACKS_BY_FIELD = "/getFeedBacksByField";
            public static final String UPDATE_FEEDBACKS_BY_ID = "/updateFeedBacksById";
            public static final String EXPORT_EXCEL = "/exportExcel/feedBacks";
            public static final String GET_APP_FEEDBACK_BY_ID = "/getAppFeedBackById";
            public static final String GET_APP_FEEDBACK_BY_USER_ID_AND_READFLAG = "/getAppFeedBackByUserIdAndReadFlag";
        }
        //用户使用导航记录

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasBusinessCardVO.java

@@ -1,6 +1,7 @@
package com.yihu.jw.restmodel.base.saas;
import com.yihu.jw.entity.base.saas.SaasBusinessCardDO;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.restmodel.IntegerIdentityVO;
import io.swagger.annotations.ApiModel;
@@ -22,7 +23,7 @@ public class SaasBusinessCardVO extends IntegerIdentityVO {
    private String field;
    //类型
    @ApiModelProperty(value = "名片类型", example = "doctor")
    private SaasDO.Type type;
    private SaasBusinessCardDO.Type type;
    public String getSaasId() {
        return saasId;
@@ -40,11 +41,11 @@ public class SaasBusinessCardVO extends IntegerIdentityVO {
        this.field = field;
    }
    public SaasDO.Type getType() {
    public SaasBusinessCardDO.Type getType() {
        return type;
    }
    public void setType(SaasDO.Type type) {
    public void setType(SaasBusinessCardDO.Type type) {
        this.type = type;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasDefaultModuleFunctionVO.java

@@ -12,18 +12,18 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "SaasDefaultModuleFunctionVO", description = "Saas默认模块功能")
public class SaasDefaultModuleFunctionVO extends IntegerIdentityVO {
    @ApiModelProperty(value = "Saas类型", example = "familyDoctor")
    private SaasDO.Type saasType;
    @ApiModelProperty(value = "Saas类型编码（从1开始自增）", example = "1")
    private Integer saasType;
    @ApiModelProperty(value = "模块ID", example = "402303ee656498890234sf9ad2wa00sa")
    private String moduleId;
    @ApiModelProperty(value = "功能ID", example = "402303ee656498890sd24s9ad2wa00sd")
    private String functionId;
    public SaasDO.Type getSaasType() {
    public Integer getSaasType() {
        return saasType;
    }
    public void setSaasType(SaasDO.Type saasType) {
    public void setSaasType(Integer saasType) {
        this.saasType = saasType;
    }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasTypeDictVO.java

@@ -0,0 +1,47 @@
package com.yihu.jw.restmodel.base.saas;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.restmodel.UuidIdentityVOWithOperator;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by zdm on 2018/10/10.
 */
@ApiModel(value = "SaasTypeDictVO", description = "SAAS类型VO")
public class SaasTypeDictVO extends UuidIdentityVOWithOperator {
    @ApiModelProperty(value = "Saas类型编码", example = "familyDoctor")
    private String code;
    @ApiModelProperty(value = "Saas类型名称", example = "家医型")
    private String name;
    @ApiModelProperty(value = "状态（effective-生效中，invalid-已失效）", example = "effective")
    private SaasTypeDictDO.Status status;
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public SaasTypeDictDO.Status getStatus() {
        return status;
    }
    public void setStatus(SaasTypeDictDO.Status status) {
        this.status = status;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasVO.java

@@ -23,8 +23,8 @@ public class SaasVO extends UuidIdentityVOWithOperator {
	private String remark;
	@ApiModelProperty(value = "远程fastDFS文件地址", example = "group1:M00/97/E9/wKgyJltp1i-AHHf6AAAvRXBaR18423.zip")
	private String logo;
	@ApiModelProperty(value = "类型", example = "familyDoctor")
    private SaasDO.Type type;
	@ApiModelProperty(value = "类型（租户类型编码，从1开始自增）", example = "1")
    private Integer type;
	@ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
	private String manager;
	@ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
@@ -72,11 +72,11 @@ public class SaasVO extends UuidIdentityVOWithOperator {
		this.logo = logo;
	}
	public SaasDO.Type getType() {
	public Integer getType() {
		return type;
	}
	public void setType(SaasDO.Type type) {
	public void setType(Integer type) {
		this.type = type;
	}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/function/FunctionDao.java

@@ -2,7 +2,11 @@ package com.yihu.jw.base.dao.function;
import com.yihu.jw.entity.base.function.FunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
/**
 * Dao - 功能
@@ -10,4 +14,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface FunctionDao extends PagingAndSortingRepository<FunctionDO, String>, JpaSpecificationExecutor<FunctionDO> {
    @Query("select f from FunctionDO  f where f.moduleId in (:moduleId)")
    List<FunctionDO> findFunctionDOSByModuleIdExists(@Param("moduleId") String[] moduleId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDefaultModuleFunctionDao.java

@@ -13,5 +13,7 @@ import java.util.List;
 */
public interface SaasDefaultModuleFunctionDao extends PagingAndSortingRepository<SaasDefaultModuleFunctionDO, Integer>, JpaSpecificationExecutor<SaasDefaultModuleFunctionDO> {
    List<SaasDefaultModuleFunctionDO> findBySaasType(SaasDO.Type type);
    List<SaasDefaultModuleFunctionDO> findBySaasType(Integer saasType);
    void deleteBySaasType(Integer saasType);
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasTypeDictDao.java

@@ -0,0 +1,23 @@
package com.yihu.jw.base.dao.saas;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
/**
 * Created by zdm on 2018/10/10.
 */
public interface SaasTypeDictDao extends PagingAndSortingRepository<SaasTypeDictDO, String> {
    SaasTypeDictDO findByName(String name);
    SaasTypeDictDO findById(String id);
    @Query("select Max(code) from SaasTypeDictDO ")
    Integer findTopCode();
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/function/FunctionEndpoint.java

@@ -24,7 +24,7 @@ import java.util.List;
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Function.PREFIX)
@Api(value = "功能管理", description = "功能管理服务接口", tags = {"wlyy基础服务 - 功能管理服务接口"})
@Api(value = "功能（接口）管理", description = "功能（接口）管理服务接口", tags = {"wlyy基础服务 - 功能（接口）管理服务接口"})
public class FunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasTypeDictEndpoint.java

@@ -0,0 +1,120 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.saas.SaasDefaultModuleFunctionService;
import com.yihu.jw.base.service.saas.SaasService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;
import com.yihu.jw.base.service.user.UserService;
import com.yihu.jw.entity.base.saas.SaasDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.restmodel.base.saas.SaasTypeDictVO;
import com.yihu.jw.restmodel.base.saas.SaasVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Endpoint - SaasTypeDict
 * Created by zdm on 2018/10/10.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SaasTypeDict.PREFIX)
@Api(value = "Saas类型管理", description = "Saas类型管理服务接口", tags = {"wlyy基础服务 - Saas类型管理服务接口"})
public class SaasTypeDictEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasTypeDictService saasTypeDictService;
    @Autowired
    private SaasDefaultModuleFunctionService saasDefaultModuleFunctionService;
    @PostMapping(value = BaseRequestMapping.SaasTypeDict.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasTypeDictVO> create(
            @ApiParam(name = "saasTypeDictJson", value = "saas类型Json数据")
            @RequestParam(value = "saasTypeDictJson", required = true) String saasTypeDictJson,
            @ApiParam(name = "saasTypeDefaultModuleIds", value = "Saas类型默认的模块id,用逗号隔开")
            @RequestParam(value = "saasTypeDefaultModuleIds", required = true) String saasTypeDefaultModuleIds) throws Exception {
        SaasTypeDictDO saasTypeDictDO = toEntity(saasTypeDictJson, SaasTypeDictDO.class);
        //名称重复判断
        List<SaasTypeDictDO> saasTypeDictDOList = saasTypeDictService.findByField("name", saasTypeDictDO.getName());
        if (null != saasTypeDictDOList && saasTypeDictDOList.size() > 0) {
            return failed("租户类型名称重复！", ObjEnvelop.class);
        }
        saasTypeDictDO = saasTypeDictService.save(saasTypeDictDO, saasTypeDefaultModuleIds);
        return success("创建成功", saasTypeDictDO, SaasTypeDictVO.class);
    }
    @PostMapping(value = BaseRequestMapping.Saas.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<SaasTypeDictVO> update(
            @ApiParam(name = "saasTypeDictJson", value = "saas类型Json数据")
            @RequestParam(value = "saasTypeDictJson", required = true) String saasTypeDictJson,
            @ApiParam(name = "saasTypeDefaultModuleIds", value = "Saas类型默认的模块id,用逗号隔开")
            @RequestParam(value = "saasTypeDefaultModuleIds", required = true) String saasTypeDefaultModuleIds) throws Exception {
        SaasTypeDictDO saasTypeDictDO = toEntity(saasTypeDictJson, SaasTypeDictDO.class);
        if (null == saasTypeDictDO.getId()) {
            return failed("ID不能为空", ObjEnvelop.class);
        }
        if (saasTypeDictService.isSaasTypeDictExistByNameAndId(saasTypeDictDO.getId(),saasTypeDictDO.getName())) {
            return failed("租户类型名称重复！", ObjEnvelop.class);
        }
        //删除关联的模块
        saasDefaultModuleFunctionService.deleteBySaasType(saasTypeDictDO.getCode());
        saasTypeDictDO = saasTypeDictService.save(saasTypeDictDO, saasTypeDefaultModuleIds);
        return success("更新成功！", saasTypeDictDO, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SaasTypeDictVO> page(
            @ApiParam(name = "name", value = "租户类型名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "status", value = "设施状态：失效-invalid，生效effective")
            @RequestParam(value = "status", required = false) SaasTypeDictDO.Status status,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        StringBuffer s = new StringBuffer();
        if (StringUtils.isNotEmpty(name)) {
            s.append("name?" + name + "g1;");
        }
        if (null != status) {
            s.append("status=" + status);
        }
        //状态（生效中>已失效）>租户类型ID（租户类型ID降序排序，即最新创建的租户类型排在最前）
        String sorts = "-status,-id";
        String filters = s.toString();
        List<SaasTypeDictDO> saasTypeDictDOS = saasTypeDictService.search("", filters, sorts, page, size);
        int count = (int) saasTypeDictService.getCount(filters);
        return success(saasTypeDictDOS, count, page, size, SaasTypeDictVO.class);
    }
    @GetMapping(value = BaseRequestMapping.Saas.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SaasTypeDictVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<SaasTypeDictDO> saasTypeDictDOS = saasTypeDictService.search(fields, filters, sorts);
        return success(saasTypeDictDOS, SaasTypeDictVO.class);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasDefaultModuleFunctionService.java

@@ -1,8 +1,10 @@
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
import com.yihu.jw.base.dao.saas.SaasTypeDictDao;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -11,5 +13,10 @@ import org.springframework.stereotype.Service;
 */
@Service
public class SaasDefaultModuleFunctionService extends BaseJpaService<SaasDefaultModuleFunctionDO, SaasDefaultModuleFunctionDao> {
    @Autowired
    private SaasDefaultModuleFunctionDao saasDefaultModuleFunctionDao;
    public void deleteBySaasType(Integer saasType) {
        saasDefaultModuleFunctionDao.deleteBySaasType(saasType);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasTypeDictService.java

@@ -0,0 +1,97 @@
package com.yihu.jw.base.service.saas;
import com.yihu.jw.base.dao.function.FunctionDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasTypeDictDao;
import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
import com.yihu.jw.base.dao.saas.SaasModuleFunctionDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.dao.user.UserRoleDao;
import com.yihu.jw.entity.base.function.FunctionDO;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.saas.SaasTypeDictDO;
import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.base.user.UserRoleDO;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.utils.security.MD5;
import org.hibernate.SQLQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by zdm on 2018/10/10.
 */
@Service
@Transactional
public class SaasTypeDictService extends BaseJpaService<SaasTypeDictDO, SaasTypeDictDao> {
    @Autowired
    private SaasTypeDictDao saasTypeDictDao;
    @Autowired
    private FunctionDao functionDao;
    @Autowired
    private SaasDefaultModuleFunctionDao saasDefaultModuleFunctionDao;
    public SaasTypeDictDO save(SaasTypeDictDO saasTypeDictDO, String saasTypeDefaultModuleIds) {
        //初始化租户信息
        Integer code ;
        if (StringUtils.isEmpty(saasTypeDictDO.getId())) {
            //新增
            code = getNextSaasTypeDictCode();
            saasTypeDictDO.setCode(code);
        } else {
            //编辑
            code = saasTypeDictDO.getCode();
        }
        //根据moduleId获取模块关联的接口id
        String[] ids = saasTypeDefaultModuleIds.split(",");
        List<FunctionDO> functionDOList = functionDao.findFunctionDOSByModuleIdExists(ids);
        //初始化租户默认模块
        List<SaasDefaultModuleFunctionDO> saasDefaultModuleDOS = new ArrayList<>();
        functionDOList.forEach(item -> {
            SaasDefaultModuleFunctionDO saasDefaultModuleFunctionDO = new SaasDefaultModuleFunctionDO();
            saasDefaultModuleFunctionDO.setSaasType(code);
            saasDefaultModuleFunctionDO.setModuleId(item.getModuleId());
            saasDefaultModuleFunctionDO.setFunctionId(item.getId());
            saasDefaultModuleDOS.add(saasDefaultModuleFunctionDO);
        });
        //保存数据
        saasTypeDictDO = saasTypeDictDao.save(saasTypeDictDO);
        saasDefaultModuleFunctionDao.save(saasDefaultModuleDOS);
        return saasTypeDictDO;
    }
    /**
     * 获取当前最大租户编码+1
     *
     * @return
     */
    public Integer getNextSaasTypeDictCode() {
        return saasTypeDictDao.findTopCode() + 1;
    }
    /**
     * 验证
     *
     * @param id
     * @param name
     * @return
     */
    public boolean isSaasTypeDictExistByNameAndId(String id, String name) {
        String sql = "select count(1) from base_saas_type_dict  std where  std.name=:name and std.id!=:id";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("id", id);
        sqlQuery.setParameter("name", name);
        BigInteger count = (BigInteger) sqlQuery.uniqueResult();
        return count.compareTo(new BigInteger("0")) > 0;
    }
}

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

@@ -120,47 +120,50 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.GET_FACILITY_USED_RECORD_AND_COUNT_BY_ID)
    public ListEnvelop<FacilityUsedRecord> getFacilityUsedRecordAndCountById(
            @ApiParam(name = "userId", value = "用户ID", defaultValue = "")
            @RequestParam(value = "userId") String userId,
            @RequestParam(value = "userId", required = false) String userId,
            @ApiParam(name = "filters", value = "检索字段", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "nearbyFlag", value = "是否为“附近”的功能", defaultValue = "false")
            @RequestParam(value = "nearbyFlag") boolean nearbyFlag) throws Exception {
        List<FacilityUsedRecord> facilityUsedRecordList = new ArrayList<>();
        FacilityUsedRecord facilityUsedRecord;
        if (nearbyFlag) {
            if (StringUtils.isNotEmpty(filters)) {
                filters = "deleteFlag=0;status=0;" + "name?" + filters + " g1;cityName?" + filters + " g1;countyName?" + filters + " g1;street?" + filters + " g1;address?" + filters + " g1;";
        if (StringUtils.isNotEmpty(userId)) {
            if (nearbyFlag) {
                if (StringUtils.isNotEmpty(filters)) {
                    filters = "deleteFlag=0;status=0;" + "name?" + filters + " g1;cityName?" + filters + " g1;countyName?" + filters + " g1;street?" + filters + " g1;address?" + filters + " g1;";
                } else {
                    filters = "deleteFlag=0;status=0;";
                }
                //获取所有设施，并根据设施编码及用户id查找使用次数
                List<Facility> facilityList = facilityService.search(filters);
                for (Facility facility : facilityList) {
                    facilityUsedRecord = new FacilityUsedRecord();
                    facilityUsedRecord.setFacilitieCode(facility.getCode());
                    facilityUsedRecord.setFacilitieName(facility.getName());
                    facilityUsedRecord.setFacilitieLongitude(facility.getLongitude());
                    facilityUsedRecord.setFacilitieLatitudes(facility.getLatitude());
                    facilityUsedRecord.setFacilitieAddr(facility.getAddress());
                    facilityUsedRecord.setCreateUser(userId);
                    facilityUsedRecord.setUserId(userId);
                    facilityUsedRecord.setFacilitieId(facility.getId());
                    facilityUsedRecord.setFacilitieStatus(facility.getStatus());
                    long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facility.getCode(), userId);
                    facilityUsedRecord.setNum((int) count);
                    facilityUsedRecordList.add(facilityUsedRecord);
                }
            } else {
                filters = "deleteFlag=0;status=0;";
            }
            //获取所有设施，并根据设施编码及用户id查找使用次数
            List<Facility> facilityList = facilityService.search(filters);
            for (Facility facility : facilityList) {
                facilityUsedRecord = new FacilityUsedRecord();
                facilityUsedRecord.setFacilitieCode(facility.getCode());
                facilityUsedRecord.setFacilitieName(facility.getName());
                facilityUsedRecord.setFacilitieLongitude(facility.getLongitude());
                facilityUsedRecord.setFacilitieLatitudes(facility.getLatitude());
                facilityUsedRecord.setFacilitieAddr(facility.getAddress());
                facilityUsedRecord.setCreateUser(userId);
                facilityUsedRecord.setUserId(userId);
                facilityUsedRecord.setFacilitieId(facility.getId());
                facilityUsedRecord.setFacilitieStatus(facility.getStatus());
                long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facility.getCode(), userId);
                facilityUsedRecord.setNum((int) count);
                facilityUsedRecordList.add(facilityUsedRecord);
            }
        } else {
            //根据用户id,获取我的历史记录
            facilityUsedRecordList = facilityUsedRecordService.countDistinctByFacilitieCodeAndUserId(userId);
            for (FacilityUsedRecord facilityUsedRecord1 : facilityUsedRecordList) {
                long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facilityUsedRecord1.getFacilitieCode(), userId);
                facilityUsedRecord1.setNum((int) count);
                //获取设施状态
                Facility facility = facilityService.findByCode(facilityUsedRecord1.getFacilitieCode());
                facilityUsedRecord1.setFacilitieStatus(facility.getStatus());
                //根据用户id,获取我的历史记录
                facilityUsedRecordList = facilityUsedRecordService.countDistinctByFacilitieCodeAndUserId(userId);
                for (FacilityUsedRecord facilityUsedRecord1 : facilityUsedRecordList) {
                    long count = facilityUsedRecordService.countByFacilitieCodeAndUserId(facilityUsedRecord1.getFacilitieCode(), userId);
                    facilityUsedRecord1.setNum((int) count);
                    //获取设施状态
                    Facility facility = facilityService.findByCode(facilityUsedRecord1.getFacilitieCode());
                    facilityUsedRecord1.setFacilitieStatus(facility.getStatus());
                }
            }
        }
        return success(facilityUsedRecordList);
    }
@@ -168,16 +171,19 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FacilityUsedRecord.COUNT_FACILITY_USED_RECORD_BY_USERID)
    public ObjEnvelop<Long> getFacilityUsedRecords(
            @ApiParam(name = "userId", value = "登录用户id", defaultValue = "")
            @RequestParam(value = "userId") String userId,
            @RequestParam(value = "userId", required = false) String userId,
            @ApiParam(name = "facilitieCode", value = "设施id", defaultValue = "")
            @RequestParam(value = "facilitieCode", required = false) String facilitieCode) throws Exception {
        StringBuffer stringBuffer = new StringBuffer();
        stringBuffer.append("createUser=" + userId + ";");
        long count=0;
        if (StringUtils.isNotEmpty(facilitieCode)) {
            stringBuffer.append("facilitieCode=" + facilitieCode);
        }
        String filters = stringBuffer.toString();
        long count = facilityUsedRecordService.getCount(filters);
        if (StringUtils.isNotEmpty(userId)) {
            stringBuffer.append("createUser=" + userId + ";");
            String filters = stringBuffer.toString();
            count = facilityUsedRecordService.getCount(filters);
        }
        return success(count);
    }

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

@@ -63,6 +63,7 @@ public class FeedBackController extends EnvelopRestEndpoint {
            @ApiParam(name = "feedBack", value = "意见反馈JSON结构")
            @RequestBody FeedBack feedBack) throws IOException {
        feedBack.setFlag(1);
        feedBack.setReadFlag(1);
        feedBack = feedBackService.save(feedBack);
        return success(feedBack);
    }
@@ -93,6 +94,7 @@ public class FeedBackController extends EnvelopRestEndpoint {
        if (StringUtils.isNotEmpty(feedBackJson)) {
            FeedBack feedBack = toEntity(feedBackJson, FeedBack.class);
            feedBackOld.setFlag(2);
            feedBackOld.setReadFlag(0);
            feedBackOld.setReplyContent(feedBack.getReplyContent());
            feedBackOld.setUpdateUser(feedBack.getUpdateUser());
            feedBackOld.setUpdateUserName(feedBack.getUpdateUserName());
@@ -136,4 +138,26 @@ public class FeedBackController extends EnvelopRestEndpoint {
        feedBackService.exportUsersExcel(response, feedBackList);
    }
    @ApiOperation(value = "app端-获取意见反馈")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FeedBack.GET_APP_FEEDBACK_BY_ID)
    public ObjEnvelop<FeedBack> getAppFeedBack(
            @ApiParam(name = "id", value = "意见反馈ID", defaultValue = "")
            @RequestParam(value = "id") String id) throws Exception {
        FeedBack feedBack = feedBackService.findById(id);
        if (feedBack == null) {
            return failed("意见反馈不存在！", ObjEnvelop.class);
        }
        feedBack.setReadFlag(1);
        return success(feedBack);
    }
    @ApiOperation(value = "app端-根据用户id获取未读的意见反馈")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FeedBack.GET_APP_FEEDBACK_BY_USER_ID_AND_READFLAG)
    public ObjEnvelop<Boolean> getAppFeedBackByUserIdAndReadFlag(
            @ApiParam(name = "userId", value = "登录用户ID", defaultValue = "")
            @RequestParam(value = "userId") String userId) throws Exception {
        Boolean readFlag = feedBackService.getAppFeedBackByUserIdAndReadFlag(userId);
        return success(readFlag);
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/FeedBack.java

@@ -48,6 +48,9 @@ public class FeedBack extends UuidIdentityEntityWithOperator {
    //上传附件地址(多张图片地址，用逗号隔开)
    @Column(name = "pig_path", nullable = false)
    private String  pigPath;
    //是否已读
    @Column(name = "read_flag", nullable = false)
    private Integer  readFlag;
    //反馈类型，1建议、2投诉、3报修、4其他
    private String  feedTypeValue;
@@ -159,4 +162,12 @@ public class FeedBack extends UuidIdentityEntityWithOperator {
    public void setEnclosureFlagValue(String enclosureFlagValue) {
        this.enclosureFlagValue = enclosureFlagValue;
    }
    public Integer getReadFlag() {
        return readFlag;
    }
    public void setReadFlag(Integer readFlag) {
        this.readFlag = readFlag;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/FeedBackService.java

@@ -11,6 +11,7 @@ import jxl.write.Colour;
import jxl.write.WritableCellFormat;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.hibernate.SQLQuery;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.math.BigInteger;
import java.util.List;
/**
@@ -118,4 +120,19 @@ public class FeedBackService extends BaseJpaService<FeedBack, FeedBackDao> {
        }
    }
    /**
     * 统计
     *
     * @param userId
     * @return
     */
    public boolean getAppFeedBackByUserIdAndReadFlag(String userId) {
        String sql = "select count(1) from feedback  f where  f.create_user=:userId and f.read_flag=0";
        SQLQuery sqlQuery = currentSession().createSQLQuery(sql);
        sqlQuery.setParameter("userId", userId);
        BigInteger count = (BigInteger) sqlQuery.uniqueResult();
        return count.compareTo(new BigInteger("0")) > 0;
    }
}