跟新相关bug

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

@@ -47,7 +47,7 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getDeviceInfo(condition,page,size);
        JSONObject result = warraytService.getDeviceInfo(condition,getUID(),page,size);
        return success(result);
    }
@@ -74,13 +74,11 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "page", value = "页码", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getTemperature(equNum, equType,networkStatus, lowT, heightT,lowH,heightH, content,startTime, endTime,userId,page,size);
        JSONObject result = warraytService.getTemperature(equNum, equType,networkStatus, lowT, heightT,lowH,heightH, content,startTime, endTime,getUID(),page,size);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
@@ -126,13 +124,11 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getOffline(idDevice, equClass,networkStatus, content,startTime, endTime,userId,page,size,wechatId);
        JSONObject result = warraytService.getOffline(idDevice, equClass,networkStatus, content,startTime, endTime,getUID(),page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
@@ -151,13 +147,11 @@ public class MedicineWarrayEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name = "endTime", value = "结束时间", required = false, defaultValue = "")
            @RequestParam(value = "endTime",required = false) String endTime,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = warraytService.getFault(idDevice, equClass,networkStatus,content,startTime, endTime,userId,page,size,wechatId);
        JSONObject result = warraytService.getFault(idDevice, equClass,networkStatus,content,startTime, endTime,getUID(),page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

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

@@ -17,6 +17,7 @@ import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import io.swagger.util.Json;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -99,7 +100,8 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                return result;
            }
        }
        Mediicinestockup upstock = new Mediicinestockup();
        List<Mediicinestockupdetail> mediicinestockupdetails = new ArrayList<>();
        for (UpDO upDO : list) {
            Mediicinedevice mediicinedevice = deviceDao.findOne(upDO.getDeviceId());
            Mediicinestockup mediicinestockup = new Mediicinestockup();
@@ -126,7 +128,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            mediicinestockup.setCreateUserName(user.getName());
            mediicinestockup.setUpdateUser(userId);
            mediicinestockup.setUpdateUserName(user.getName());
            upDao.save(mediicinestockup);
            upstock = upDao.save(mediicinestockup);
            for (DrugDO drug : upDO.getDrugs()) {
                Mediicinedrugs mediicinedrugs = drugsDao.findOne(drug.getDrugId());
                Mediicinestockupdetail mediicinestockupdetail = new Mediicinestockupdetail();
@@ -142,10 +144,15 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
                mediicinestockupdetail.setOutofstock(drug.getQty().toString());
                mediicinestockupdetail.setClaim(drug.getQty().toString());
                mediicinestockupdetail.setQuantity(drug.getQty().toString());
                updetailDao.save(mediicinestockupdetail);
                mediicinestockupdetail = updetailDao.save(mediicinestockupdetail);
                mediicinestockupdetails.add(mediicinestockupdetail);
            }
        }
        result.put("response",ConstantUtils.SUCCESS);
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("info", upstock);
        jsonObject.put("list", mediicinestockupdetails);
        result.put("response",jsonObject);
        result.put("msg",ConstantUtils.SUCCESS);
        return result;
    }

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

@@ -54,13 +54,51 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
    private HibenateUtils hibenateUtils;
    public JSONObject getDeviceInfo(String condition,int page,int size){
    public JSONObject getDeviceInfo(String condition,String userId,int page,int size){
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
        String tempSql = "";
        //获取管理员所在社区code字符串
        //市管理员
        if ("saasAdmin".equals(role.getCode())) {
            tempSql = "SELECT\n" +
                    "\t`code`\tas community\n" +
                    "FROM\n" +
                    "\tdm_hospital\n" +
                    "WHERE\n" +
                    "\tdel = 1";
        }
        //区域管理员
        if ("regionAdmin".equals(role.getCode())) {
            tempSql = "SELECT\n" +
                    "\tdh.`code` AS community\n" +
                    "FROM\n" +
                    "\twlyy_user_area t\n" +
                    "LEFT JOIN dm_hospital dh ON t.town = dh.town\n" +
                    "WHERE\n" +
                    "\tt.user_id = '" + userId + "'\n" +
                    "AND t.del = 1\n" +
                    "AND dh.del = 1";
        }
        //社区管理员
        if ("communityAdmin".equals(role.getCode()) || "replenisher".equals(role.getCode())) {
            tempSql = "SELECT\n" +
                    "t.hospital AS community\n" +
                    "FROM\n" +
                    "wlyy_user_area AS t\n" +
                    "WHERE\n" +
                    "t.user_id = '" + userId + "'\n" +
                    "AND t.del = 1";
        }
        JSONObject result = new JSONObject();
        String sql = "SELECT d.id as id,d.equ_num as equNum,d.equ_name as equName," +
                "d.equ_type as equType,d.now_humidity as nowHunidity,d.now_temperature as nowTemperature," +
                "d.abnormal as abnormal,d.network_status as networkStatus,DATE_FORMAT(d.log_time,'%Y-%m-%d %H:%i:%S') as logTime " +
                "FROM t_mediicine_device d where d.belong_community is not NULL ";
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(tempSql)){
            sql += " and d.belong_community IN ("+tempSql+")";
        }
        String conditionSql = "";
        if (!StringUtils.isEmpty(condition)){
@@ -92,6 +130,9 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "  where " +
                "  1=1 and d.belong_community is not NULL  " +
                conditionSql;
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(tempSql)){
            countSql += " and d.belong_community IN ("+tempSql+")";
        }
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int count = jdbcTemplate.queryForObject(countSql,Integer.class);
        result.put("total", count);

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

@@ -2483,7 +2483,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            conditionSql += "AND t.sale_status = '" + saleStatus +"'\n";
        }
        if (!StringUtils.isEmpty(equType)) {
            conditionSql += "AND t.equ_type = '" + equType +"'\n";
            conditionSql += "AND t.equ_type like '%" + equType +"%'\n";
        }
        conditionSql += "AND t.belong_community IS NOT NULL\n";
        //true

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -620,6 +620,8 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                userEquipmentDO=userEquipmentDao.save(userEquipmentDO);
                equipmentDOS.add(userEquipmentDO);
            }
        }else {
            userEquipmentDao.deleteByUserId(userDO.getId());
        }
        result.put("equipment",equipmentDOS);
        result.put("response", ConstantUtils.SUCCESS);