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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/file_upload/FileUploadService.java
#	common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

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

@@ -206,6 +206,7 @@ public class BaseRequestMapping {
        public static final String findDoctorOtherIncentive  = "/findDoctorOtherIncentive";
        public static final String removeIncentive  = "/removeIncentive";
        public static final String resetDoctorPwd  = "/resetDoctorPwd";
        public static final String  findMediicinecabinetInventoryByDeviceId = "/findMediicinecabinetInventoryByDeviceId";
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinecabinetInventoryDao.java

@@ -2,10 +2,22 @@ package com.yihu.jw.base.dao.a2dao;
import com.yihu.jw.entity.a1entity.MediicinecabinetInventory;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository<MediicinecabinetInventory, String> {
import java.util.List;
import java.util.Map;
public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository<MediicinecabinetInventory, String>, JpaSpecificationExecutor<MediicinecabinetInventory> {
    MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
    @Query("from MediicinecabinetInventory t where  t.idDevice=?1")
    List<MediicinecabinetInventory> findMediicinecabinetInventoryByDeviceId(String deviceId);
    @Query("select layerNo as layerNo from MediicinecabinetInventory where idDevice=?1 group by layerNo")
    List<Map<String,Object>> selectByDeviceIdGroup(String  deviceId);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -363,4 +363,13 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.findMediicinecabinetInventoryByDeviceId)
    @ApiOperation(value = "根据设备id查询设备轨道数据" , notes="根据设备id查询设备轨道数据")
    public ListEnvelop selectById(
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId) throws Exception {
        return success(deviceService.selectById(deviceId));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -1,22 +1,17 @@
package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.a2dao.MedicineDeviceDeliveryDao;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceDao;
import com.yihu.jw.base.dao.a2dao.MediicineDeviceUserDao;
import com.yihu.jw.base.dao.a2dao.MediicinedrugsDao;
import com.yihu.jw.base.dao.a2dao.*;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.useragent.UserAgent;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.a1entity.MedicineDeviceDelivery;
import com.yihu.jw.entity.a1entity.MediicineDeviceUser;
import com.yihu.jw.entity.a1entity.Mediicinedevice;
import com.yihu.jw.entity.a1entity.Mediicinedrugs;
import com.yihu.jw.entity.a1entity.*;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
@@ -66,6 +61,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private MediicinecabinetInventoryDao inventoryDao;
    /**
     * 新增设备
@@ -1540,4 +1538,31 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    public Iterable<Mediicinedevice> findAll() {
        return deviceDao.findAll();
    }
    /**
     * 根据设备id查询设备轨道数据
     *
     * @param deviceId
     * @return
     */
    public JSONArray selectById(String deviceId){
        List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoryByDeviceId(deviceId);
        List<Map<String,Object>> maps = inventoryDao.selectByDeviceIdGroup(deviceId);
        JSONArray array = new JSONArray();
        for (Map<String,Object> map:maps){
            String id = map.get("layerNo").toString();
            JSONObject object = new JSONObject();
            JSONArray jsonArray = new JSONArray();
            for (MediicinecabinetInventory inventory:list){
                if (id.equalsIgnoreCase(inventory.getLayerNo())){
                    jsonArray.add(inventory);
                }
            }
            object.put(id,jsonArray);
            array.add(object);
        }
        return  array;
    }
}