Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/care/common/GetuiClientDO.java

@@ -30,6 +30,11 @@ public class GetuiClientDO extends UuidIdentityEntityWithCreateTime {
     */
    private String clientId;
    /**
     * 类型1 安卓 2ios
     */
    private String clientType;
    @Column(name = "user")
    public String getUser() {
        return user;
@@ -56,4 +61,13 @@ public class GetuiClientDO extends UuidIdentityEntityWithCreateTime {
    public void setClientId(String clientId) {
        this.clientId = clientId;
    }
    @Column(name = "client_type")
    public String getClientType() {
        return clientType;
    }
    public void setClientType(String clientType) {
        this.clientType = clientType;
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -652,7 +652,7 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
     * @param loginType
     * @param id
     */
    public void updateInfo(String clientId,String padImei,String loginType,String id,BaseLoginLogDO baseLoginLogDO){
    public void updateInfo(String clientId,String clientType,String padImei,String loginType,String id,BaseLoginLogDO baseLoginLogDO){
        int isPateint = isPatient(loginType);
        if(StringUtils.isNotBlank(padImei)){
            try {
@@ -665,11 +665,12 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
        }
        if(StringUtils.isNotBlank(clientId)&&isPateint<3){
            try {
                List<GetuiClientDO> list = baseGetuiClientDao.findByUser(id,isPateint,clientId);
                List<GetuiClientDO> list = baseGetuiClientDao.findByUser(id,isPateint,clientId,clientType);
                if(list.size() == 0){
                    GetuiClientDO getuiClientDO = new GetuiClientDO();
                    getuiClientDO.setClientId(clientId);
                    getuiClientDO.setType(isPateint);
                    getuiClientDO.setClientType(clientType);
                    getuiClientDO.setUser(id);
                    getuiClientDO.setCreateTime(new Date());
                    baseGetuiClientDao.save(getuiClientDO);

server/svr-authentication/src/main/java/com/yihu/jw/security/dao/patient/BaseGetuiClientDao.java

@@ -17,6 +17,6 @@ import java.util.List;
 */
public interface BaseGetuiClientDao extends PagingAndSortingRepository<GetuiClientDO, String>, JpaSpecificationExecutor<GetuiClientDO> {
    @Query("from GetuiClientDO p where p.user = ?1 and p.type=?2 and p.clientId=?3")
    List<GetuiClientDO> findByUser(String user, Integer type,String clientId);
    @Query("from GetuiClientDO p where p.user = ?1 and p.type=?2 and p.clientId=?3 and p.clientType=?4")
    List<GetuiClientDO> findByUser(String user, Integer type,String clientId,String clientType);
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -384,9 +384,10 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        //个推 clientId
        String clientId = parameters.get("getuiClientId");
        String getuiClientType = parameters.get("getuiClientType");
        String padImei = parameters.get("padImei");
        //客户端类型 app,wx,pad,pc
        userDetailsService.updateInfo(clientId,padImei,loginType,wlyyUserSimple.getId(),baseLoginLogDO);
        userDetailsService.updateInfo(clientId,getuiClientType,padImei,loginType,wlyyUserSimple.getId(),baseLoginLogDO);
        return getResponse(wlyyUserSimple);
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -1697,23 +1697,33 @@ public class MonitorPlatformService {
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospital)) {
            allCountSql += " and grant_org_code =" + hospital + "  ";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceType) && (deviceType.contains("1") || deviceType.contains("2"))) {
            Integer allCount = jdbcTemplate.queryForObject(allCountSql, Integer.class);//单体征总数
            totalAll += allCount;
            StringBuffer sql = new StringBuffer("SELECT COUNT(*) from wlyy.wlyy_patient_device d,wlyy.wlyy_sign_family f  WHERE 1=1 and f.`status`>0 and d.del=0 and f.patient = d.`user` ");
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(area)) {
                sql.append(" and f.hospital in (SELECT dh.code from wlyy.dm_hospital dh where dh.town ='" + area + "' and dh.del =1 )  ");
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospital)) {
                sql.append(" and d.hospital =" + hospital + "  ");
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceType)) {
            String deviceTypes[] = deviceType.split(",");
            boolean flag = false;
            for(String type : deviceTypes){
                if("1".equals(type)||"2".equals(type)){
                    flag = true;
                    break;
                }
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime) && org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)) {
                sql.append(" and d.czrq <='" + endTime + " 23:59:59'  ");
            if(flag){
                Integer allCount = jdbcTemplate.queryForObject(allCountSql, Integer.class);//单体征总数
                totalAll += allCount;
                StringBuffer sql = new StringBuffer("SELECT COUNT(*) from wlyy.wlyy_patient_device d,wlyy.wlyy_sign_family f  WHERE 1=1 and f.`status`>0 and d.del=0 and f.patient = d.`user` ");
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(area)) {
                    sql.append(" and f.hospital in (SELECT dh.code from wlyy.dm_hospital dh where dh.town ='" + area + "' and dh.del =1 )  ");
                }
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospital)) {
                    sql.append(" and d.hospital =" + hospital + "  ");
                }
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime) && org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)) {
                    sql.append(" and d.czrq <='" + endTime + " 23:59:59'  ");
                }
                sql.append("and d.category_code in ('").append(deviceType.replace(",", "','")).append("') ");
                Integer count = jdbcTemplate.queryForObject(sql.toString(), Integer.class);//发放总数
                grant += count;
            }
            sql.append("and d.category_code in ('").append(deviceType.replace(",", "','")).append("') ");
            Integer count = jdbcTemplate.queryForObject(sql.toString(), Integer.class);//发放总数
            grant += count;
        }