1.12.0代码合并

src/main/java/com.yihu.ehr/basic/device/service/DeviceService.java

@@ -46,17 +46,19 @@ public class DeviceService extends BaseJpaService<Device, DeviceDao> {
                }
                if("进口".equals(map.get("originPlace").toString())){
                    device.setOriginPlace("1");
                }else{
                }else if("国产/合资".equals(map.get("originPlace").toString())){
                    device.setOriginPlace("2");
                }
                device.setManufacturerName(map.get("manufacturerName").toString());
                device.setDeviceModel(map.get("deviceModel").toString());
                device.setPurchaseTime(DateUtil.strToDate(map.get("purchaseTime").toString(),"yyyy-MM-dd"));
                if("新设备".equals(map.get("isNew").toString())){
                    device.setIsNew("1");
                }else{
                }else if("二手设备".equals(map.get("isNew").toString())){
                    device.setIsNew("2");
                }
                if(null!=map.get("devicePrice")){
                    device.setDevicePrice(Double.valueOf(map .get("devicePrice").toString()));
                }
@@ -68,14 +70,16 @@ public class DeviceService extends BaseJpaService<Device, DeviceDao> {
                    device.setStatus("1");
                }else if("未启用".equals(map.get("status").toString())){
                    device.setStatus("2");
                }else{
                }else if("报废".equals(map.get("status").toString())){
                    device.setStatus("3");
                }
                if("是".equals(map.get("isGps").toString())){
                    device.setIsGps("1");
                }else{
                }else if("否".equals(map.get("isGps").toString())){
                    device.setIsGps("0");
                }
                device.setCreator(map.get("creator").toString());
                deviceDao.save(device);
            }

src/main/java/com.yihu.ehr/basic/government/dao/GovernmentBrowseLogRepository.java

@@ -12,9 +12,11 @@ import java.util.List;
 */
public interface GovernmentBrowseLogRepository extends PagingAndSortingRepository<GovernmentBrowseLog, Integer> {
    @Query(value = "select gbl.* from Government_Browse_Log gbl where gbl.user_Id = :userId order by gbl.create_Time desc limit 5", nativeQuery = true)
    @Query(value = "select gbl.* from Government_Browse_Log gbl where gbl.user_Id = :userId order by gbl.create_Time desc", nativeQuery = true)
    List<GovernmentBrowseLog> findByUserId(@Param("userId") String userId);
    @Query(value = "select gbl.resource_id from Government_Browse_Log gbl group by gbl.resource_id order by count(gbl.resource_id) desc limit 5", nativeQuery = true)
    List<String> getSortByCode();
    List<GovernmentBrowseLog> findByResourceId(@Param("resourceId") String resourceId);
}

src/main/java/com.yihu.ehr/basic/government/service/GovernmentBrowseLogService.java

@@ -32,14 +32,31 @@ public class GovernmentBrowseLogService extends BaseJpaService<GovernmentBrowseL
    public List<GovernmentBrowseLog> getBrowseName(String userId) {
        String sql = "select show_type from rs_report where code = ?";
        List<GovernmentBrowseLog> list = governmentBrowseLogRepository.findByUserId(userId);
        for (GovernmentBrowseLog governmentBrowseLog : list) {
            List<MRsReport> query = jdbcTmeplate.query(sql, new BeanPropertyRowMapper(MRsReport.class), governmentBrowseLog.getResourceId());
            if (null != query && query.size() > 0) {
                governmentBrowseLog.setShowType(query.get(0).getShowType());
        List<String> arrayList = new ArrayList();
        if (null != list && list.size() > 0) {
            list.forEach(item -> {
                if (arrayList.size() < 5) {
                    if (!arrayList.contains(item.getResourceId())) {
                        arrayList.add(item.getResourceId());
                    }
                }
            });
        }
        List<GovernmentBrowseLog> govList = new ArrayList<>();
        if (arrayList.size() > 0) {
            for (String code : arrayList) {
                List<GovernmentBrowseLog> governmentBrowseLogs = governmentBrowseLogRepository.findByResourceId(code);
                if (null != governmentBrowseLogs && governmentBrowseLogs.size() > 0) {
                    GovernmentBrowseLog governmentBrowseLog = governmentBrowseLogs.get(0);
                    List<MRsReport> query = jdbcTmeplate.query(sql, new BeanPropertyRowMapper(MRsReport.class), governmentBrowseLog.getResourceId());
                    if (null != query && query.size() > 0) {
                        governmentBrowseLog.setShowType(query.get(0).getShowType());
                    }
                    govList.add(governmentBrowseLog);
                }
            }
        }
        return list;
        return govList;
    }
    public List getHotBrowseLog() {