Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedevice.java

@@ -160,9 +160,32 @@ public class Mediicinedevice extends UuidIdentityEntityWithOperator implements S
     */
    private String cargoCapacity;
    //层数
    private String layer;
    /**
     * 列数
     */
    private String wayer;
    public Mediicinedevice() {
    }
    public String getLayer() {
        return layer;
    }
    public void setLayer(String layer) {
        this.layer = layer;
    }
    public String getWayer() {
        return wayer;
    }
    public void setWayer(String wayer) {
        this.wayer = wayer;
    }
    public String getEquClass() {
        return equClass;

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinestockoutdetail.java

@@ -81,10 +81,20 @@ public class Mediicinestockoutdetail extends UuidIdentityEntityWithOperator impl
     */
    private String IdOrderDetail;
    private String drugName;
    public Mediicinestockoutdetail() {
    }
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    public String getIdStockOut() {
        return idStockOut;

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

@@ -172,6 +172,7 @@ public class BaseRequestMapping {
        public static final String updateAddressInfo  = "/updateAddressInfo";
        public static final String UPDATESTATUS  = "/updateStatus";
        public static final String UPDATESALESTATUS  = "/updateSaleStatus";
        public static final String UNBINDDEVICE  = "/unbindDevice";
        public static final String getDeviceListByUserId  = "/getDeviceListByUserId";
        public static final String getUserListByDeviceId  = "/getUserListByDeviceId";
        public static final String getOutOfStockDeviceList  = "/getOutOfStockDeviceList";

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

@@ -81,11 +81,11 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateAddressInfo)
    @ApiOperation(value = "设备分配投放地址")
    public Envelop updateAddressInfo(
            @ApiParam(name = "deviceId", value = "设备Id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId,
            @ApiParam(name = "deviceIds", value = "设备Id", required = true)
            @RequestParam(value = "deviceIds", required = true) String deviceIds,
            @ApiParam(name = "deliveryAddress", value = "投放地址", required = true)
            @RequestParam(value = "deliveryAddress", required = true) String deliveryAddress) throws Exception {
        String str = deviceService.updateDeviceAddress(deviceId, deliveryAddress);
        String str = deviceService.updateDeviceAddress(deviceIds, deliveryAddress);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
@@ -143,6 +143,20 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.BaseDevice.UNBINDDEVICE)
    @ApiOperation(value = "设备解绑")
    public Envelop unbindDevice(
            @ApiParam(name = "deviceIds", value = "设备Id", required = true)
            @RequestParam(value = "deviceIds", required = true) String deviceIds) throws Exception {
        String str = deviceService.unbindDevice(deviceIds);
        JSONObject jsonObject = JSONObject.parseObject(str);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }
        return success(jsonObject.getString("response"));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.docFullInfo)
    @ApiOperation(value = "获取设备信息基础信息列表")
    public PageEnvelop getDeviceFullInfolist(

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

@@ -54,11 +54,13 @@ public class MedicineUserEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.BaseUser.allotDevice)
    @ApiOperation(value = "分配设备")
    public Envelop allotDevice(
            @ApiParam(name = "userIds", value = "补货员ids，多个用逗号隔开")
            @ApiParam(name = "userIds", value = "补货员ids，多个用逗号隔开", required = true)
            @RequestParam(value = "userIds", required = true) String userIds,
            @ApiParam(name = "deviceIds", value = "设备ids,多个用英文逗号隔开", required = true)
            @RequestParam(value = "deviceIds") String deviceIds) throws Exception {
        JSONObject result = userService.allotDevice(userIds, deviceIds);
            @ApiParam(name = "deviceIds", value = "设备ids,多个用英文逗号隔开", required = false)
            @RequestParam(value = "deviceIds", required = false) String deviceIds,
            @ApiParam(name = "isAll", value = "是否全部设备", required = true)
            @RequestParam(value = "isAll") Boolean isAll) throws Exception {
        JSONObject result = userService.allotDevice(userIds, deviceIds, isAll);
        return success(result.getString("response"));
    }

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

@@ -302,7 +302,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "    tmd.equ_num as equNum,\n" +
                "    tmu.name as replenishErName\n" +
                "FROM\n" +
                "    t_mediicine_stockrecord AS t left join t_mediicine_device tmd on replenish_equ = tmd.id left join t_mediicine_user tmu on t.replenish_er = tmu.id  where 1=1";
                "    t_mediicine_stockrecord AS t left join t_mediicine_device tmd on replenish_equ = tmd.id left join t_mediicine_user tmu on t.replenish_er = tmu.id  where 1=1 and tmd.del = 1";
        String conditionSql = "";
        //社区
@@ -333,7 +333,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                "   from " +
                "     t_mediicine_stockrecord t left join t_mediicine_device tmd on replenish_equ = tmd.id left join t_mediicine_user tmu on t.replenish_er = tmu.id  " +
                "  where " +
                "  1=1   " +
                "  1=1  and tmd.del = 1  " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);

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

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
@@ -34,6 +35,9 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
    @Autowired
    private MediicineDeviceUserDao deviceUserDao;
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -218,7 +222,14 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
        List<Map<String,Object>> list=null;
        list = hibenateUtils.createSQLQuery(sql,page,size);
        for (Map<String, Object> stringObjectMap : list) {
            String countSql = " select " +
                    "     COUNT(DISTINCT (t.id)) as count " +
                    "   from " +
                    "     t_mediicine_device_user t " +
                    "  where " +
                    "  1=1 and t.del = 1 and t.user_id = '" + stringObjectMap.get("id").toString() + "'";
            stringObjectMap.put("allocatedDevice", jdbcTemplate.queryForObject(countSql, Integer.class));
            stringObjectMap.put("deviceQty", deviceDao.countAll());
        }
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
@@ -242,66 +253,87 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
     * @return
     * @throws Exception
     */
    public JSONObject allotDevice(String userIds, String deviceIds) throws Exception {
    public JSONObject allotDevice(String userIds, String deviceIds, Boolean isAll) throws Exception {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(userIds) && StringUtils.isEmpty(deviceIds)) {
        if (StringUtils.isEmpty(userIds)) {
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        //绑定设备
        for (String userId : userIds.split(",")) {
            if (!StringUtils.isEmpty(userId)) {
                //移除不绑定设备
                String sql = "SELECT\n" +
                        "\tt.id AS id,\n" +
                        "\tt.device_id AS deviceId,\n" +
                        "\tt.user_id AS userId,\n" +
                        "\tt.del AS del,\n" +
                        "\tt.create_time AS createTime,\n" +
                        "\tt.create_user AS createUser,\n" +
                        "\tt.create_user_name AS createUserName,\n" +
                        "\tt.update_time AS updateTime,\n" +
                        "\tt.update_user AS updateUser,\n" +
                        "\tt.update_user_name AS updateUserName\n" +
                        "FROM\n" +
                        "\tt_mediicine_device_user AS t\n" +
                        "WHERE\n" +
                        "    t.user_id = '" + userId + "'\n" +
                        "AND '," + deviceIds + ",' NOT LIKE CONCAT('%,',t.device_id,',%')";
                List<Map<String,Object>> list=null;
                list = hibenateUtils.createSQLQuery(sql);
                if (list != null && list.size() > 0) {
                    for (Map<String, Object> stringObjectMap : list) {
                        MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
                        mediicineDeviceUser.setDel("0");
                        deviceUserDao.save(mediicineDeviceUser);
                //全部设备
                if(isAll) {
                    Iterable<Mediicinedevice> lists = deviceDao.findAll();
                    Iterator iterator = lists.iterator();
                    while(iterator.hasNext()){
                        Mediicinedevice mediicinedevice = ((Mediicinedevice) iterator.next());
                        if (mediicinedevice != null) {
                            String countSql = " select " +
                                    "     COUNT(DISTINCT (t.id)) as count " +
                                    "   from " +
                                    "     t_mediicine_device_user t " +
                                    "  where " +
                                    "  1=1 AND t.del = 1 AND t.device_id = '" + mediicinedevice.getId() + "' AND t.user_id = '" + userId + "'";
                            int count = jdbcTemplate.queryForObject(countSql,Integer.class);
                            if (count > 0) {
                                continue;
                            }
                            MediicineDeviceUser deviceUser = new MediicineDeviceUser();
                            deviceUser.setDel("1");
                            deviceUser.setDeviceId(mediicinedevice.getId());
                            deviceUser.setUserId(userId);
                            deviceUserDao.save(deviceUser);
                        }
                    }
                }
//                if (list != null && list.size() > 0) {
//                    for (MediicineDeviceUser deviceUser : list) {
//                        deviceUser.setDel("0");
//                        deviceUserDao.save(deviceUser);
//                    }
//                }
                for (String deviceId : deviceIds.split(",")) {
                    if (!StringUtils.isEmpty(deviceId)) {
                        String countSql = " select " +
                                "     COUNT(DISTINCT (t.id)) as count " +
                                "   from " +
                                "     t_mediicine_device_user t " +
                                "  where " +
                                "  1=1 AND t.del = 1 AND t.device_id = '" + deviceId + "' AND t.user_id = '" + userId + "'";
                        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
                        if (count > 0) {
                            continue;
                } else {
                    //删除移除设备
                    String sql = "SELECT\n" +
                            "\tt.id AS id,\n" +
                            "\tt.device_id AS deviceId,\n" +
                            "\tt.user_id AS userId,\n" +
                            "\tt.del AS del,\n" +
                            "\tt.create_time AS createTime,\n" +
                            "\tt.create_user AS createUser,\n" +
                            "\tt.create_user_name AS createUserName,\n" +
                            "\tt.update_time AS updateTime,\n" +
                            "\tt.update_user AS updateUser,\n" +
                            "\tt.update_user_name AS updateUserName\n" +
                            "FROM\n" +
                            "\tt_mediicine_device_user AS t\n" +
                            "WHERE\n" +
                            "    t.user_id = '" + userId + "' AND t.del = 1\n" +
                            "AND '," + deviceIds + ",' NOT LIKE CONCAT('%,',t.device_id,',%')";
                    List<Map<String,Object>> list=null;
                    list = hibenateUtils.createSQLQuery(sql);
                    if (list != null && list.size() > 0) {
                        for (Map<String, Object> stringObjectMap : list) {
                            MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
                            mediicineDeviceUser.setDel("0");
                            deviceUserDao.save(mediicineDeviceUser);
                        }
                    }
                    for (String deviceId : deviceIds.split(",")) {
                        if (!StringUtils.isEmpty(deviceId)) {
                            String countSql = " select " +
                                    "     COUNT(DISTINCT (t.id)) as count " +
                                    "   from " +
                                    "     t_mediicine_device_user t " +
                                    "  where " +
                                    "  1=1 AND t.del = 1 AND t.device_id = '" + deviceId + "' AND t.user_id = '" + userId + "'";
                            int count = jdbcTemplate.queryForObject(countSql,Integer.class);
                            if (count > 0) {
                                continue;
                            }
                            MediicineDeviceUser deviceUser = new MediicineDeviceUser();
                            deviceUser.setDel("1");
                            deviceUser.setDeviceId(deviceId);
                            deviceUser.setUserId(userId);
                            deviceUserDao.save(deviceUser);
                        }
                        MediicineDeviceUser deviceUser = new MediicineDeviceUser();
                        deviceUser.setDel("1");
                        deviceUser.setDeviceId(deviceId);
                        deviceUser.setUserId(userId);
                        deviceUserDao.save(deviceUser);
                    }
                }
            }
        }
@@ -348,7 +380,9 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "    t.aisles as aisles,\n" +
                "    t.capacity as capacity,\n" +
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "    t.cargo_capacity as cargoCapacity,\n" +
                "    t.layer as layer,\n" +
                "    t.wayer as wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where 1=1\n";
@@ -472,12 +506,14 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "    t.aisles as aisles,\n" +
                "    t.capacity as capacity,\n" +
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "    t.cargo_capacity as cargoCapacity,\n" +
                "    t.layer as layer,\n" +
                "    t.wayer as wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where\n";
                "    t_mediicine_device AS t where t.del = 1\n";
//        String conditionSql = " t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and ',"+userId+",' LIKE CONCAT('%,',du.user_id,',%'))";
        String conditionSql = " t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and du.user_id = '" + userId + "'";
        String conditionSql = " and t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and du.user_id = '" + userId + "'";
        sql = sql + conditionSql;
@@ -600,7 +636,7 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
        JSONObject result = new JSONObject();
        JSONObject jsonObject = new JSONObject();
        String sql = "select count(1) from t_mediicine_device a";
        String sql = "select count(1) from t_mediicine_device a where a.del = 1";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        jsonObject.put("count", count);
        result.put("response",ConstantUtils.SUCCESS);
@@ -621,7 +657,7 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
     */
    public JSONObject countOnline() throws Exception{
        JSONObject result = new JSONObject();
        String sql = "select count(1) from t_mediicine_device a where a.status = 1";
        String sql = "select count(1) from t_mediicine_device a where a.del = 1 and a.status = 1";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("count",count);
@@ -732,11 +768,13 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "\tt.aisles as aisles,\n" +
                "\tt.capacity as capacity,\n" +
                "\tt.ratio as ratio,\n" +
                "\tt.cargo_capacity as cargoCapacity\n" +
                "\tt.cargo_capacity as cargoCapacity,\n" +
                "\tt.layer as layer,\n" +
                "\tt.wayer as wayer\n" +
                "FROM\n" +
                "\tt_mediicine_device t\n" +
                "LEFT JOIN t_mediicinecabinet_inventory tmi ON t.id = tmi.id_device\n" +
                "WHERE 1=1\n" ;
                "WHERE 1=1 and t.del = 1 \n" ;
        if (!StringUtils.isEmpty(replenishEr)) {
            sql +=" AND t.id in (select device_id from t_mediicine_device_user tmdu left join t_mediicine_user tmu on tmdu.user_id = tmu.id where tmdu.del = 1 and CONCAT(tmu.name,tmu.account) like '%" + replenishEr + "%')\n";
        }
@@ -816,9 +854,11 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "    t.aisles AS aisles,\n" +
                "    t.capacity AS capacity,\n" +
                "    t.ratio AS ratio,\n" +
                "    t.cargo_capacity AS cargoCapacity\n" +
                "    t.cargo_capacity AS cargoCapacity,\n" +
                "    t.layer AS layer,\n" +
                "    t.wayer AS wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t WHERE ',"+ ids +",' LIKE CONCAT('%,',t.id,',%')";
                "    t_mediicine_device AS t WHERE t.del = 1 and  ',"+ ids +",' LIKE CONCAT('%,',t.id,',%')";
        String sencordSql = "SELECT\n" +
                "\ttmi.layer_no AS layerNo,\n" +
                "\ttmi.wayer_no AS wayerNo,\n" +
@@ -934,9 +974,11 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "    t.aisles AS aisles,\n" +
                "    t.capacity AS capacity,\n" +
                "    t.ratio AS ratio,\n" +
                "    t.cargo_capacity AS cargoCapacity\n" +
                "    t.cargo_capacity AS cargoCapacity,\n" +
                "    t.layer AS layer,\n" +
                "    t.wayer AS wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t WHERE 1=1";
                "    t_mediicine_device AS t WHERE 1=1 and t.del = 1";
        if (!StringUtils.isEmpty(deviceId)) {
            sql += " AND t.id = '" + deviceId + "'";

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

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
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.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
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.restmodel.ResponseContant;
@@ -33,6 +35,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    @Autowired
    private MediicineDeviceDao deviceDao;
    @Autowired
    private MediicineDeviceUserDao deviceUserDao;
    @Autowired
    private ObjectMapper objectMapper;
@@ -153,23 +158,26 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    @Transactional(rollbackFor = Exception.class)
    public String updateDeviceAddress(String deviceId, String address){
    public String updateDeviceAddress(String deviceIds, String address){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceId) && StringUtils.isEmpty(address)){
            result.put("msg","deviceId and address is null");
        if(StringUtils.isEmpty(deviceIds) && StringUtils.isEmpty(address)){
            result.put("msg","deviceIds and address is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        if (mediicinedevice == null) {
            result.put("msg","device doesn't exist");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        for (String deviceId : deviceIds.split(",")) {
            if(!StringUtils.isEmpty(deviceId)){
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
                if (mediicinedevice == null) {
                    result.put("msg","device doesn't exist");
                    result.put("response", ConstantUtils.FAIL);
                    return result.toJSONString();
                }
                mediicinedevice.setDeliveryAddress(address);
                this.save(mediicinedevice);
            }
        }
        mediicinedevice.setDeliveryAddress(address);
        this.save(mediicinedevice);
        result.put("response",ConstantUtils.SUCCESS);
        result.put("msg",mediicinedevice);
        return result.toJSONString();
    }
@@ -204,7 +212,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    /**
     * 更新设备销售状态
     * @param deviceId
     * @param status
     * @param saleStatus
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
@@ -228,6 +236,50 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return result.toJSONString();
    }
    /**
     * 解绑设备
     * @param deviceIds
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String unbindDevice(String deviceIds){
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(deviceIds)){
            result.put("msg","deviceIds is null");
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        for (String deviceId : deviceIds.split(",")) {
            if(!StringUtils.isEmpty(deviceId)){
                Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
                if (mediicinedevice == null) {
                    result.put("msg","device doesn't exist");
                    result.put("response", ConstantUtils.FAIL);
                    return result.toJSONString();
                }
                List<Map<String, Object>> list = null;
                list = hibenateUtils.createSQLQuery("SELECT * FROM t_mediicine_device_user where del = 1 AND device_id = '" + deviceId + "'");
                if (list != null && list.size() > 0) {
                    for (Map<String, Object> stringObjectMap : list) {
                        if (!StringUtils.isEmpty(stringObjectMap.get("id").toString())) {
                            MediicineDeviceUser mediicineDeviceUser = deviceUserDao.findOne(stringObjectMap.get("id").toString());
                            if (mediicineDeviceUser != null) {
                                mediicineDeviceUser.setDel("0");
                                deviceUserDao.save(mediicineDeviceUser);
                            }
                        }
                    }
                }
                mediicinedevice.setBelongCommunity(null);
                mediicinedevice.setCommunity(null);
                this.save(mediicinedevice);
            }
        }
        result.put("response",ConstantUtils.SUCCESS);
        return result.toJSONString();
    }
    /**
     * 分页查询设备信息
@@ -281,7 +333,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.aisles as aisles,\n" +
                "    t.capacity as capacity,\n" +
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "    t.cargo_capacity as cargoCapacity,\n" +
                "    t.layer as layer,\n" +
                "    t.wayer as wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where 1=1 AND t.del = 1\n";
@@ -324,7 +378,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "   from " +
                "     t_mediicine_device t " +
                "  where " +
                "  1=1   " +
                "  1=1  and t.del = 1  " +
                conditionSql;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
@@ -376,7 +430,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.aisles as aisles,\n" +
                "    t.capacity as capacity,\n" +
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "    t.cargo_capacity as cargoCapacity,\n" +
                "    t.layer as layer,\n" +
                "    t.wayer as wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where 1=1\n";
@@ -500,12 +556,14 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.aisles as aisles,\n" +
                "    t.capacity as capacity,\n" +
                "    t.ratio as ratio,\n" +
                "    t.cargo_capacity as cargoCapacity\n" +
                "    t.cargo_capacity as cargoCapacity,\n" +
                "    t.layer as layer,\n" +
                "    t.wayer as wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t where\n";
                "    t_mediicine_device AS t where t.del = 1\n";
//        String conditionSql = " t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and ',"+userId+",' LIKE CONCAT('%,',du.user_id,',%'))";
        String conditionSql = " t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and du.user_id = '" + userId + "'";
        String conditionSql = " and t.id in (select du.device_id from t_mediicine_device_user du where del = 1 and du.user_id = '" + userId + "'";
        sql = sql + conditionSql;
@@ -568,7 +626,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t_mediicine_user AS t where\n";
//        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and ',"+deviceId+",' LIKE CONCAT('%,',du.device_id,',%'))";
        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and du.device_id = '" + deviceId + "'";
        String conditionSql = " t.id in (select du.user_id from t_mediicine_device_user du where del = 1 and du.device_id = '" + deviceId + "')";
        sql = sql + conditionSql;
@@ -628,7 +686,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        JSONObject result = new JSONObject();
        JSONObject jsonObject = new JSONObject();
        String sql = "select count(1) from t_mediicine_device a";
        String sql = "select count(1) from t_mediicine_device a where a.del = 1";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        jsonObject.put("count", count);
        result.put("response",ConstantUtils.SUCCESS);
@@ -649,7 +707,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     */
    public JSONObject countOnline() throws Exception{
        JSONObject result = new JSONObject();
        String sql = "select count(1) from t_mediicine_device a where a.status = 1";
        String sql = "select count(1) from t_mediicine_device a where a.del = 1 and a.status = 1";
        int count = jdbcTemplate.queryForObject(sql,Integer.class);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("count",count);
@@ -760,11 +818,13 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "\tt.aisles as aisles,\n" +
                "\tt.capacity as capacity,\n" +
                "\tt.ratio as ratio,\n" +
                "\tt.cargo_capacity as cargoCapacity\n" +
                "\tt.cargo_capacity as cargoCapacity,\n" +
                "\tt.layer as layer,\n" +
                "\tt.wayer as wayer\n" +
                "FROM\n" +
                "\tt_mediicine_device t\n" +
                "LEFT JOIN t_mediicinecabinet_inventory tmi ON t.id = tmi.id_device\n" +
                "WHERE 1=1\n" ;
                "WHERE 1=1 and t.del = 1\n" ;
        if (!StringUtils.isEmpty(replenishEr)) {
            sql +=" AND t.id in (select device_id from t_mediicine_device_user tmdu left join t_mediicine_user tmu on tmdu.user_id = tmu.id where tmdu.del = 1 and CONCAT(tmu.name,tmu.account) like '%" + replenishEr + "%')\n";
        }
@@ -844,9 +904,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.aisles AS aisles,\n" +
                "    t.capacity AS capacity,\n" +
                "    t.ratio AS ratio,\n" +
                "    t.cargo_capacity AS cargoCapacity\n" +
                "    t.cargo_capacity AS cargoCapacity,\n" +
                "    t.layer AS layer,\n" +
                "    t.wayer AS wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t WHERE ',"+ ids +",' LIKE CONCAT('%,',t.id,',%')";
                "    t_mediicine_device AS t WHERE t.del = 1 and ',"+ ids +",' LIKE CONCAT('%,',t.id,',%')";
        String sencordSql = "SELECT\n" +
                "\ttmi.layer_no AS layerNo,\n" +
                "\ttmi.wayer_no AS wayerNo,\n" +
@@ -962,9 +1024,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "    t.aisles AS aisles,\n" +
                "    t.capacity AS capacity,\n" +
                "    t.ratio AS ratio,\n" +
                "    t.cargo_capacity AS cargoCapacity\n" +
                "    t.cargo_capacity AS cargoCapacity,\n" +
                "    t.layer AS layer,\n" +
                "    t.wayer AS wayer\n" +
                "FROM\n" +
                "    t_mediicine_device AS t WHERE 1=1";
                "    t_mediicine_device AS t WHERE 1=1 and t.del = 1";
        if (!StringUtils.isEmpty(deviceId)) {
            sql += " AND t.id = '" + deviceId + "'";