Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

代码修改

LAPTOP-KB9HII50\70708 3 months ago
parent
42cb540405
commit
9e7e6f9870
8 changed files with 121 additions and 173 deletions
Split View Show Diff Stats
  1. 32 32
      business/base-service/src/main/java/com/yihu/jw/device/dao/DeviceDetailDao.java
  2. 10 10
      business/base-service/src/main/java/com/yihu/jw/device/dao/DevicePatientHealthIndexDao.java
  3. 75 75
      business/base-service/src/main/java/com/yihu/jw/device/dao/PatientDeviceDao.java
  4. 2 2
      svr/svr-cloud-device/pom.xml
  5. 1 2
      svr/svr-cloud-device/src/main/java/com/yihu/SvrCloudDeviceApplication.java
  6. 0 17
      svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/YsDeviceService.java
  7. 0 35
      svr/svr-cloud-device/src/main/java/com/yihu/jw/care/util/MessageUtil.java
  8. 1 0
      svr/svr-cloud-device/src/main/resources/application.yml

+ 32 - 32
business/base-service/src/main/java/com/yihu/jw/device/dao/DeviceDetailDao.java
View File 

@ -1,32 +1,32 @@
 
package com.yihu.jw.device.dao;
 
import com.yihu.jw.entity.care.device.DeviceDetail;
 
import org.springframework.data.jpa.repository.JpaRepository;
 
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
import org.springframework.data.jpa.repository.Query;
 
import java.util.List;
 
/**
 
 * @author yeshijie on 2018/1/10.
 
 */
 
public interface DeviceDetailDao extends JpaRepository<DeviceDetail, Long>, JpaSpecificationExecutor<DeviceDetail> {
 
    @Query(value = "select a.* from wlyy_devices a where a.device_code=?1 limit 0,1",nativeQuery = true)
 
    DeviceDetail findBySn(String sn);
 
    List<DeviceDetail> findByDeviceCode(String deviceCode);
 
    @Query("select a from DeviceDetail a where a.deviceCode = ?1 and a.manufacturerCode = ?2")
 
    DeviceDetail findByDeviceCodeAndManufacturerCode(String deviceCode,String manufacturerCode);
 
    @Query("select a from DeviceDetail a where a.sim = ?1")
 
    List<DeviceDetail> findBySim(String sim);
 
    @Query("select a from DeviceDetail a where a.iccid = ?1")
 
    List<DeviceDetail> findByIccid(String iccid);
 
    @Query("select a from DeviceDetail a where a.imsi = ?1")
 
    List<DeviceDetail> findByImsi(String sim);
 
}
 
//package com.yihu.jw.device.dao;
 
//
 
//import com.yihu.jw.entity.care.device.DeviceDetail;
 
//import org.springframework.data.jpa.repository.JpaRepository;
 
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
//import org.springframework.data.jpa.repository.Query;
 
//
 
//import java.util.List;
 
//
 
///**
 
// * @author yeshijie on 2018/1/10.
 
// */
 
//public interface DeviceDetailDao extends JpaRepository<DeviceDetail, Long>, JpaSpecificationExecutor<DeviceDetail> {
 
//
 
//    @Query(value = "select a.* from wlyy_devices a where a.device_code=?1 limit 0,1",nativeQuery = true)
 
//    DeviceDetail findBySn(String sn);
 
//
 
//    List<DeviceDetail> findByDeviceCode(String deviceCode);
 
//
 
//    @Query("select a from DeviceDetail a where a.deviceCode = ?1 and a.manufacturerCode = ?2")
 
//    DeviceDetail findByDeviceCodeAndManufacturerCode(String deviceCode,String manufacturerCode);
 
//
 
//    @Query("select a from DeviceDetail a where a.sim = ?1")
 
//    List<DeviceDetail> findBySim(String sim);
 
//
 
//    @Query("select a from DeviceDetail a where a.iccid = ?1")
 
//    List<DeviceDetail> findByIccid(String iccid);
 
//
 
//    @Query("select a from DeviceDetail a where a.imsi = ?1")
 
//    List<DeviceDetail> findByImsi(String sim);
 
//
 
//}

+ 10 - 10
business/base-service/src/main/java/com/yihu/jw/device/dao/DevicePatientHealthIndexDao.java
View File 

@ -1,10 +1,10 @@
 
package com.yihu.jw.device.dao;
 
import com.yihu.jw.entity.care.device.DevicePatientHealthIndex;
 
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
import org.springframework.data.repository.PagingAndSortingRepository;
 
public interface DevicePatientHealthIndexDao
 
		extends PagingAndSortingRepository<DevicePatientHealthIndex, Long>, JpaSpecificationExecutor<DevicePatientHealthIndex> {
 
}
 
//package com.yihu.jw.device.dao;
 
//
 
//import com.yihu.jw.entity.care.device.DevicePatientHealthIndex;
 
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
//import org.springframework.data.repository.PagingAndSortingRepository;
 
//
 
//public interface DevicePatientHealthIndexDao
 
//		extends PagingAndSortingRepository<DevicePatientHealthIndex, Long>, JpaSpecificationExecutor<DevicePatientHealthIndex> {
 
//
 
//}

+ 75 - 75
business/base-service/src/main/java/com/yihu/jw/device/dao/PatientDeviceDao.java
View File 

@ -1,75 +1,75 @@
 
package com.yihu.jw.device.dao;
 
import com.yihu.jw.entity.care.device.DevicePatientDevice;
 
import org.springframework.data.domain.Pageable;
 
import org.springframework.data.jpa.repository.JpaRepository;
 
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
import org.springframework.data.jpa.repository.Modifying;
 
import org.springframework.data.jpa.repository.Query;
 
import java.util.List;
 
public interface PatientDeviceDao extends JpaRepository<DevicePatientDevice, Long>, JpaSpecificationExecutor<DevicePatientDevice> {
 
    @Query("select a from DevicePatientDevice a where a.user = ?1 ")
 
    Iterable<DevicePatientDevice> findByUser(String user);
 
    @Query("select a from DevicePatientDevice a where a.del = 0 ")
 
    List<DevicePatientDevice> findByAll();
 
    @Query("select a from DevicePatientDevice a where a.user = ?1 ")
 
    List<DevicePatientDevice> findByPatient(String user);
 
    @Query("select a from DevicePatientDevice a where a.user = ?1 and a.del=0 and a.deviceName like '%药盒%'")
 
    List<DevicePatientDevice> findByPatientAndDel(String user);
 
    @Query("select a from DevicePatientDevice a where a.user = ?1 and a.deviceSn=?2 ")
 
    List<DevicePatientDevice> findByPatientAndDeviceSn(String user, String deviceSn);
 
    List<DevicePatientDevice> findByUser(String user, Pageable pageRequest);
 
    List<DevicePatientDevice> findByUserAndDoctor(String user, String doctor, Pageable pageRequest);
 
    List<DevicePatientDevice> findByDeviceSnAndCategoryCode(String deviceSn, String categoryCode);
 
    DevicePatientDevice findByDeviceSnAndCategoryCodeAndUserType(String deviceSn, String categoryCode, String userType);
 
    DevicePatientDevice findByDeviceIdAndDeviceSnAndUserType(Long deviceId, String deviceSn, String userType);
 
    DevicePatientDevice findByDeviceSnAndUserType(String deviceSn, String userType);
 
    @Query("select pd from DevicePatientDevice pd where pd.deviceSn = ?1 and pd.del=0")
 
    List<DevicePatientDevice> findByDeviceSn(String deviceSn);
 
    //更换患者绑定的血糖仪
 
    @Modifying
 
    @Query("update DevicePatientDevice t set t.deviceSn = ?3 , t.userType = ?4,t.sim=?5,t.hospital=?6,t.hospitalName=?7,t.checkDoctorName=?8 where t.user = ?1 and t.deviceSn = ?2 ")
 
    int updatePatientDevice(String user, String deviceSN, String newDeviceSN, String userType, String sim, String hospital, String hospitalName, String checkDoctorName);
 
    //管理员解绑居民设备
 
    @Modifying
 
    @Query("update DevicePatientDevice t set t.del = 1  where t.deviceSn = ?1 and t.del =0  ")
 
    int updatePatientDevice(String deviceSN);
 
    @Query("select a from DevicePatientDevice a")
 
    List<DevicePatientDevice> findAll();
 
    @Query("select a from DevicePatientDevice a group by a.user")
 
    List<DevicePatientDevice> findAllGroupUser();
 
    @Query("select a from DevicePatientDevice a where a.categoryCode = ?1 and a.del=0 group by a.user")
 
    List<DevicePatientDevice> findAllByCategoryCode(String categoryCode);
 
    @Modifying
 
    @Query("delete DevicePatientDevice a where a.deviceSn = ?1")
 
    int deleteByDeviceSn(String deviceSN);
 
    @Query("select a from DevicePatientDevice a where a.user=?1 and a.del=0")
 
    List<DevicePatientDevice> findAllByUser(String user);
 
    @Query("select a from DevicePatientDevice a where a.user=?1 and a.categoryCode =?2 and a.del=0")
 
    List<DevicePatientDevice> findAllByUserAndCategoryCode(String user,String categoryCode);
 
    @Query("select a from DevicePatientDevice a where a.user=?1 and a.categoryCode =?2 and a.del=0")
 
    List<DevicePatientDevice> findByUserAndCategoryCode(String user,String categoryCode);
 
}
 
//package com.yihu.jw.device.dao;
 
//
 
//import com.yihu.jw.entity.care.device.DevicePatientDevice;
 
//import org.springframework.data.domain.Pageable;
 
//import org.springframework.data.jpa.repository.JpaRepository;
 
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
//import org.springframework.data.jpa.repository.Modifying;
 
//import org.springframework.data.jpa.repository.Query;
 
//
 
//import java.util.List;
 
//
 
//public interface PatientDeviceDao extends JpaRepository<DevicePatientDevice, Long>, JpaSpecificationExecutor<DevicePatientDevice> {
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user = ?1 ")
 
//    Iterable<DevicePatientDevice> findByUser(String user);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.del = 0 ")
 
//    List<DevicePatientDevice> findByAll();
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user = ?1 ")
 
//    List<DevicePatientDevice> findByPatient(String user);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user = ?1 and a.del=0 and a.deviceName like '%药盒%'")
 
//    List<DevicePatientDevice> findByPatientAndDel(String user);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user = ?1 and a.deviceSn=?2 ")
 
//    List<DevicePatientDevice> findByPatientAndDeviceSn(String user, String deviceSn);
 
//
 
//    List<DevicePatientDevice> findByUser(String user, Pageable pageRequest);
 
//
 
//    List<DevicePatientDevice> findByUserAndDoctor(String user, String doctor, Pageable pageRequest);
 
//
 
//    List<DevicePatientDevice> findByDeviceSnAndCategoryCode(String deviceSn, String categoryCode);
 
//
 
//    DevicePatientDevice findByDeviceSnAndCategoryCodeAndUserType(String deviceSn, String categoryCode, String userType);
 
//
 
//    DevicePatientDevice findByDeviceIdAndDeviceSnAndUserType(Long deviceId, String deviceSn, String userType);
 
//
 
//    DevicePatientDevice findByDeviceSnAndUserType(String deviceSn, String userType);
 
//
 
//    @Query("select pd from DevicePatientDevice pd where pd.deviceSn = ?1 and pd.del=0")
 
//    List<DevicePatientDevice> findByDeviceSn(String deviceSn);
 
//
 
//    //更换患者绑定的血糖仪
 
//    @Modifying
 
//    @Query("update DevicePatientDevice t set t.deviceSn = ?3 , t.userType = ?4,t.sim=?5,t.hospital=?6,t.hospitalName=?7,t.checkDoctorName=?8 where t.user = ?1 and t.deviceSn = ?2 ")
 
//    int updatePatientDevice(String user, String deviceSN, String newDeviceSN, String userType, String sim, String hospital, String hospitalName, String checkDoctorName);
 
//
 
//    //管理员解绑居民设备
 
//    @Modifying
 
//    @Query("update DevicePatientDevice t set t.del = 1  where t.deviceSn = ?1 and t.del =0  ")
 
//    int updatePatientDevice(String deviceSN);
 
//
 
//    @Query("select a from DevicePatientDevice a")
 
//    List<DevicePatientDevice> findAll();
 
//
 
//    @Query("select a from DevicePatientDevice a group by a.user")
 
//    List<DevicePatientDevice> findAllGroupUser();
 
//
 
//    @Query("select a from DevicePatientDevice a where a.categoryCode = ?1 and a.del=0 group by a.user")
 
//    List<DevicePatientDevice> findAllByCategoryCode(String categoryCode);
 
//
 
//    @Modifying
 
//    @Query("delete DevicePatientDevice a where a.deviceSn = ?1")
 
//    int deleteByDeviceSn(String deviceSN);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user=?1 and a.del=0")
 
//    List<DevicePatientDevice> findAllByUser(String user);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user=?1 and a.categoryCode =?2 and a.del=0")
 
//    List<DevicePatientDevice> findAllByUserAndCategoryCode(String user,String categoryCode);
 
//
 
//    @Query("select a from DevicePatientDevice a where a.user=?1 and a.categoryCode =?2 and a.del=0")
 
//    List<DevicePatientDevice> findByUserAndCategoryCode(String user,String categoryCode);
 
//}

+ 2 - 2
svr/svr-cloud-device/pom.xml
View File 

@ -81,7 +81,7 @@
 
        </dependency>
 
        <!-- Jzkl Starter -->
 
        <dependency>
 
            <groupId>com.yihu</groupId>
 
            <groupId>com.yihu.jw</groupId>
 
            <artifactId>swagger-starter</artifactId>
 
            <version>2.0.0</version>
 
        </dependency>
 
@ -172,7 +172,7 @@
 
    </dependencies>
 
    <build>
 
        <finalName>svr-cloud-device-test</finalName>
 
        <finalName>svr-cloud-device</finalName>
 
        <plugins>
 
            <plugin>
 
                <groupId>org.apache.maven.plugins</groupId>

+ 1 - 2
svr/svr-cloud-device/src/main/java/com/yihu/SvrCloudDeviceApplication.java
View File 

@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
import org.springframework.boot.builder.SpringApplicationBuilder;
 
import org.springframework.boot.web.support.SpringBootServletInitializer;
 
import org.springframework.context.annotation.Bean;
 
import org.springframework.context.annotation.ComponentScan;
 
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
import org.springframework.scheduling.annotation.EnableAsync;
 
import org.springframework.web.client.RestTemplate;
 
@ -20,7 +19,7 @@ import org.springframework.web.client.RestTemplate;
 
@SpringBootApplication
 
@EnableJpaAuditing
 
@EnableAsync
 
@ComponentScan("com.yihu")
 
//@ComponentScan("com.yihu")
 
public class SvrCloudDeviceApplication extends SpringBootServletInitializer {
 
    public static void main(String[] args)  {

+ 0 - 17
svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/YsDeviceService.java
View File 

@ -3,16 +3,13 @@ package com.yihu.jw.care.service;
 
import com.alibaba.fastjson.JSONArray;
 
import com.alibaba.fastjson.JSONObject;
 
import com.alibaba.fastjson.serializer.SerializerFeature;
 
import com.yihu.fastdfs.FastDFSUtil;
 
import com.yihu.jw.care.config.YsConfig;
 
import com.yihu.jw.care.dao.device.DeviceDetailDao;
 
import com.yihu.jw.care.dao.device.DPatientDeviceDao;
 
import com.yihu.jw.care.dao.device.YsConfigDao;
 
import com.yihu.jw.care.util.DeviceDataPushLogUtil;
 
import com.yihu.jw.care.util.SecurityOrderUtil;
 
import com.yihu.jw.entity.care.device.DeviceDetail;
 
import com.yihu.jw.entity.care.device.YsConfigDo;
 
import com.yihu.jw.patient.dao.BasePatientDao;
 
import com.yihu.jw.restmodel.iot.common.UploadVO;
 
import com.yihu.jw.util.http.HttpClientUtil;
 
import com.yihu.jw.utils.encode.Base64;
 
@ -21,11 +18,9 @@ import org.apache.http.entity.ContentType;
 
import org.slf4j.Logger;
 
import org.slf4j.LoggerFactory;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.data.redis.core.StringRedisTemplate;
 
import org.springframework.http.HttpEntity;
 
import org.springframework.http.HttpMethod;
 
import org.springframework.jdbc.core.JdbcTemplate;
 
import org.springframework.mock.web.MockMultipartFile;
 
import org.springframework.scheduling.annotation.Async;
 
import org.springframework.stereotype.Service;
 
@ -53,21 +48,9 @@ public class YsDeviceService {
 
    private static Logger logger = LoggerFactory.getLogger(YsDeviceService.class);
 
    private Map<String,String> msgType = new HashMap<>();
 
    @Value("${cloudCare.url}")
 
    private String cloudCareUrl;
 
    @Autowired
 
    private DPatientDeviceDao DPatientDeviceDao;
 
    @Autowired
 
    private BasePatientDao patientDao;
 
    @Autowired
 
    private JdbcTemplate jdbcTemplate;
 
    @Autowired
 
    private HttpClientUtil httpClientUtil;
 
    @Autowired
 
    private FastDFSUtil fastDFSHelper;
 
    @Value("${fastDFS.fastdfs_file_url}")
 
    private String fastdfs_file_url;
 
    @Autowired
 
    private SecurityOrderUtil orderUtil;
 
    @Autowired
 
    private StringRedisTemplate redisTemplate;

+ 0 - 35
svr/svr-cloud-device/src/main/java/com/yihu/jw/care/util/MessageUtil.java
View File 

@ -8,7 +8,6 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
 
import com.yihu.jw.entity.base.org.BaseOrgDO;
 
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
 
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
 
import com.yihu.jw.entity.care.common.GetuiClientDO;
 
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
 
import com.yihu.jw.entity.care.lifeCare.LifeCareOrderDO;
 
import com.yihu.jw.entity.care.securitymonitoring.SecurityMonitoringOrderDO;
 
@ -16,8 +15,6 @@ import com.yihu.jw.entity.hospital.message.SystemMessageDO;
 
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
 
import com.yihu.jw.org.dao.BaseOrgDao;
 
import com.yihu.jw.patient.dao.BasePatientDao;
 
import com.yihu.jw.push.dao.GetuiClientDao;
 
import com.yihu.jw.push.service.GetuiService;
 
import com.yihu.jw.sms.service.TXYSmsService;
 
import com.yihu.jw.util.wechat.WeixinMessagePushUtils;
 
import com.yihu.jw.wechat.dao.WxAccessTokenDao;
 
@ -68,10 +65,6 @@ public class MessageUtil {
 
    private BaseOrgDao orgDao;
 
    @Autowired
 
    private TXYSmsService txySmsService;
 
    @Autowired
 
    private GetuiService getuiService;
 
    @Autowired
 
    private GetuiClientDao getuiClientDao;
 
    /**
 
     * 您好{1}有一条新的在线报名申请，请及时前往APP消息应用进行处理。
 
@ -85,34 +78,6 @@ public class MessageUtil {
 
        }
 
    }
 
    /**
 
     * 发送医生个推推送消息
 
     * type 1 安防紧急预警 2紧急呼叫 4im 5生日祝福
 
     */
 
    public void sendDoctorGetuiMessage(String doctorCode,String type,String url,String title,String body){
 
        try {
 
            List<GetuiClientDO> clientDOS = getuiClientDao.findByUser(doctorCode,2);
 
            JSONObject payload = new JSONObject();
 
            payload.put("title",title);
 
            payload.put("body",body);
 
            payload.put("url",url);
 
            JSONObject json = new JSONObject();
 
            json.put("title",title);
 
            json.put("body",body);
 
            json.put("url",url);
 
//        json.put("clickType","url");
 
            json.put("platform",getuiService.cloudCareDoctor);
 
            json.put("payload",payload.toString());
 
            for(GetuiClientDO clientDO:clientDOS){
 
                getuiService.push2(clientDO.getClientId(),Integer.valueOf(clientDO.getClientType()),json);
 
            }
 
        }catch (Exception e){
 
            e.printStackTrace();
 
        }
 
    }
 
    /**
 
     *
 
     * @param wechatId

+ 1 - 0
svr/svr-cloud-device/src/main/resources/application.yml
View File 

@ -198,6 +198,7 @@ spring:
 
  redis:
 
    host: 172.26.0.253 # Redis server host.
 
    port: 6379 # Redis server port.
 
    password: Kb6wKDQP1W4
 
fastDFS:
 
  fastdfs_file_url: http://172.26.0.110:8888/
 
fast-dfs: